diff --git a/DEVELOPER_NOTES.rst b/DEVELOPER_NOTES.rst
index 3c6724f9a..527322ef9 100644
--- a/DEVELOPER_NOTES.rst
+++ b/DEVELOPER_NOTES.rst
@@ -34,7 +34,7 @@ To avoid conflicts for development boards on the server, while using a board you
 
 To lock the KC705 for 30 minutes or until Ctrl-C is pressed:
 ::
-  flock --verbose /run/boards/kc705_1 sleep 1800
+  flock --verbose /run/boards/kc705-1 sleep 1800
 
 Check that the command acquires the lock, i.e. prints something such as:
 ::
@@ -43,7 +43,7 @@ Check that the command acquires the lock, i.e. prints something such as:
 
 To lock the KC705 for the duration of the execution of a shell:
 ::
-  flock /run/boards/kc705_1 bash
+  flock /run/boards/kc705-1 bash
 
 You may also use this script:
 ::
@@ -54,7 +54,7 @@ If the board is already locked by another user, the ``flock`` commands above wil
 
 To determine which user is locking a board, use:
 ::
-  fuser -v /run/boards/kc705_1
+  fuser -v /run/boards/kc705-1
 
 
 Selecting a development board with artiq_flash
diff --git a/artiq/frontend/artiq_devtool.py b/artiq/frontend/artiq_devtool.py
index 021b51f9c..b1a9313b5 100755
--- a/artiq/frontend/artiq_devtool.py
+++ b/artiq/frontend/artiq_devtool.py
@@ -48,7 +48,7 @@ def get_argparser():
     parser.add_argument("actions", metavar="ACTION",
                         type=str, default=[], nargs="+",
                         help="actions to perform, sequence of: "
-                             "build clean reset flash flash+log hotswap")
+                             "build clean reset flash flash+log connect hotswap")
 
     return parser
 
@@ -77,12 +77,12 @@ def main():
     flash_args = ["-t", boardtype]
     if boardtype == "sayma":
         if args.board is None:
-            args.board = "sayma_1"
-        if args.board == "sayma_1":
+            args.board = "sayma-1"
+        if args.board == "sayma-1":
             flash_args += ["--preinit-command", "ftdi_location 5:2"]
-        elif args.board == "sayma_2":
+        elif args.board == "sayma-2":
             flash_args += ["--preinit-command", "ftdi_location 3:10"]
-        elif args.board == "sayma_3":
+        elif args.board == "sayma-3":
             flash_args += ["--preinit-command", "ftdi_location 5:1"]
         else:
             raise NotImplementedError("unknown --preinit-command for {}".format(boardtype))
@@ -92,7 +92,7 @@ def main():
         "target":     args.target,
         "hostname":   args.host,
         "boardtype":  boardtype,
-        "board":      args.board if args.board else boardtype + "_1",
+        "board":      args.board if args.board else boardtype + "-1",
         "firmware":   firmware,
     }
     substs.update({