diff --git a/profile_manifests/ecord-global.yml b/profile_manifests/ecord-global.yml
index e44e4b5..f497431 100644
--- a/profile_manifests/ecord-global.yml
+++ b/profile_manifests/ecord-global.yml
@@ -33,7 +33,7 @@
 xos_tosca_config_templates:
   - vtn-service.yaml
   - fabric-service.yaml
-  - vnodglobal-service.yaml
+  - vnaasglobal-service.yaml
   - xos-gui-extensions.yml
 
 xos_other_templates:
@@ -50,7 +50,12 @@
 gui_branding_favicon: "/static/cord-favicon.png"
 gui_branding_bg: "/static/cord-bg.jpg"
 
-enabled_gui_extensions: []
+enabled_gui_extensions:
+  - name: vnaasgui
+    path: orchestration/xos_services/vnaas/xos/gui
+    extra_files:
+      - app/style/style.css
+      - mapconstants.js
 
 # paths defined in manifest/default.xml
 xos_services:
@@ -62,8 +67,8 @@
     path: orchestration/xos_services/fabric
   - name: onos
     path: orchestration/xos_services/onos-service
-  - name: metro-net
-    path: orchestration/xos_services/metro-net
+  - name: vnaas
+    path: orchestration/xos_services/vnaas
 
 # SSL server certificate generation
 server_certs:
diff --git a/profile_manifests/mock-ecord-global.yml b/profile_manifests/mock-ecord-global.yml
index 91fa0be..be6d34b 100644
--- a/profile_manifests/mock-ecord-global.yml
+++ b/profile_manifests/mock-ecord-global.yml
@@ -36,7 +36,7 @@
 
 xos_tosca_config_templates:
   - mock-onos.yaml
-  - vnodglobal-service.yaml
+  - vnaasglobal-service.yaml
   - xos-gui-extensions.yml
 
 # GUI Config [new GUI]
@@ -51,17 +51,18 @@
 gui_branding_bg: "/static/cord-bg.jpg"
 
 enabled_gui_extensions:
-  - name: metro-net-gui
-    path: orchestration/xos_services/metro-net/xos/gui
+  - name: vnaasgui
+    path: orchestration/xos_services/vnaas/xos/gui
     extra_files:
       - app/style/style.css
+      - mapconstants.js
 
 # paths defined in manifest/default.xml
 xos_services:
   - name: onos
     path: orchestration/xos_services/onos-service
-  - name: metro-net
-    path: orchestration/xos_services/metro-net
+  - name: vnaas
+    path: orchestration/xos_services/vnaas
 
 xos_service_sshkeys:
   - name: onos_rsa
