diff --git a/cleanit b/cleanit
index a1a6154..32f9ce7 100755
--- a/cleanit
+++ b/cleanit
@@ -22,15 +22,15 @@
     OUTDIR=`pwd`
 fi
 
-# load GCCVER and BINVER
+# load GCC_VER and BINUTILS_VER
 . ./toolvers
 
 rm -f $OUTDIR/build.log
 rm -rf $OUTDIR/build-*
-rm -rf $OUTDIR/gcc-$GCCVER
-rm -rf $OUTDIR/binutils-$BINVER
-rm -rf $OUTDIR/gdb-$GDBVER
-rm -rf $OUTDIR/gmp-$GMPVER
-rm -rf $OUTDIR/mpc-$MPCVER
-rm -rf $OUTDIR/mpfr-$MPFRVER
+rm -rf $OUTDIR/gcc-$GCC_VER
+rm -rf $OUTDIR/binutils-$BINUTILS_VER
+rm -rf $OUTDIR/gdb-$GDB_VER
+rm -rf $OUTDIR/gmp-$GMP_VER
+rm -rf $OUTDIR/mpc-$MPC_VER
+rm -rf $OUTDIR/mpfr-$MPFR_VER
 rm -f $OUTDIR/.extracted-stamp
diff --git a/doit b/doit
index 74e421b..4780121 100755
--- a/doit
+++ b/doit
@@ -150,51 +150,51 @@
 
 log date
 log echo "ARCHES='$ARCHES' PARALLEL='$PARALLEL' FETCH='$FETCH' CCACHE='$CCACHE'"
-# load GCCVER and BINVER
+# load GCC_VER and BINUTILS_VER
 . toolvers
 
 if [ "$FETCH" = "1" ]; then
-    if [ ! -f $ARCHIVES/binutils-$BINVER.tar.bz2 ]; then
-       echo fetching binutils-$BINVER
-       log wget -P $ARCHIVES -N $GNU_MIRROR/binutils/binutils-$BINVER.tar.bz2
+    if [ ! -f $ARCHIVES/binutils-$BINUTILS_VER.tar.bz2 ]; then
+       echo fetching binutils-$BINUTILS_VER
+       log wget -P $ARCHIVES -N $GNU_MIRROR/binutils/binutils-$BINUTILS_VER.tar.bz2
     fi
-    if [ ! -f $ARCHIVES/gcc-$GCCVER.tar.bz2 ]; then
-        echo fetching gcc-$GCCVER
-        log wget -P $ARCHIVES -N $GNU_MIRROR/gcc/gcc-$GCCVER/gcc-$GCCVER.tar.bz2
+    if [ ! -f $ARCHIVES/gcc-$GCC_VER.tar.bz2 ]; then
+        echo fetching gcc-$GCC_VER
+        log wget -P $ARCHIVES -N $GNU_MIRROR/gcc/gcc-$GCC_VER/gcc-$GCC_VER.tar.bz2
     fi
-    if [ ! -f $ARCHIVES/gdb-$GDBVER.tar.xz ]; then
-        echo fetching gdb-$GDBVER
-        log wget -P $ARCHIVES -N $GNU_MIRROR/gdb/gdb-$GDBVER.tar.xz
+    if [ ! -f $ARCHIVES/gdb-$GDB_VER.tar.xz ]; then
+        echo fetching gdb-$GDB_VER
+        log wget -P $ARCHIVES -N $GNU_MIRROR/gdb/gdb-$GDB_VER.tar.xz
     fi
-    if [ ! -f $ARCHIVES/mpfr-$MPFRVER.tar.bz2 ]; then
-        echo fetching mpfr-$MPFRVER
-        log wget -P $ARCHIVES -N $GNU_MIRROR/mpfr/mpfr-$MPFRVER.tar.bz2
+    if [ ! -f $ARCHIVES/mpfr-$MPFR_VER.tar.bz2 ]; then
+        echo fetching mpfr-$MPFR_VER
+        log wget -P $ARCHIVES -N $GNU_MIRROR/mpfr/mpfr-$MPFR_VER.tar.bz2
     fi
