diff --git a/python/cli/alarm_filters.py b/python/cli/alarm_filters.py
index ed2af32..57a782f 100644
--- a/python/cli/alarm_filters.py
+++ b/python/cli/alarm_filters.py
@@ -24,11 +24,9 @@
 from google.protobuf.empty_pb2 import Empty
 
 from table import print_pb_list_as_table
-from python.protos import third_party
-from python.protos import voltha_pb2
-from python.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos import voltha_pb2
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
 
-_ = third_party
 
 
 class AlarmFiltersCli(Cmd):
diff --git a/python/cli/device.py b/python/cli/device.py
index 38ea835..484185f 100644
--- a/python/cli/device.py
+++ b/python/cli/device.py
@@ -24,10 +24,8 @@
 
 from table import print_pb_as_table, print_pb_list_as_table
 from utils import print_flows, pb2dict, enum2name
-from python.protos import third_party
 
-_ = third_party
-from python.protos import voltha_pb2, common_pb2
+from voltha_protos import voltha_pb2, common_pb2
 import sys
 import json
 from google.protobuf.json_format import MessageToDict
diff --git a/python/cli/logical_device.py b/python/cli/logical_device.py
index cd991c6..187dd88 100644
--- a/python/cli/logical_device.py
+++ b/python/cli/logical_device.py
@@ -24,11 +24,9 @@
 from table import print_pb_as_table, print_pb_list_as_table
 from utils import pb2dict
 from utils import print_flows, print_groups
-from python.protos import third_party
 from google.protobuf.empty_pb2 import Empty
 
-_ = third_party
-from python.protos import voltha_pb2
+from voltha_protos import voltha_pb2
 
 
 class LogicalDeviceCli(Cmd):
diff --git a/python/cli/main.py b/python/cli/main.py
index 0fc9b5b..0f5c618 100755
--- a/python/cli/main.py
+++ b/python/cli/main.py
@@ -33,12 +33,11 @@
 from alarm_filters import AlarmFiltersCli
 from logical_device import LogicalDeviceCli
 from table import print_pb_list_as_table
-from python.common.openflow.utils import *
-from python.protos import third_party
-from python.protos import voltha_pb2
-from python.protos.openflow_13_pb2 import FlowTableUpdate, FlowGroupTableUpdate
+from pyvoltha.common.openflow.utils import *
+from voltha_protos import voltha_pb2
+from voltha_protos import voltha_pb2_grpc
+from voltha_protos.openflow_13_pb2 import FlowTableUpdate, FlowGroupTableUpdate
 
-_ = third_party
 from python.cli.utils import pb2dict
 
 defs = dict(
@@ -142,7 +141,7 @@
 
     def get_stub(self):
         if self.stub is None:
-            self.stub = voltha_pb2.VolthaServiceStub(self.get_channel())
+            self.stub = voltha_pb2_grpc.VolthaServiceStub(self.get_channel())
             # self.stub = \
             #     voltha_pb2.VolthaGlobalServiceStub(self.get_channel()) \
             #         if self.global_request else \
diff --git a/python/cli/omci.py b/python/cli/omci.py
index d8b8334..95768c8 100644
--- a/python/cli/omci.py
+++ b/python/cli/omci.py
@@ -23,13 +23,11 @@
 from datetime import datetime
 from google.protobuf.empty_pb2 import Empty
 from table import print_pb_list_as_table
-from python.protos import third_party
-from python.protos import voltha_pb2
-from python.protos.omci_mib_db_pb2 import MibDeviceData, MibClassData, \
+from voltha_protos import voltha_pb2
+from voltha_protos.omci_mib_db_pb2 import MibDeviceData, MibClassData, \
     MibInstanceData
 from os import linesep
 
-_ = third_party
 
 
 class OmciCli(Cmd):