diff --git a/roles/cord-profile/templates/vnaasglobal-service.yaml.j2 b/roles/cord-profile/templates/vnaasglobal-service.yaml.j2
new file mode 100644
index 0000000..e10c94d
--- /dev/null
+++ b/roles/cord-profile/templates/vnaasglobal-service.yaml.j2
@@ -0,0 +1,139 @@
+
+{#
+Copyright 2017-present Open Networking Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+#}
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+   - custom_types/xos.yaml
+   - custom_types/vnaas.yaml
+
+description: vnaasglobal services, generated by platform-install
+
+topology_template:
+  node_templates:
+
+    enterpriselocation#onlab:
+      type: tosca.nodes.EnterpriseLocation
+      requirements:
+      properties:
+        name: onlab
+        cord_site_ip: 127.0.0.1
+        cord_site_port: 8181
+        cord_site_username: onos
+        cord_site_password: rocks
+        cord_site_type: onos
+
+
+    enterpriselocation#onlab1:
+      type: tosca.nodes.EnterpriseLocation
+      requirements:
+      properties:
+        name: onlab1
+        cord_site_ip: 127.0.0.2
+        cord_site_port: 8181
+        cord_site_username: onos
+        cord_site_password: rocks
+        cord_site_type: onos
+
+    onosmodel#onlab:
+      type: tosca.nodes.OnosModel
+      requirements:
+      properties:
+        name: onlabT
+        onos_ip: 127.0.0.1
+        onos_port: 8181
+        onos_username: onos
+        onos_password: rocks
+        onos_type: global
+
+    bandwidthprofile#bronze:
+      type: tosca.nodes.BandwidthProfile
+      requirements:
+      properties:
+        cbs: 1000
+        ebs: 1200
+        cir: 1000000
+        eir: 1200000
+        name: bronze
+
+    bandwidthprofile#silver:
+      type: tosca.nodes.BandwidthProfile
+      requirements:
+      properties:
+        cbs: 1500
+        ebs: 2000
+        cir: 1500000
+        eir: 2000000
+        name: silver
+
+    bandwidthprofile#gold:
+      type: tosca.nodes.BandwidthProfile
+      requirements:
+      properties:
+        cbs: 2000
+        ebs: 2700
+        cir: 2000000
+        eir: 2700000
+        name: gold
+
+    bandwidthprofile#platinum:
+      type: tosca.nodes.BandwidthProfile
+      requirements:
+      properties:
+        cbs: 2500
+        ebs: 3200
+        cir: 2500000
+        eir: 3200000
+        name: platinum
+
+    usernetworkinterface#UserNetworkInterface1:
+      type: tosca.nodes.UserNetworkInterface
+      requirements:
+      properties:
+        tenant: onlab
+        name: uni1
+        latlng: [37.973535, -122.531087]
+        cpe_id: netconf:192.168.56.10:830/0
+
+    usernetworkinterface#UserNetworkInterface2:
+      type: tosca.nodes.UserNetworkInterface
+      requirements:
+      properties:
+        tenant: onlab
+        name: uni2
+        latlng: [37.773972, -122.431297]
+        cpe_id: netconf:192.168.56.20:830/0
+
+    usernetworkinterface#UserNetworkInterface3:
+      type: tosca.nodes.UserNetworkInterface
+      requirements:
+      properties:
+        tenant: onlab
+        name: uni3
+        latlng: [37.871637, -122.259750]
+        cpe_id: netconf:192.168.56.30:830/0
+
+    eline#testeline:
+      type: tosca.nodes.ELine
+      requirements:
+      properties:
+        name: testeline
+        connect_point_1_id: netconf:192.168.56.10:830/0
+        connect_point_2_id: netconf:192.168.56.20:830/0
+        vlanids: 100
+        cord_site_name: onlabT
+        bwp: gold
\ No newline at end of file
diff --git a/roles/cord-profile/templates/vnodglobal-service.yaml.j2 b/roles/cord-profile/templates/vnodglobal-service.yaml.j2
deleted file mode 100644
index 539a0dd..0000000
--- a/roles/cord-profile/templates/vnodglobal-service.yaml.j2
+++ /dev/null
@@ -1,88 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/metronet.yaml
-
-description: vnodglobal services, generated by platform-install
-
-topology_template:
-    node_templates:
-
-      bandwidthprofile#ecordbandwidthprofile:
-        type: tosca.nodes.EcordBandwidthProfile
-        requirements:
-        properties:
-          bwpcfgcbs: 1000
-          bwpcfgebs: 1200
-          bwpcfgcir: 1000000
-          bwpcfgeir: 1200000
-          name: ecordbandwidthprofile
-
-      bandwidthprofile#UniBandwidthprofile:
-        type: tosca.nodes.EcordBandwidthProfile
-        requirements:
-        properties:
-          bwpcfgcbs: 100
-          bwpcfgebs: 50
-          bwpcfgcir: 600
-          bwpcfgeir: 50
-          name: unibandwidthprofile
-
-      bandwidthprofile#EvcBandwidthprofile:
-        type: tosca.nodes.EcordBandwidthProfile
-        requirements:
-        properties:
-          bwpcfgcbs: 100
-          bwpcfgebs: 50
-          bwpcfgcir: 600
-          bwpcfgeir: 50
-          name: evcbandwidthprofile
-
-      bandwidthprofile#FlowBandwidthprofile:
-        type: tosca.nodes.EcordBandwidthProfile
-        requirements:
-        properties:
-          bwpcfgcbs: 100
-          bwpcfgebs: 50
-          bwpcfgcir: 600
-          bwpcfgeir: 50
-          name: flowbandwidthprofile
-
-      usernetworkinterface#UserNetworkInterface1:
-        type: tosca.nodes.EcordUserNetworkInterface
-        requirements:
-        properties:
-            enabled: true
-            capacity: 10000000
-            bw_used: 50000
-            vlanIds: [100,200,300]
-            name: uni1
-            location: San Rafael
-            latlng: [-122.531087, 37.973535]
-
-      service#vnodglobal:
-        type: tosca.nodes.VNodGlobalService
-        requirements:
-          - bandwith_profile:
-              node: bandwidthprofile#ecordbandwidthprofile
-              relationship: tosca.relationships.UsesBandwidthProfile
-        properties:
\ No newline at end of file