diff --git a/cross-py-builder/__init__.py b/cross_py_builder/__init__.py
similarity index 100%
rename from cross-py-builder/__init__.py
rename to cross_py_builder/__init__.py
diff --git a/cross-py-builder/agent_manager.py b/cross_py_builder/agent_manager.py
similarity index 99%
rename from cross-py-builder/agent_manager.py
rename to cross_py_builder/agent_manager.py
index 1a366c1..6447685 100755
--- a/cross-py-builder/agent_manager.py
+++ b/cross_py_builder/agent_manager.py
@@ -293,7 +293,7 @@ def restart_agent(hostname):
 
 
 def main():
-    parser = argparse.ArgumentParser(description="Build agent manager for cross-py-builder")
+    parser = argparse.ArgumentParser(description="Build agent manager for cross_py_builder")
     parser.add_argument("--status", action="store_true", help="Get status of available servers")
     parser.add_argument("--build", type=str, help="Path to the project to build")
     parser.add_argument("--checkout", type=str, help="Url to Git repo for checkout")
diff --git a/cross-py-builder/build_agent.py b/cross_py_builder/build_agent.py
similarity index 99%
rename from cross-py-builder/build_agent.py
rename to cross_py_builder/build_agent.py
index 70a46db..ea5bd19 100755
--- a/cross-py-builder/build_agent.py
+++ b/cross_py_builder/build_agent.py
@@ -17,7 +17,7 @@ import uuid
 import platform
 from zeroconf_server import ZeroconfServer
 
-APP_NAME = "cross-py-builder"
+APP_NAME = "cross_py_builder"
 build_agent_version = "0.1.34"
 app_port = 9001
 
diff --git a/cross-py-builder/zeroconf_server.py b/cross_py_builder/zeroconf_server.py
similarity index 100%
rename from cross-py-builder/zeroconf_server.py
rename to cross_py_builder/zeroconf_server.py
diff --git a/setup.py b/setup.py
index 2a81638..9995ef9 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,14 @@
 from setuptools import setup, find_packages
 
 setup(
-    name="cross-py-builder",
+    name="cross_py_builder",
     version="0.0.1",
     packages=find_packages(),
     install_requires=open("requirements.txt").read().splitlines(),
     entry_points={
         "console_scripts": [
-            "cross-py-agent=build_agent:main",
-            "cross-py-builder=agent_manager:main",
+            "cross-py-agent=cross_py_builder.build_agent:main",
+            "cross_py_builder=cross_py_builder.agent_manager:main",
         ],
     },
     author="Brett Williams",