diff --git a/metronetwork/ecord-services.yaml b/metronetwork/ecord-services.yaml
index 429948d..aa5bcb1 100644
--- a/metronetwork/ecord-services.yaml
+++ b/metronetwork/ecord-services.yaml
@@ -9,16 +9,16 @@
 topology_template:
   node_templates:
 
-    service#metronetwork:
-      type: tosca.nodes.MetroNetworkService
+    system#metronetwork:
+      type: tosca.nodes.MetroNetworkSystem
       properties:
-          view_url: /admin/metronetwork/metronetworkservice/$id$/
-          kind: metronetwork
+          administrativeState: active
 
-    device#metronetworkdevice:
+    device#TestMetroNet:
       type: tosca.nodes.MetroNetworkDevice
       properties:
           restCtrlUrl:  http://10.10.10.10:8181/onos
           username: karaf
           password: karaf
-          administrativeState: syncrequested
\ No newline at end of file
+          administrativeState: syncrequested
+          id: TestMetroNet
\ No newline at end of file