diff --git a/doc/manual/writing_a_driver.rst b/doc/manual/writing_a_driver.rst
index 0c62d9e5a..cc750edc0 100644
--- a/doc/manual/writing_a_driver.rst
+++ b/doc/manual/writing_a_driver.rst
@@ -51,7 +51,7 @@ and verify that you can connect to the TCP port: ::
 
 Also verify that you can get the type of the server (the "hello" string passed to ``simple_server_loop``) using the ``identify-controller.py`` program from the ARTIQ front-end tools: ::
 
-    $ identify-controller.py ::1 7777
+    $ identify_controller.py ::1 7777
     Type:       hello
 
 The client
diff --git a/frontend/artiq.py b/frontend/artiq_client.py
similarity index 100%
rename from frontend/artiq.py
rename to frontend/artiq_client.py
diff --git a/frontend/artiqd.py b/frontend/artiq_master.py
similarity index 100%
rename from frontend/artiqd.py
rename to frontend/artiq_master.py
diff --git a/frontend/identify-controller.py b/frontend/identify_controller.py
similarity index 100%
rename from frontend/identify-controller.py
rename to frontend/identify_controller.py