diff --git a/python/ofagent/agent.py b/python/ofagent/agent.py
index 6117c8f..aa45f67 100755
--- a/python/ofagent/agent.py
+++ b/python/ofagent/agent.py
@@ -22,7 +22,7 @@
 from twisted.internet.defer import Deferred, inlineCallbacks
 
 import loxi.of13 as of13
-from common.utils.asleep import asleep
+from pyvoltha.common.utils.asleep import asleep
 from of_connection import OpenFlowConnection
 from of_protocol_handler import OpenFlowProtocolHandler
 
diff --git a/python/ofagent/connection_mgr.py b/python/ofagent/connection_mgr.py
index fea4910..11a1334 100755
--- a/python/ofagent/connection_mgr.py
+++ b/python/ofagent/connection_mgr.py
@@ -20,19 +20,17 @@
 from twisted.internet import reactor
 from twisted.internet.defer import Deferred, inlineCallbacks, returnValue
 
-from common.utils.asleep import asleep
-from common.utils.consulhelpers import get_endpoint_from_consul
+from pyvoltha.common.utils.asleep import asleep
+from pyvoltha.common.utils.consulhelpers import get_endpoint_from_consul
 from structlog import get_logger
 import grpc
 from grpc import StatusCode
 from grpc._channel import _Rendezvous
-from ofagent.protos import third_party
-from protos import voltha_pb2
-from protos.voltha_pb2 import OfAgentSubscriber
+from voltha_protos.voltha_pb2 import OfAgentSubscriber
 from grpc_client import GrpcClient
 
 from agent import Agent
-from common.utils.dockerhelpers import get_my_containers_name
+from pyvoltha.common.utils.dockerhelpers import get_my_containers_name
 
 
 log = get_logger()
diff --git a/python/ofagent/converter.py b/python/ofagent/converter.py
index 192a65a..d3c7bea 100755
--- a/python/ofagent/converter.py
+++ b/python/ofagent/converter.py
@@ -23,7 +23,7 @@
 
 import loxi.of13 as of13
 from protobuf_to_dict import protobuf_to_dict, TYPE_CALLABLE_MAP
-from protos import openflow_13_pb2 as pb2
+from voltha_protos import openflow_13_pb2 as pb2
 
 
 type_callable_map = copy(TYPE_CALLABLE_MAP)
diff --git a/python/ofagent/grpc_client.py b/python/ofagent/grpc_client.py
index 4a6d274..096d56e 100755
--- a/python/ofagent/grpc_client.py
+++ b/python/ofagent/grpc_client.py
@@ -27,9 +27,10 @@
 from twisted.internet import threads
 from twisted.internet.defer import inlineCallbacks, returnValue, DeferredQueue
 
-from protos.voltha_pb2 import ID, VolthaServiceStub, FlowTableUpdate, \
+from voltha_protos.voltha_pb2_grpc import VolthaServiceStub
+from voltha_protos.voltha_pb2 import ID, FlowTableUpdate, \
     FlowGroupTableUpdate, PacketOut
-from protos.logical_device_pb2 import LogicalPortId
+from voltha_protos.logical_device_pb2 import LogicalPortId
 from google.protobuf import empty_pb2
 
 
diff --git a/python/ofagent/main.py b/python/ofagent/main.py
index 4f0531c..e18e480 100755
--- a/python/ofagent/main.py
+++ b/python/ofagent/main.py
@@ -21,9 +21,9 @@
 from twisted.internet import reactor
 from twisted.internet.defer import inlineCallbacks
 
-from common.structlog_setup import setup_logging
-from common.utils.dockerhelpers import get_my_containers_name
-from common.utils.nethelpers import get_my_primary_local_ipv4
+from pyvoltha.common.structlog_setup import setup_logging
+from pyvoltha.common.utils.dockerhelpers import get_my_containers_name
+from pyvoltha.common.utils.nethelpers import get_my_primary_local_ipv4
 from connection_mgr import ConnectionManager
 
 defs = dict(
diff --git a/python/ofagent/of_connection.py b/python/ofagent/of_connection.py
index 1dcc521..a941111 100755
--- a/python/ofagent/of_connection.py
+++ b/python/ofagent/of_connection.py
@@ -18,7 +18,7 @@
 from twisted.internet import protocol
 
 import loxi.of14
-from common.utils.message_queue import MessageQueue
+from pyvoltha.common.utils.message_queue import MessageQueue
 
 log = structlog.get_logger()