diff --git a/xos/tosca/resources/mcordservice.py b/xos/tosca/resources/mcordservice.py
deleted file mode 100644
index 491b204..0000000
--- a/xos/tosca/resources/mcordservice.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from services.vbbu.models import MCORDService
-from service import XOSService
-
-class XOSMCORDService(XOSService):
-    provides = "tosca.nodes.MCORDService"
-    xos_model = MCORDService
-    copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key",
-                    "private_key_fn", "versionNumber",
-                    ]
-
diff --git a/xos/tosca/resources/vbbuservice.py b/xos/tosca/resources/vbbuservice.py
new file mode 100644
index 0000000..bbe344e
--- /dev/null
+++ b/xos/tosca/resources/vbbuservice.py
@@ -0,0 +1,11 @@
+# from services.vbbu.models import MCORDService
+from synchronizers.new_base.modelaccessor import *
+from service import XOSService
+
+class XOSMVBBUService(XOSService):
+    provides = "tosca.nodes.VBBUervice"
+    xos_model = VBBUService
+    copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key",
+                    "private_key_fn", "versionNumber",
+                    ]
+
diff --git a/xos/tosca/resources/vbbucomponent.py b/xos/tosca/resources/vbbutenant.py
similarity index 72%
rename from xos/tosca/resources/vbbucomponent.py
rename to xos/tosca/resources/vbbutenant.py
index 3782b5b..b93c023 100644
--- a/xos/tosca/resources/vbbucomponent.py
+++ b/xos/tosca/resources/vbbutenant.py
@@ -1,14 +1,15 @@
-from services.vbbu.models import VBBUComponent, MCORDService
+# from services.vbbu.models import *
+from synchronizers.new_base.modelaccessor import *
 from xosresource import XOSResource
 
-class XOSVBBUComponent(XOSResource):
-    provides = "tosca.nodes.VBBUComponent"
-    xos_model = VBBUComponent
+class XOSVBBUTenant(XOSResource):
+    provides = "tosca.nodes.VBBUTenant"
+    xos_model = VBBUTenant
     copyin_props = ["s1u_tag", "s1mme_tag", "rru_tag", "display_message"]
     name_field = None
 
     def get_xos_args(self, throw_exception=True):
-        args = super(XOSVBBUComponent, self).get_xos_args()
+        args = super(XOSVBBUTenant, self).get_xos_args()
 
         provider_name = self.get_requirement("tosca.relationships.MemberOfService", throw_exception=throw_exception)
         if provider_name:
@@ -27,5 +28,5 @@
         pass
 
     def can_delete(self, obj):
-        return super(XOSVBBUComponent, self).can_delete(obj)
+        return super(XOSVBBUTenant, self).can_delete(obj)