[CORD-2791] Rename Rename VOLTTenant in VOLTServiceInstance

Change-Id: Ifc90f20653e9a9970a78d5abb9e6d5f6fd4bb954
diff --git a/xos/synchronizer/model_policies/model_policy_rcordsubscriber.py b/xos/synchronizer/model_policies/model_policy_rcordsubscriber.py
index af9dba9..570aa7d 100644
--- a/xos/synchronizer/model_policies/model_policy_rcordsubscriber.py
+++ b/xos/synchronizer/model_policies/model_policy_rcordsubscriber.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-from synchronizers.new_base.modelaccessor import VOLTTenant, ServiceInstanceLink
+from synchronizers.new_base.modelaccessor import VOLTServiceInstance, ServiceInstanceLink
 from synchronizers.new_base.policy import Policy
 
 class RCORDSubscriberPolicy(Policy):
@@ -44,7 +44,7 @@
             # we don't know what the next service in the chain will be
 
             if ps.model_name is "VOLTService":
-                volt = VOLTTenant(name="volt-for-subscriber-%s" % si.id)
+                volt = VOLTServiceInstance(name="volt-for-subscriber-%s" % si.id)
                 volt.save()
 
                 si_link = ServiceInstanceLink(
diff --git a/xos/synchronizer/model_policies/test_model_policy_rcordsubscriber.py b/xos/synchronizer/model_policies/test_model_policy_rcordsubscriber.py
index ea88667..eb89d2a 100644
--- a/xos/synchronizer/model_policies/test_model_policy_rcordsubscriber.py
+++ b/xos/synchronizer/model_policies/test_model_policy_rcordsubscriber.py
@@ -108,7 +108,7 @@
         si.owner = owner
 
         with patch.object(owner.subscribed_dependencies, 'all', MagicMock(return_value=[MockLink()])), \
-             patch.object(VOLTTenant, "save", autospec=True) as save_volt, \
+             patch.object(VOLTServiceInstance, "save", autospec=True) as save_volt, \
              patch.object(ServiceInstanceLink, "save", autospec=True) as save_link:
             self.policy.handle_create(si)
             self.assertEqual(save_link.call_count, 1)