diff --git a/artiq/frontend/client.py b/artiq/frontend/artiq_client.py
similarity index 100%
rename from artiq/frontend/client.py
rename to artiq/frontend/artiq_client.py
diff --git a/artiq/frontend/ctlid.py b/artiq/frontend/artiq_ctlid.py
similarity index 100%
rename from artiq/frontend/ctlid.py
rename to artiq/frontend/artiq_ctlid.py
diff --git a/artiq/frontend/gui.py b/artiq/frontend/artiq_gui.py
similarity index 100%
rename from artiq/frontend/gui.py
rename to artiq/frontend/artiq_gui.py
diff --git a/artiq/frontend/master.py b/artiq/frontend/artiq_master.py
similarity index 100%
rename from artiq/frontend/master.py
rename to artiq/frontend/artiq_master.py
diff --git a/artiq/frontend/run.py b/artiq/frontend/artiq_run.py
similarity index 100%
rename from artiq/frontend/run.py
rename to artiq/frontend/artiq_run.py
diff --git a/setup.py b/setup.py
index bc5afe10c..335bceba8 100755
--- a/setup.py
+++ b/setup.py
@@ -28,11 +28,11 @@ setup(
     ext_modules=[],
     entry_points={
         "console_scripts": [
-            "artiq_client=artiq.frontend.client:main",
-            "artiq_ctlid=artiq.frontend.ctlid:main",
-            "artiq_gui=artiq.frontend.gui:main",
-            "artiq_master=artiq.frontend.master:main",
-            "artiq_run=artiq.frontend.run:main",
+            "artiq_client=artiq.frontend.artiq_client:main",
+            "artiq_ctlid=artiq.frontend.artiq_ctlid:main",
+            "artiq_gui=artiq.frontend.artiq_gui:main",
+            "artiq_master=artiq.frontend.artiq_master:main",
+            "artiq_run=artiq.frontend.artiq_run:main",
             "lda_client=artiq.frontend.lda_client:main",
             "lda_controller=artiq.frontend.lda_controller:main",
             "pdq2_client=artiq.frontend.pdq2_client:main",