diff --git a/README.md b/README.md
index 1e85b23..20f07e5 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ Based on http://openjdk.java.net/projects/mobile/android.html
 ```
 export BUILD_FREETYPE_VERSION=[2.6.2/.../2.10.0] # default: 2.10.0
 export JDK_DEBUG_LEVEL=[release/fastdebug/debug] # default: release
-export JDK_VARIANT=[client/server] # default: client (aarch32), server (other architectures)
+export JVM_VARIANTS=[client/server] # default: client (aarch32), server (other architectures)
 ./extractndk.sh
 ./getlibs.sh
 ./maketoolchain.sh
diff --git a/buildjdk.sh b/buildjdk.sh
index 82bdb31..ff89372 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -5,14 +5,14 @@ set -e
 if [ "$TARGET_JDK" == "arm" ]
 then
   export TARGET_JDK=aarch32
-  if [ -z "$JDK_VARIANT"]
+  if [ -z "$JVM_VARIANTS"]
   then
-    export JDK_VARIANT=client
+    export JVM_VARIANTS=client
   fi
 else
-  if [ -z "$JDK_VARIANT"]
+  if [ -z "$JVM_VARIANTS"]
   then
-    export JDK_VARIANT=server
+    export JVM_VARIANTS=server
   fi
 fi
 
@@ -52,7 +52,7 @@ bash ./configure \
 	--enable-option-checking=fatal \
 	--openjdk-target=$TARGET \
 	--with-jdk-variant=normal \
-        --with-jvm-variants=$JDK_VARIANT \
+        --with-jvm-variants=$JVM_VARIANTS \
 	--with-cups-include=$CUPS_DIR \
 	--with-devkit=$TOOLCHAIN \
 	--with-debug-level=$JDK_DEBUG_LEVEL \
@@ -68,8 +68,8 @@ if [ "$error_code" -ne 0 ]; then
   exit $error_code
 fi
 
-# mkdir -p build/linux-${TARGET_JDK}-normal-server-${JDK_DEBUG_LEVEL}
-cd build/linux-${TARGET_JDK}-normal-server-${JDK_DEBUG_LEVEL}
+# mkdir -p build/linux-${TARGET_JDK}-normal-${JVM_VARIANTS}-${JDK_DEBUG_LEVEL}
+cd build/linux-${TARGET_JDK}-normal-${JVM_VARIANTS}-${JDK_DEBUG_LEVEL}
 make JOBS=4 images || \
 error_code=$?
 if [ "$error_code" -ne 0 ]; then
diff --git a/makejdkwithoutconfigure.sh b/makejdkwithoutconfigure.sh
index 1075390..f3114d9 100755
--- a/makejdkwithoutconfigure.sh
+++ b/makejdkwithoutconfigure.sh
@@ -7,5 +7,5 @@ export FREETYPE_DIR=`pwd`/freetype-${BUILD_FREETYPE_VERSION}/build_android-${TAR
 export CUPS_DIR=`pwd`/cups-2.2.4
 
 cd openjdk
-cd build/linux-${TARGET_JDK}-normal-server-release
+cd build/linux-${TARGET_JDK}-normal-${JVM_VARIANTS}-release
 make JOBS=4 images
diff --git a/removejdkdebuginfo.sh b/removejdkdebuginfo.sh
index c437590..d8b5656 100755
--- a/removejdkdebuginfo.sh
+++ b/removejdkdebuginfo.sh
@@ -2,7 +2,7 @@
 set -e
 rm -rf jreout || true
 
-cp -r openjdk/build/linux-${TARGET_JDK}-normal-server-${JDK_DEBUG_LEVEL}/images/j2re-image jreout
+cp -r openjdk/build/linux-${TARGET_JDK}-normal-${JVM_VARIANTS}-${JDK_DEBUG_LEVEL}/images/j2re-image jreout
 mv jreout/lib/${TARGET_JDK}/libfreetype.so.6 jreout/lib/${TARGET_JDK}/libfreetype.so || echo "Move exit $?"
 
 # mv jreout/lib/${TARGET_JDK}/libfontmanager.diz jreout/lib/${TARGET_JDK}/libfontmanager.diz.keep