diff --git a/.travis.yml b/.travis.yml
index b9f8ff14..0ec54f5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: c
 script: ./scripts/travis-build.sh
 env:
-    - PROJECT=qemu-virt-a15-test        TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64
-    - PROJECT=qemu-virt-a53-test        TOOLCHAIN=aarch64-elf-7.3.0-Linux-x86_64
+    - PROJECT=qemu-virt-arm32-test      TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64
+    - PROJECT=qemu-virt-arm64-test      TOOLCHAIN=aarch64-elf-7.3.0-Linux-x86_64
     - PROJECT=vim2-test                 TOOLCHAIN=aarch64-elf-7.3.0-Linux-x86_64
     - PROJECT=zybo-test                 TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64
     - PROJECT=rpi2-test                 TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64
@@ -20,12 +20,12 @@ env:
     - PROJECT=pc-x86-64-test            TOOLCHAIN=x86_64-elf-7.3.0-Linux-x86_64
 
     # do one build with an older toolchain
-    - PROJECT=qemu-virt-a15-test        TOOLCHAIN=arm-eabi-5.3.0-Linux-x86_64
-    - PROJECT=qemu-virt-a15-test        TOOLCHAIN=arm-eabi-4.8.2-Linux-x86_64
+    - PROJECT=qemu-virt-arm32-test      TOOLCHAIN=arm-eabi-5.3.0-Linux-x86_64
+    - PROJECT=qemu-virt-arm32-test      TOOLCHAIN=arm-eabi-4.8.2-Linux-x86_64
 
     # a few release mode builds
-    - PROJECT=qemu-virt-a15-test        TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64       DEBUG=0
-    - PROJECT=qemu-virt-a53-test        TOOLCHAIN=aarch64-elf-7.3.0-Linux-x86_64    DEBUG=0
+    - PROJECT=qemu-virt-arm32-test      TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64       DEBUG=0
+    - PROJECT=qemu-virt-arm64-test      TOOLCHAIN=aarch64-elf-7.3.0-Linux-x86_64    DEBUG=0
     - PROJECT=stm32f746g-disco-test     TOOLCHAIN=arm-eabi-7.3.0-Linux-x86_64       DEBUG=0
     - PROJECT=pc-x86-test               TOOLCHAIN=i386-elf-7.3.0-Linux-x86_64       DEBUG=0
     - PROJECT=pc-x86-64-test            TOOLCHAIN=x86_64-elf-7.3.0-Linux-x86_64     DEBUG=0
diff --git a/project/qemu-virt-a15-test.mk b/project/qemu-virt-arm32-test.mk
similarity index 78%
rename from project/qemu-virt-a15-test.mk
rename to project/qemu-virt-arm32-test.mk
index 724701e2..006ba245 100644
--- a/project/qemu-virt-a15-test.mk
+++ b/project/qemu-virt-arm32-test.mk
@@ -5,5 +5,5 @@ MODULES += \
 include project/virtual/test.mk
 include project/virtual/fs.mk
 include project/virtual/minip.mk
-include project/target/qemu-virt-a15.mk
+include project/target/qemu-virt-arm32.mk
 
diff --git a/project/qemu-virt-a53-test.mk b/project/qemu-virt-arm64-test.mk
similarity index 78%
rename from project/qemu-virt-a53-test.mk
rename to project/qemu-virt-arm64-test.mk
index 18758c04..5f3e7a93 100644
--- a/project/qemu-virt-a53-test.mk
+++ b/project/qemu-virt-arm64-test.mk
@@ -5,5 +5,5 @@ MODULES += \
 include project/virtual/test.mk
 include project/virtual/fs.mk
 include project/virtual/minip.mk
-include project/target/qemu-virt-a53.mk
+include project/target/qemu-virt-arm64.mk
 
diff --git a/project/target/qemu-virt-a15.mk b/project/target/qemu-virt-arm32.mk
similarity index 100%
rename from project/target/qemu-virt-a15.mk
rename to project/target/qemu-virt-arm32.mk
diff --git a/project/target/qemu-virt-a53.mk b/project/target/qemu-virt-arm64.mk
similarity index 100%
rename from project/target/qemu-virt-a53.mk
rename to project/target/qemu-virt-arm64.mk
diff --git a/scripts/do-qemuarm b/scripts/do-qemuarm
index bc579c1d..80cca870 100755
--- a/scripts/do-qemuarm
+++ b/scripts/do-qemuarm
@@ -54,13 +54,13 @@ shift $((OPTIND-1))
 
 if [ $DO_64BIT == 1 ]; then
     QEMU="qemu-system-aarch64 -machine virt -cpu cortex-a53"
-    PROJECT="qemu-virt-a53-test"
+    PROJECT="qemu-virt-arm64-test"
 elif [ $DO_CORTEX_M3 == 1 ]; then
     QEMU="qemu-system-arm -machine lm3s6965evb -cpu cortex-m3"
     PROJECT="lm3s6965evb-test"
 else
     QEMU="qemu-system-arm -machine virt -cpu cortex-a15"
-    PROJECT="qemu-virt-a15-test"
+    PROJECT="qemu-virt-arm32-test"
 fi
 
 ARGS=" -m $MEMSIZE -smp $SMP -kernel build-${PROJECT}/lk.elf"