-    if [ ! -f $ARCHIVES/mpc-$MPCVER.tar.gz ]; then
-        echo fetching mpc-$MPCVER
-        log wget -P $ARCHIVES -N $GNU_MIRROR/mpc/mpc-$MPCVER.tar.gz
+    if [ ! -f $ARCHIVES/mpc-$MPC_VER.tar.gz ]; then
+        echo fetching mpc-$MPC_VER
+        log wget -P $ARCHIVES -N $GNU_MIRROR/mpc/mpc-$MPC_VER.tar.gz
     fi
-    if [ ! -f $ARCHIVES/gmp-$GMPVER.tar.bz2 ]; then
-        echo fetching gmp-$GMPVER
-        log wget -P $ARCHIVES -N $GNU_MIRROR/gmp/gmp-$GMPVER.tar.bz2
+    if [ ! -f $ARCHIVES/gmp-$GMP_VER.tar.bz2 ]; then
+        echo fetching gmp-$GMP_VER
+        log wget -P $ARCHIVES -N $GNU_MIRROR/gmp/gmp-$GMP_VER.tar.bz2
     fi
 fi
 
 if [ ! -f $OUTDIR/.extracted-stamp ]; then
-    extract-tool binutils $BINVER .bz2 $BINHASH $PATCHES/binutils-patch.txt
-    extract-tool gcc $GCCVER .bz2 $GCCHASH $PATCHES/gcc-patch.txt
-    extract-tool gdb $GDBVER .xz $GDBHASH $PATCHES/gdb-patch.txt
-    extract-tool gmp $GMPVER .bz2 $GMPHASH
-    extract-tool mpc $MPCVER .gz $MPCHASH
-    extract-tool mpfr $MPFRVER .bz2 $MPFRHASH
+    extract-tool binutils $BINUTILS_VER .bz2 $BINUTILS_HASH $PATCHES/binutils-patch.txt
+    extract-tool gcc $GCC_VER .bz2 $GCC_HASH $PATCHES/gcc-patch.txt
+    extract-tool gdb $GDB_VER .xz $GDB_HASH $PATCHES/gdb-patch.txt
+    extract-tool gmp $GMP_VER .bz2 $GMP_HASH
+    extract-tool mpc $MPC_VER .gz $MPC_HASH
+    extract-tool mpfr $MPFR_VER .bz2 $MPFR_HASH
     touch $OUTDIR/.extracted-stamp
 fi
 
 # link the last three libs into gcc
-pushd $OUTDIR/gcc-$GCCVER
-ln -sf ../gmp-$GMPVER gmp
-ln -sf ../mpc-$MPCVER mpc
-ln -sf ../mpfr-$MPFRVER mpfr
+pushd $OUTDIR/gcc-$GCC_VER
+ln -sf ../gmp-$GMP_VER gmp
+ln -sf ../mpc-$MPC_VER mpc
+ln -sf ../mpfr-$MPFR_VER mpfr
 popd
 
 COMMON_CONFIG=--with-included-gettext
@@ -207,10 +207,10 @@
         TARGET=$ARCH-elf
     fi
 
-    INSTALLPATH=$OUTDIR/$TARGET-$GCCVER-$OS-$HOSTARCH
-    BINBUILDPATH=$OUTDIR/build-binutils-$BINVER-$ARCH-$OS-$HOSTARCH
-    GCCBUILDPATH=$OUTDIR/build-gcc-$GCCVER-$ARCH-$OS-$HOSTARCH
-    GDBBUILDPATH=$OUTDIR/build-gdb-$GDBVER-$ARCH-$OS-$HOSTARCH
+    INSTALLPATH=$OUTDIR/$TARGET-$GCC_VER-$OS-$HOSTARCH
+    BINBUILDPATH=$OUTDIR/build-binutils-$BINUTILS_VER-$ARCH-$OS-$HOSTARCH
+    GCCBUILDPATH=$OUTDIR/build-gcc-$GCC_VER-$ARCH-$OS-$HOSTARCH
+    GDBBUILDPATH=$OUTDIR/build-gdb-$GDB_VER-$ARCH-$OS-$HOSTARCH
     export PATH=$INSTALLPATH/bin:$PATH
 
     # Building Binutils
@@ -223,7 +223,7 @@
         echo building binutils
         mkdir -p $BINBUILDPATH
         pushd $BINBUILDPATH
