diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
index d6ecdb635..73fcf6ee3 100644
--- a/RELEASE_NOTES.rst
+++ b/RELEASE_NOTES.rst
@@ -16,6 +16,9 @@ unreleased [2.x]
     for p in patterns:
         print(p)
 * The "GUI" has been renamed the "dashboard".
+* When flashing NIST boards, use "-m nist_qcX" or "-m nist_clock" instead of
+  just "-m qcX" or "-m clock" (#290).
+
 
 1.0rc2
 ------
diff --git a/artiq/frontend/artiq_flash.py b/artiq/frontend/artiq_flash.py
index b29128a35..4de71744f 100755
--- a/artiq/frontend/artiq_flash.py
+++ b/artiq/frontend/artiq_flash.py
@@ -36,7 +36,7 @@ Prerequisites:
 """)
     parser.add_argument("-t", "--target", default="kc705",
                         help="target board, default: %(default)s")
-    parser.add_argument("-m", "--adapter", default="clock",
+    parser.add_argument("-m", "--adapter", default="nist_clock",
                         help="target adapter, default: %(default)s")
     parser.add_argument("-f", "--storage", help="write file to storage area")
     parser.add_argument("-d", "--dir", help="look for files in this directory")
diff --git a/artiq/gateware/targets/kc705.py b/artiq/gateware/targets/kc705.py
index b4ceb73f5..9a47376b9 100755
--- a/artiq/gateware/targets/kc705.py
+++ b/artiq/gateware/targets/kc705.py
@@ -368,21 +368,20 @@ def main():
     builder_args(parser)
     soc_kc705_args(parser)
     parser.add_argument("-H", "--hw-adapter", default="clock",
-                        help="hardware adapter type: qc1/clock/qc2 "
+                        help="hardware adapter type: "
+                             "nist_qc1/nist_clock/nist_qc2 "
                              "(default: %(default)s)")
     args = parser.parse_args()
 
     hw_adapter = args.hw_adapter.lower()
-    if hw_adapter == "qc1":
+    if hw_adapter == "nist_qc1":
         cls = NIST_QC1
-    elif hw_adapter == "clock":
+    elif hw_adapter == "nist_clock":
         cls = NIST_CLOCK
-    elif hw_adapter == "qc2":
+    elif hw_adapter == "nist_qc2":
         cls = NIST_QC2
     else:
-        print("Invalid hardware adapter string (-H/--hw-adapter), "
-              "choose from qc1, clock or qc2")
-        sys.exit(1)
+        raise SystemExit("Invalid hardware adapter string (-H/--hw-adapter)")
 
     soc = cls(**soc_kc705_argdict(args))
     build_artiq_soc(soc, builder_argdict(args))
diff --git a/conda/artiq-kc705-nist_clock/build.sh b/conda/artiq-kc705-nist_clock/build.sh
index cf93c2d37..bb4c78e9b 100644
--- a/conda/artiq-kc705-nist_clock/build.sh
+++ b/conda/artiq-kc705-nist_clock/build.sh
@@ -3,10 +3,10 @@
 BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh
 [ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE
 
-SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-clock
+SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-nist_clock
 mkdir -p $SOC_PREFIX
 
-$PYTHON -m artiq.gateware.targets.kc705 -H clock --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
+$PYTHON -m artiq.gateware.targets.kc705 -H nist_clock --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
 cp misoc_nist_clock_kc705/gateware/top.bit $SOC_PREFIX
 cp misoc_nist_clock_kc705/software/bios/bios.bin $SOC_PREFIX
 cp misoc_nist_clock_kc705/software/runtime/runtime.fbi $SOC_PREFIX
diff --git a/conda/artiq-kc705-nist_qc1/build.sh b/conda/artiq-kc705-nist_qc1/build.sh
index ba67df3f9..855f2bdf3 100644
--- a/conda/artiq-kc705-nist_qc1/build.sh
+++ b/conda/artiq-kc705-nist_qc1/build.sh
@@ -3,10 +3,10 @@
 BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh
 [ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE
 
-SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-qc1
+SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-nist_qc1
 mkdir -p $SOC_PREFIX
 
-$PYTHON -m artiq.gateware.targets.kc705 -H qc1 --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
+$PYTHON -m artiq.gateware.targets.kc705 -H nist_qc1 --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
 cp misoc_nist_qc1_kc705/gateware/top.bit $SOC_PREFIX
 cp misoc_nist_qc1_kc705/software/bios/bios.bin $SOC_PREFIX
 cp misoc_nist_qc1_kc705/software/runtime/runtime.fbi $SOC_PREFIX
diff --git a/conda/artiq-kc705-nist_qc2/build.sh b/conda/artiq-kc705-nist_qc2/build.sh
index 77c1487fe..988f031d3 100644
--- a/conda/artiq-kc705-nist_qc2/build.sh
+++ b/conda/artiq-kc705-nist_qc2/build.sh
@@ -3,10 +3,10 @@
 BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh
 [ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE
 
-SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-qc2
+SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-nist_qc2
 mkdir -p $SOC_PREFIX
 
-$PYTHON -m artiq.gateware.targets.kc705 -H qc2 --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
+$PYTHON -m artiq.gateware.targets.kc705 -H nist_qc2 --toolchain vivado $MISOC_EXTRA_VIVADO_CMDLINE
 cp misoc_nist_qc2_kc705/gateware/top.bit $SOC_PREFIX
 cp misoc_nist_qc2_kc705/software/bios/bios.bin $SOC_PREFIX
 cp misoc_nist_qc2_kc705/software/runtime/runtime.fbi $SOC_PREFIX
diff --git a/conda/artiq-pipistrello-nist_qc1/build.sh b/conda/artiq-pipistrello-nist_qc1/build.sh
index a1c29a8d3..664da144b 100644
--- a/conda/artiq-pipistrello-nist_qc1/build.sh
+++ b/conda/artiq-pipistrello-nist_qc1/build.sh
@@ -3,7 +3,7 @@
 BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh
 [ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE
 
-SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/pipistrello-qc1
+SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/pipistrello-nist_qc1
 mkdir -p $SOC_PREFIX
 
 $PYTHON -m artiq.gateware.targets.pipistrello $MISOC_EXTRA_ISE_CMDLINE