diff --git a/eidaws.endpoint_proxy/setup.py b/eidaws.endpoint_proxy/setup.py
index 60d9c5fb..67a532e9 100644
--- a/eidaws.endpoint_proxy/setup.py
+++ b/eidaws.endpoint_proxy/setup.py
@@ -11,7 +11,6 @@ def get_version(filename):
     return metadata["version"]
 
 
-_NAME = "eidaws.endpoint_proxy"
 _AUTHOR = "Daniel Armbruster"
 _AUTHOR_EMAIL = "daniel.armbruster@sed.ethz.ch"
 _DESCRIPTION = "Endpoint proxy webservice for EIDA"
@@ -32,7 +31,7 @@ def get_version(filename):
 }
 
 setup(
-    name=_NAME,
+    name="eidaws_endpoint_proxy",
     version=_VERSION,
     author=_AUTHOR,
     author_email=_AUTHOR_EMAIL,
@@ -53,8 +52,7 @@ def get_version(filename):
         "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
         "Topic :: Scientific/Engineering",
     ],
-    namespace_packages=['eidaws'],
-    packages=[_NAME],
+    packages=["eidaws.endpoint_proxy"],
     zip_safe=False,
     entry_points=_ENTRY_POINTS,
     install_requires=_DEPS,
diff --git a/eidaws.federator/setup.py b/eidaws.federator/setup.py
index a6fb8287..6dc08d97 100644
--- a/eidaws.federator/setup.py
+++ b/eidaws.federator/setup.py
@@ -11,7 +11,6 @@ def get_version(filename):
     return metadata["version"]
 
 
-_NAME = "eidaws.federator"
 _AUTHOR = "Daniel Armbruster"
 _AUTHOR_EMAIL = "daniel.armbruster@sed.ethz.ch"
 _DESCRIPTION = "Federating webservice for EIDA"
@@ -70,7 +69,7 @@ def get_version(filename):
 }
 
 setup(
-    name=_NAME,
+    name="eidaws_federator",
     version=_VERSION,
     author=_AUTHOR,
     author_email=_AUTHOR_EMAIL,
@@ -91,8 +90,7 @@ def get_version(filename):
         "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
         "Topic :: Scientific/Engineering",
     ],
-    namespace_packages=["eidaws"],
-    packages=[_NAME],
+    packages=["eidaws.federator"],
     zip_safe=False,
     entry_points=_ENTRY_POINTS,
     install_requires=_DEPS,
diff --git a/eidaws.stationlite/setup.py b/eidaws.stationlite/setup.py
index 3f6ff761..d123d439 100644
--- a/eidaws.stationlite/setup.py
+++ b/eidaws.stationlite/setup.py
@@ -11,7 +11,6 @@ def get_version(filename):
     return metadata["version"]
 
 
-_NAME = "eidaws.stationlite"
 _AUTHOR = "Daniel Armbruster"
 _AUTHOR_EMAIL = "daniel.armbruster@sed.ethz.ch"
 _DESCRIPTION = "Alternative routing webservice for EIDA"
@@ -39,7 +38,7 @@ def get_version(filename):
 }
 
 setup(
-    name=_NAME,
+    name="eidaws_stationlite",
     version=_VERSION,
     author=_AUTHOR,
     author_email=_AUTHOR_EMAIL,
@@ -60,8 +59,7 @@ def get_version(filename):
         "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
         "Topic :: Scientific/Engineering",
     ],
-    namespace_packages=["eidaws"],
-    packages=[_NAME],
+    packages=["eidaws.stationlite"],
     zip_safe=False,
     entry_points=_ENTRY_POINTS,
     install_requires=_DEPS,
diff --git a/eidaws.utils/setup.py b/eidaws.utils/setup.py
index 01d1157a..4fa6e587 100644
--- a/eidaws.utils/setup.py
+++ b/eidaws.utils/setup.py
@@ -11,7 +11,6 @@ def get_version(filename):
     return metadata["version"]
 
 
-_NAME = "eidaws.utils"
 _AUTHOR = "Daniel Armbruster"
 _AUTHOR_EMAIL = "daniel.armbruster@sed.ethz.ch"
 _DESCRIPTION = "General purpose utilities for EIDA webservices"
@@ -26,7 +25,7 @@ def get_version(filename):
 ]
 
 setup(
-    name=_NAME,
+    name="eidaws_utils",
     version=_VERSION,
     author=_AUTHOR,
     author_email=_AUTHOR_EMAIL,
@@ -47,8 +46,7 @@ def get_version(filename):
         "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
         "Topic :: Scientific/Engineering",
     ],
-    namespace_packages=["eidaws"],
-    packages=[_NAME],
+    packages=["eidaws.utils"],
     zip_safe=False,
     install_requires=_DEPS,
     setup_requires=["pytest-runner"],