diff --git a/samples/apps/cap/py/autogencap/zmq_actor_connector.py b/samples/apps/cap/py/autogencap/zmq_actor_connector.py
index a93a6d15aff2..94ecfe2a1415 100644
--- a/samples/apps/cap/py/autogencap/zmq_actor_connector.py
+++ b/samples/apps/cap/py/autogencap/zmq_actor_connector.py
@@ -1,6 +1,3 @@
-# Agent_Sender takes a zmq context, Topic and creates a
-# socket that can publish to that topic. It exposes this functionality
-# using send_msg method
 import time
 import uuid
 from typing import Any, Dict
diff --git a/samples/apps/cap/py/autogencap/zmq_directory_svc.py b/samples/apps/cap/py/autogencap/zmq_directory_svc.py
index 34efd28f3744..fa3141f551a2 100644
--- a/samples/apps/cap/py/autogencap/zmq_directory_svc.py
+++ b/samples/apps/cap/py/autogencap/zmq_directory_svc.py
@@ -5,7 +5,6 @@
 import zmq
 
 from autogencap.actor import Actor
-from autogencap.zmq_actor_connector import ZMQActorConnector, ZMQActorSender
 from autogencap.broker import Broker
 from autogencap.constants import Directory_Svc_Topic
 from autogencap.debug_log import Debug, Error, Info
@@ -23,7 +22,7 @@
     Error as ErrorMsg,
 )
 from autogencap.utility import report_error_msg
-from autogencap.zmq_runtime import ZMQActorConnector, ZMQActorSender
+from autogencap.zmq_actor_connector import ZMQActorConnector, ZMQActorSender
 
 # TODO (Future DirectorySv PR) use actor description, network_id, other properties to make directory
 # service more generic and powerful
diff --git a/samples/apps/cap/py/autogencap/zmq_runtime.py b/samples/apps/cap/py/autogencap/zmq_runtime.py
index c78a9d2fc029..7ed89f2b6f05 100644
--- a/samples/apps/cap/py/autogencap/zmq_runtime.py
+++ b/samples/apps/cap/py/autogencap/zmq_runtime.py
@@ -9,7 +9,6 @@
 from .broker import Broker
 from .constants import Termination_Topic
 from .debug_log import Debug, Warn
-from .zmq_directory_svc import ZMQDirectorySvc
 from .proto.CAP_pb2 import ActorInfo, ActorInfoCollection
 from .actor_connector import IActorConnector
 from .zmq_actor_connector import ZMQActorConnector
@@ -21,7 +20,7 @@ def __init__(self, start_broker: bool = True):
         self._context: zmq.Context = zmq.Context()
         self._start_broker: bool = start_broker
         self._broker: Broker = None
-        self._directory_svc: ZMQDirectorySvc = None
+        self._directory_svc = None
         self._log_name = self.__class__.__name__
 
     def __str__(self):
@@ -38,6 +37,7 @@ def _init_runtime(self):
                 self._start_broker = False  # Don't try to start the broker again
                 self._broker = None
         if self._directory_svc is None:
+            from .zmq_directory_svc import ZMQDirectorySvc
             self._directory_svc = ZMQDirectorySvc(self._context)
             self._directory_svc.start(self)
         time.sleep(0.25)  # Process queued thread events in Broker and Directory
diff --git a/samples/apps/cap/py/demo/complex_actor_demo.py b/samples/apps/cap/py/demo/complex_actor_demo.py
index 1bc4b5a94fd5..ec34b309b384 100644
--- a/samples/apps/cap/py/demo/complex_actor_demo.py
+++ b/samples/apps/cap/py/demo/complex_actor_demo.py
@@ -1,6 +1,6 @@
 import time
 
-from AppAgents import FidelityAgent, FinancialPlannerAgent, PersonalAssistant, QuantAgent, RiskManager
+from app_agents import FidelityAgent, FinancialPlannerAgent, PersonalAssistant, QuantAgent, RiskManager
 from autogencap.runtime_factory import RuntimeFactory
 from termcolor import colored
 
diff --git a/samples/apps/cap/py/demo/list_agents.py b/samples/apps/cap/py/demo/list_agents.py
index 7adfa833b343..4785ef34231e 100644
--- a/samples/apps/cap/py/demo/list_agents.py
+++ b/samples/apps/cap/py/demo/list_agents.py
@@ -1,7 +1,7 @@
 import time
 from typing import List
 
-from AppAgents import FidelityAgent, GreeterAgent
+from app_agents import FidelityAgent, GreeterAgent
 from autogencap.debug_log import Info
 from autogencap.proto.CAP_pb2 import ActorInfo
 from autogencap.runtime_factory import RuntimeFactory
diff --git a/samples/apps/cap/py/demo/simple_actor_demo.py b/samples/apps/cap/py/demo/simple_actor_demo.py
index afc398297268..cb6b9a597684 100644
--- a/samples/apps/cap/py/demo/simple_actor_demo.py
+++ b/samples/apps/cap/py/demo/simple_actor_demo.py
@@ -1,4 +1,4 @@
-from AppAgents import GreeterAgent
+from app_agents import GreeterAgent
 from autogencap.runtime_factory import RuntimeFactory
 
 
diff --git a/samples/apps/cap/py/demo/single_threaded.py b/samples/apps/cap/py/demo/single_threaded.py
index c74bd1043f17..b087eba5e6bb 100644
--- a/samples/apps/cap/py/demo/single_threaded.py
+++ b/samples/apps/cap/py/demo/single_threaded.py
@@ -1,5 +1,5 @@
 import _paths
-from AppAgents import GreeterAgent
+from app_agents import GreeterAgent
 from autogencap.debug_log import Error
 from autogencap.proto.CAP_pb2 import Ping
 from autogencap.runtime_factory import RuntimeFactory