diff --git a/artiq/devices/pdq2/pdq2-client b/artiq/devices/pdq2/pdq2-client
index 4ee1e0c3b..a04809489 100755
--- a/artiq/devices/pdq2/pdq2-client
+++ b/artiq/devices/pdq2/pdq2-client
@@ -16,9 +16,9 @@ def _get_args():
         Evaluates times and voltages, interpolates and uploads
         them to the controller.""")
     parser.add_argument("-s", "--server", default="::1",
-                        help="hostname or IP of the master to connect to")
+                        help="hostname or IP of the controller to connect to")
     parser.add_argument("--port", default=8889, type=int,
-                        help="TCP port to use to connect to the master")
+                        help="TCP port to use to connect to the controller")
     parser.add_argument("-c", "--channel", default=0, type=int,
                         help="channel: 3*board_num+dac_num [%(default)s]")
     parser.add_argument("-f", "--frame", default=0, type=int,
diff --git a/artiq/devices/pdq2/pdq2-controller b/artiq/devices/pdq2/pdq2-controller
index 10bc71834..b98661d79 100755
--- a/artiq/devices/pdq2/pdq2-controller
+++ b/artiq/devices/pdq2/pdq2-controller
@@ -332,12 +332,10 @@ class Pdq2:
 
 def _get_args():
     parser = argparse.ArgumentParser(description="PDQ2 controller")
-    parser.add_argument(
-        "--bind", default="::1",
-        help="hostname or IP address to bind to")
-    parser.add_argument(
-        "--port", default=8889, type=int,
-        help="TCP port to listen to")
+    parser.add_argument("--bind", default="::1",
+                        help="hostname or IP address to bind to")
+    parser.add_argument("-p", "--port", default=8889, type=int,
+                        help="TCP port to listen to")
     parser.add_argument(
         "-s", "--serial", default=None,
         help="device (FT245R) serial string [first]")