diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder
index a4f3975a..1fee931d 100755
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@@ -93,7 +93,7 @@ enable_ccache () {
 
 
 firmware_size () {
-    if [ "${ARCH}" = "x86" ]; then
+    if [ "${ARCH}" = "virtual" ]; then
         echo "[Size not computed for virtual build]"
         return
     fi
diff --git a/etc/kaleidoscope-builder.conf b/etc/kaleidoscope-builder.conf
index 3d79d744..d0efe803 100644
--- a/etc/kaleidoscope-builder.conf
+++ b/etc/kaleidoscope-builder.conf
@@ -17,10 +17,10 @@ if [ -z "${ARCH}" ]; then
    ARCH=$(echo "${FQBN}" | sed -n -e 's/^[^:]\+:\([^:]\+\).*/\1/p')
 fi
 
-if [ "${ARCH}" = "x86" ]; then
-    FQBN="${FQBN:-keyboardio:x86:${BOARD}}"
+if [ "${ARCH}" = "virtual" ]; then
+    FQBN="${FQBN:-keyboardio:virtual:${BOARD}}"
     
-    # Set the compiler path for virtual builds (x86)
+    # Set the compiler path for virtual builds
     #
     if [ -z "${COMPILER_PATH}" ]; then
        COMPILER_PATH="/usr/bin"
@@ -157,10 +157,10 @@ ARDUINO_IDE_VERSION="10607"
 ###### Executable paths
 ######
 
-# Allow the compiler path to be empty for x86 builds
+# Allow the compiler path to be empty for virtual builds
 COMPILER_PATH="${COMPILER_PATH-${ARDUINO_TOOLS_PATH}/avr/bin/}"
 
-# Allow the compiler prefix to be empty for x86 builds
+# Allow the compiler prefix to be empty for virtual builds
 COMPILER_PREFIX="${COMPILER_PREFIX-avr-}"
 AVR_SIZE="${AVR_SIZE:-${COMPILER_PATH}/${COMPILER_PREFIX}size}"
 AVR_SIZE_FLAGS="${AVR_SIZE_FLAGS:--C --mcu=${MCU}}"