diff --git a/samples/service.yaml b/samples/service.yaml
index 5944808..a6869ec 100644
--- a/samples/service.yaml
+++ b/samples/service.yaml
@@ -44,8 +44,8 @@
         connect_method: None
       requirements:
         - subscriber_service:
-            node: service#ONOS_Fabric
+            node: service#fabric
             relationship: tosca.relationships.BelongsToOne
         - provider_service:
-            node: service#fabric
+            node: service#ONOS_Fabric
             relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
diff --git a/xos/synchronizer/steps/helpers.py b/xos/synchronizer/steps/helpers.py
index 1f53674..08be81d 100644
--- a/xos/synchronizer/steps/helpers.py
+++ b/xos/synchronizer/steps/helpers.py
@@ -25,5 +25,5 @@
     def get_onos_fabric_service():
         # FIXME do not select by name but follow ServiceDependency
         fabric_service = Service.objects.get(name="fabric")
-        onos_fabric_service = fabric_service.subscriber_services[0].leaf_model
-        return onos_fabric_service
\ No newline at end of file
+        onos_fabric_service = fabric_service.provider_services[0].leaf_model
+        return onos_fabric_service
diff --git a/xos/synchronizer/steps/test_sync_fabric_port.py b/xos/synchronizer/steps/test_sync_fabric_port.py
index b0f6886..2358d4a 100644
--- a/xos/synchronizer/steps/test_sync_fabric_port.py
+++ b/xos/synchronizer/steps/test_sync_fabric_port.py
@@ -94,7 +94,7 @@
 
         self.fabric = Mock()
         self.fabric.name = "fabric"
-        self.fabric.subscriber_services = [onos_fabric_base]
+        self.fabric.provider_services = [onos_fabric_base]
 
         # create a mock SwitchPort instance
         self.o = Mock()
@@ -203,4 +203,4 @@
 
             self.sync_step().delete_record(self.o)
 
-            self.assertTrue(m.called)
\ No newline at end of file
+            self.assertTrue(m.called)
diff --git a/xos/synchronizer/steps/test_sync_fabric_switch.py b/xos/synchronizer/steps/test_sync_fabric_switch.py
index c3345e7..5761b73 100644
--- a/xos/synchronizer/steps/test_sync_fabric_switch.py
+++ b/xos/synchronizer/steps/test_sync_fabric_switch.py
@@ -94,7 +94,7 @@
 
         self.fabric = Mock()
         self.fabric.name = "fabric"
-        self.fabric.subscriber_services = [onos_fabric_base]
+        self.fabric.provider_services = [onos_fabric_base]
 
         # create a mock Switch instance
         self.o = Mock()
@@ -158,4 +158,4 @@
 
             self.sync_step().delete_record(self.o)
 
-            self.assertTrue(m.called)
\ No newline at end of file
+            self.assertTrue(m.called)