diff --git a/python/adapters/openolt/main.py b/python/adapters/openolt/main.py
index 3af6421..083a167 100755
--- a/python/adapters/openolt/main.py
+++ b/python/adapters/openolt/main.py
@@ -29,22 +29,22 @@
 from twisted.internet.task import LoopingCall
 from zope.interface import implementer
 
-from voltha.common.structlog_setup import setup_logging, update_logging
-from voltha.common.utils.asleep import asleep
-from voltha.common.utils.deferred_utils import TimeOutError
-from voltha.common.utils.dockerhelpers import get_my_containers_name
-from voltha.common.utils.nethelpers import get_my_primary_local_ipv4, \
+from pyvoltha.common.structlog_setup import setup_logging, update_logging
+from pyvoltha.common.utils.asleep import asleep
+from pyvoltha.common.utils.deferred_utils import TimeOutError
+from pyvoltha.common.utils.dockerhelpers import get_my_containers_name
+from pyvoltha.common.utils.nethelpers import get_my_primary_local_ipv4, \
     get_my_primary_interface
-from voltha.common.utils.registry import registry, IComponent
-from voltha.adapters.kafka.adapter_proxy import AdapterProxy
-from voltha.adapters.kafka.adapter_request_facade import AdapterRequestFacade
-from voltha.adapters.kafka.core_proxy import CoreProxy
-from voltha.adapters.kafka.kafka_inter_container_library import IKafkaMessagingProxy, \
+from pyvoltha.common.utils.registry import registry, IComponent
+from pyvoltha.adapters.kafka.adapter_proxy import AdapterProxy
+from pyvoltha.adapters.kafka.adapter_request_facade import AdapterRequestFacade
+from pyvoltha.adapters.kafka.core_proxy import CoreProxy
+from pyvoltha.adapters.kafka.kafka_inter_container_library import IKafkaMessagingProxy, \
     get_messaging_proxy
-from voltha.adapters.kafka.kafka_proxy import KafkaProxy, get_kafka_proxy
+from pyvoltha.adapters.kafka.kafka_proxy import KafkaProxy, get_kafka_proxy
 from openolt import OpenoltAdapter
-from voltha.protos import third_party
-from voltha.protos.adapter_pb2 import AdapterConfig
+from pyvoltha.protos import third_party
+from pyvoltha.protos.adapter_pb2 import AdapterConfig
 
 _ = third_party