-        log ../binutils-$BINVER/configure $COMMON_CONFIG --target=$TARGET --prefix=$INSTALLPATH --disable-werror --enable-initfini-array --enable-gold $EXTRA_TARGETS
+        log ../binutils-$BINUTILS_VER/configure $COMMON_CONFIG --target=$TARGET --prefix=$INSTALLPATH --disable-werror --enable-initfini-array --enable-gold $EXTRA_TARGETS
         log $MAKE $PARALLEL
         log $MAKE install
         touch built.txt
@@ -240,7 +240,7 @@
 
         mkdir -p $GCCBUILDPATH
         pushd $GCCBUILDPATH
-        log ../gcc-$GCCVER/configure $COMMON_CONFIG --target=$TARGET --prefix=$INSTALLPATH --enable-languages=c,c++ $ARCH_OPTIONS --disable-werror
+        log ../gcc-$GCC_VER/configure $COMMON_CONFIG --target=$TARGET --prefix=$INSTALLPATH --enable-languages=c,c++ $ARCH_OPTIONS --disable-werror
         log $MAKE all-gcc $PARALLEL
         log $MAKE all-target-libgcc $PARALLEL
         log $MAKE install-gcc
@@ -258,7 +258,7 @@
         echo building gdb
         mkdir -p $GDBBUILDPATH
         pushd $GDBBUILDPATH
-        log ../gdb-$GDBVER/configure $COMMON_CONFIG --target=$TARGET --prefix=$INSTALLPATH --disable-werror $EXTRA_TARGETS
+        log ../gdb-$GDB_VER/configure $COMMON_CONFIG --target=$TARGET --prefix=$INSTALLPATH --disable-werror $EXTRA_TARGETS
         log make $PARALLEL
         log make install
         touch built.txt
diff --git a/toolvers b/toolvers
index 2827184..e491d52 100644
--- a/toolvers
+++ b/toolvers
@@ -1,14 +1,14 @@
 # Rerun updatetoolvers after modifying this file
-GCCVER=6.2.0
-BINVER=2.27
-GDBVER=7.10.1
-GMPVER=5.1.3
-MPCVER=1.0.3
-MPFRVER=3.1.3
+GCC_VER=6.2.0
+BINUTILS_VER=2.27
+GDB_VER=7.10.1
+GMP_VER=5.1.3
+MPC_VER=1.0.3
+MPFR_VER=3.1.3
 # Below is autogenerated by updatetoolvers
-GCCHASH=9944589fc722d3e66308c0ce5257788ebd7872982a718aa2516123940671b7c5
-BINHASH=369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88
-GDBHASH=25c72f3d41c7c8554d61cacbeacd5f40993276d2ccdec43279ac546e3993d6d5
-GMPHASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
-MPCHASH=617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3
-MPFRHASH=f63bb459157cacd223caac545cb816bcdb5a0de28b809e7748b82e9eb89b0afd
+GCC_HASH=9944589fc722d3e66308c0ce5257788ebd7872982a718aa2516123940671b7c5
+BINUTILS_HASH=369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88
+GDB_HASH=25c72f3d41c7c8554d61cacbeacd5f40993276d2ccdec43279ac546e3993d6d5
+GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
+MPC_HASH=617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3
+MPFR_HASH=f63bb459157cacd223caac545cb816bcdb5a0de28b809e7748b82e9eb89b0afd
diff --git a/updatetoolvers b/updatetoolvers
index 6cad08a..f899e6b 100755
--- a/updatetoolvers
+++ b/updatetoolvers
@@ -32,34 +32,34 @@
 }
 
 
-fetch_and_verify "$GNU_MIRROR/binutils/" "binutils-$BINVER.tar.bz2"
-fetch_and_verify "$GNU_MIRROR/gcc/gcc-$GCCVER/" "gcc-$GCCVER.tar.bz2"
-fetch_and_verify "$GNU_MIRROR/gdb/" "gdb-$GDBVER.tar.xz"
-fetch_and_verify "$GNU_MIRROR/mpfr/" "mpfr-$MPFRVER.tar.bz2"
-fetch_and_verify "$GNU_MIRROR/mpc/" "mpc-$MPCVER.tar.gz"
-fetch_and_verify "$GNU_MIRROR/gmp/" "gmp-$GMPVER.tar.bz2"
+fetch_and_verify "$GNU_MIRROR/binutils/" "binutils-$BINUTILS_VER.tar.bz2"
+fetch_and_verify "$GNU_MIRROR/gcc/gcc-$GCC_VER/" "gcc-$GCC_VER.tar.bz2"
+fetch_and_verify "$GNU_MIRROR/gdb/" "gdb-$GDB_VER.tar.xz"
+fetch_and_verify "$GNU_MIRROR/mpfr/" "mpfr-$MPFR_VER.tar.bz2"
+fetch_and_verify "$GNU_MIRROR/mpc/" "mpc-$MPC_VER.tar.gz"
+fetch_and_verify "$GNU_MIRROR/gmp/" "gmp-$GMP_VER.tar.bz2"
 
