diff --git a/ci_build.sh b/ci_build.sh
index 00955fd34..a8aa265e9 100755
--- a/ci_build.sh
+++ b/ci_build.sh
@@ -15,32 +15,32 @@ GIT_DESCRIBE=$(git describe --tags --abbrev=10)
 # Declare all combinations for deploy all
 # Note that the key is the name of the release object
 declare -A BUILDS
-BUILDS[openMMC-afc-bpm-3.0-${GIT_DESCRIBE}]="\
+BUILDS[afc-bpm-3.0-${GIT_DESCRIBE}]="\
      -DBOARD=afc-bpm \
      -DVERSION=3.0 \
      -DBOARD_RTM= \
      -DCMAKE_BUILD_TYPE=Release"
-BUILDS[openMMC-afc-bpm-3.1-${GIT_DESCRIBE}]="\
+BUILDS[afc-bpm-3.1-${GIT_DESCRIBE}]="\
      -DBOARD=afc-bpm \
      -DVERSION=3.1 \
      -DBOARD_RTM= \
      -DCMAKE_BUILD_TYPE=Release"
-BUILDS[openMMC-afc-timing-${GIT_DESCRIBE}]="\
+BUILDS[afc-timing-${GIT_DESCRIBE}]="\
      -DBOARD=afc-timing \
      -DVERSION= \
      -DBOARD_RTM=rtm-8sfp \
      -DCMAKE_BUILD_TYPE=Release"
-BUILDS[openMMC-debug-afc-bpm-3.0-${GIT_DESCRIBE}]="\
+BUILDS[debug-afc-bpm-3.0-${GIT_DESCRIBE}]="\
      -DBOARD=afc-bpm \
      -DVERSION=3.0 \
      -DBOARD_RTM= \
      -DCMAKE_BUILD_TYPE=RelWithDebInfo"
-BUILDS[openMMC-debug-afc-bpm-3.1-${GIT_DESCRIBE}]="\
+BUILDS[debug-afc-bpm-3.1-${GIT_DESCRIBE}]="\
      -DBOARD=afc-bpm \
      -DVERSION=3.1 \
      -DBOARD_RTM= \
      -DCMAKE_BUILD_TYPE=RelWithDebInfo"
-BUILDS[openMMC-debug-afc-timing-${GIT_DESCRIBE}]="\
+BUILDS[debug-afc-timing-${GIT_DESCRIBE}]="\
      -DBOARD=afc-timing \
      -DVERSION= \
      -DBOARD_RTM=rtm-8sfp \
@@ -52,7 +52,7 @@ case "${DEPLOY}" in
     all)
         # Generate builds for all list items
         for build in "${!BUILDS[@]}"; do
-            echo "Generating build for " ${build} && \
+            echo "Generating build for:" ${build} && \
             mkdir -p ${BUILD_DIR}-${build} && \
             cd ${BUILD_DIR}-${build} && \
             cmake ../ ${BUILDS[${build}]}
@@ -70,13 +70,13 @@ case "${DEPLOY}" in
         mkdir -p ${RELEASE_DIR}
         for build in "${!BUILDS[@]}"; do
             case "${build}" in
-                openMMC-debug*)
-                    cp build-${build}/out/openMMC.axf ${RELEASE_DIR}/openMMC-${build}.axf
+                debug*)
+                    cp ${BUILD_DIR}-${build}/out/openMMC.axf ${RELEASE_DIR}/openMMC-${build}.axf
                     ;;
 
                 *)
-                    cp build-${build}/out/openMMC.bin ${RELEASE_DIR}/openMMC-${build}.bin
-                    cp build-${build}/out/openMMC_full.bin ${RELEASE_DIR}/openMMC-full-${build}.bin
+                    cp ${BUILD_DIR}-${build}/out/openMMC.bin ${RELEASE_DIR}/openMMC-${build}.bin
+                    cp ${BUILD_DIR}-${build}/out/openMMC_full.bin ${RELEASE_DIR}/openMMC-full-${build}.bin
                     ;;
             esac
         done