diff --git a/artiq/frontend/artiq_flash.py b/artiq/frontend/artiq_flash.py
index bece15b71..a311a1647 100755
--- a/artiq/frontend/artiq_flash.py
+++ b/artiq/frontend/artiq_flash.py
@@ -302,7 +302,7 @@ def main():
         bin_name = args.target
         if variant:
             bin_name += "-" + variant
-        bin_dir = os.path.join(artiq_dir, "binaries", bin_name)
+        bin_dir = os.path.join(artiq_dir, "board-support", bin_name)
 
     if args.host is None:
         client = LocalClient()
diff --git a/conda/artiq-board/build.sh b/conda/artiq-board/build.sh
index ecf684b33..af9264562 100644
--- a/conda/artiq-board/build.sh
+++ b/conda/artiq-board/build.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-SOC_PREFIX=$PREFIX/site-packages/artiq/binaries/${ARTIQ_TARGET}-${ARTIQ_VARIANT}
+SOC_PREFIX=$PREFIX/site-packages/artiq/board-support/${ARTIQ_TARGET}-${ARTIQ_VARIANT}
 mkdir -p ${SOC_PREFIX}
 
 V=1 $PYTHON -m artiq.gateware.targets.${ARTIQ_TARGET} -V ${ARTIQ_VARIANT}
diff --git a/conda/artiq-sayma_rtm/build.sh b/conda/artiq-sayma_rtm/build.sh
index eceae8698..4371b299c 100644
--- a/conda/artiq-sayma_rtm/build.sh
+++ b/conda/artiq-sayma_rtm/build.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-SOC_PREFIX=$SP_DIR/artiq/binaries/sayma_rtm
+SOC_PREFIX=$SP_DIR/artiq/board-support/sayma_rtm
 mkdir -p $SOC_PREFIX
 
 $PYTHON -m artiq.gateware.targets.sayma_rtm