-BINHASH=$(shasum -a 256 -b "$ARCHIVES/binutils-$BINVER.tar.bz2" | cut -f1 -d' ')
-GCCHASH=$(shasum -a 256 -b "$ARCHIVES/gcc-$GCCVER.tar.bz2" | cut -f1 -d' ')
-GDBHASH=$(shasum -a 256 -b "$ARCHIVES/gdb-$GDBVER.tar.xz" | cut -f1 -d' ')
-MPFRHASH=$(shasum -a 256 -b "$ARCHIVES/mpfr-$MPFRVER.tar.bz2" | cut -f1 -d' ')
-MPCHASH=$(shasum -a 256 -b "$ARCHIVES/mpc-$MPCVER.tar.gz" | cut -f1 -d' ')
-GMPHASH=$(shasum -a 256 -b "$ARCHIVES/gmp-$GMPVER.tar.bz2" | cut -f1 -d' ')
+BINUTILS_HASH=$(shasum -a 256 -b "$ARCHIVES/binutils-$BINUTILS_VER.tar.bz2" | cut -f1 -d' ')
+GCC_HASH=$(shasum -a 256 -b "$ARCHIVES/gcc-$GCC_VER.tar.bz2" | cut -f1 -d' ')
+GDB_HASH=$(shasum -a 256 -b "$ARCHIVES/gdb-$GDB_VER.tar.xz" | cut -f1 -d' ')
+MPFR_HASH=$(shasum -a 256 -b "$ARCHIVES/mpfr-$MPFR_VER.tar.bz2" | cut -f1 -d' ')
+MPC_HASH=$(shasum -a 256 -b "$ARCHIVES/mpc-$MPC_VER.tar.gz" | cut -f1 -d' ')
+GMP_HASH=$(shasum -a 256 -b "$ARCHIVES/gmp-$GMP_VER.tar.bz2" | cut -f1 -d' ')
 
 tmp=$(mktemp)
 echo "# Rerun updatetoolvers after modifying this file" > "$tmp"
-echo "GCCVER=$GCCVER" >> "$tmp"
-echo "BINVER=$BINVER" >> "$tmp"
-echo "GDBVER=$GDBVER" >> "$tmp"
-echo "GMPVER=$GMPVER" >> "$tmp"
-echo "MPCVER=$MPCVER" >> "$tmp"
-echo "MPFRVER=$MPFRVER" >> "$tmp"
+echo "GCC_VER=$GCC_VER" >> "$tmp"
+echo "BINUTILS_VER=$BINUTILS_VER" >> "$tmp"
+echo "GDB_VER=$GDB_VER" >> "$tmp"
+echo "GMP_VER=$GMP_VER" >> "$tmp"
+echo "MPC_VER=$MPC_VER" >> "$tmp"
+echo "MPFR_VER=$MPFR_VER" >> "$tmp"
 
 echo "# Below is autogenerated by updatetoolvers" >> "$tmp"
-echo "GCCHASH=$GCCHASH" >> "$tmp"
-echo "BINHASH=$BINHASH" >> "$tmp"
-echo "GDBHASH=$GDBHASH" >> "$tmp"
-echo "GMPHASH=$GMPHASH" >> "$tmp"
-echo "MPCHASH=$MPCHASH" >> "$tmp"
-echo "MPFRHASH=$MPFRHASH" >> "$tmp"
+echo "GCC_HASH=$GCC_HASH" >> "$tmp"
+echo "BINUTILS_HASH=$BINUTILS_HASH" >> "$tmp"
+echo "GDB_HASH=$GDB_HASH" >> "$tmp"
+echo "GMP_HASH=$GMP_HASH" >> "$tmp"
+echo "MPC_HASH=$MPC_HASH" >> "$tmp"
+echo "MPFR_HASH=$MPFR_HASH" >> "$tmp"
 mv "$tmp" "$TOOLVERS_FILE"