diff --git a/xos/xos_client/xosapi/convenience/voltserviceinstance.py b/xos/xos_client/xosapi/convenience/voltserviceinstance.py
index 5bc11bb..3168aed 100644
--- a/xos/xos_client/xosapi/convenience/voltserviceinstance.py
+++ b/xos/xos_client/xosapi/convenience/voltserviceinstance.py
@@ -53,8 +53,8 @@
         if not self.subscriber:
             raise Exception("vOLT %s has no subscriber" % self.name)
 
-        olt_device = self.stub.VOLTDevice.objects.get(name = self.subscriber.olt_device)
-        olt_port = self.stub.VOLTDevicePort.objects.get(name = self.subscriber.olt_port, volt_device_id=olt_device.id)
+        olt_device = self.stub.OLTDevice.objects.get(name = self.subscriber.olt_device)
+        olt_port = self.stub.PONPort.objects.get(name = self.subscriber.olt_port, volt_device_id=olt_device.id)
 
         if olt_port:
             return olt_port.s_tag