diff --git a/Compiler/H5root/build b/Compiler/H5root/build
index a837472..f217615 100755
--- a/Compiler/H5root/build
+++ b/Compiler/H5root/build
@@ -7,7 +7,7 @@ pbuild::post_prep() {
 }
 
 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}"
 }
 
@@ -40,7 +40,7 @@ pbuild::post_install() {
 	local sed_cmd="s:@PREFIX@:${PREFIX}:g;"
 	sed_cmd+="s:@HDF5_PREFIX@:${HDF5_SERIAL_PREFIX}:g;"
 	sed_cmd+="s:@ROOT_PREFIX@:${ROOT_PREFIX}:g;"
-	sed "${sed_cmd}" "${BUILD_BLOCK_DIR}/${V_MAJOR}/H5root" > "${PREFIX}/bin/H5root"
+	sed "${sed_cmd}" "${BUILDBLOCK_DIR}/${V_MAJOR}/H5root" > "${PREFIX}/bin/H5root"
 	chmod 0755 "${PREFIX}/bin/H5root"
 
 	# install serial HDF5 and H5hut header files
diff --git a/Compiler/OpenBLAS/build b/Compiler/OpenBLAS/build
index 12f2de1..152b226 100755
--- a/Compiler/OpenBLAS/build
+++ b/Compiler/OpenBLAS/build
@@ -17,17 +17,17 @@ pbuild::configure() {
 		die 3 "Oops: unknown compiler: ${COMPILER}"
 		;;
 	esac
-	cat <<EOF > "${MODULE_SRCDIR}/make.inc"
+	cat <<EOF > "${SRC_DIR}/make.inc"
 SHELL = /bin/sh
 PLAT = 
 DRVOPTS  = \$(NOOPT)
 ARCHFLAGS= -ru
 EOF
-	echo "USE_SIMPLE_THREADED_LEVEL3 = 1" >> "${MODULE_SRCDIR}/Makefile.rule"
-	echo "NO_AVX = 1" >> "${MODULE_SRCDIR}/Makefile.rule"
-	echo "NO_AVX2 = 1" >> "${MODULE_SRCDIR}/Makefile.rule"
-	echo "USE_THREAD = 0" >> "${MODULE_SRCDIR}/Makefile.rule"
-	sed -i.bak "s/MACOSX_DEPLOYMENT_TARGET=.*/MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET/" "${MODULE_SRCDIR}/Makefile.system"
+	echo "USE_SIMPLE_THREADED_LEVEL3 = 1" >> "${SRC_DIR}/Makefile.rule"
+	echo "NO_AVX = 1" >> "${SRC_DIR}/Makefile.rule"
+	echo "NO_AVX2 = 1" >> "${SRC_DIR}/Makefile.rule"
+	echo "USE_THREAD = 0" >> "${SRC_DIR}/Makefile.rule"
+	sed -i.bak "s/MACOSX_DEPLOYMENT_TARGET=.*/MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET/" "${SRC_DIR}/Makefile.system"
 }
 
 pbuild::build() {
diff --git a/Compiler/OpenBLAS_OMP/build b/Compiler/OpenBLAS_OMP/build
index 60e3539..93a596d 100755
--- a/Compiler/OpenBLAS_OMP/build
+++ b/Compiler/OpenBLAS_OMP/build
@@ -1,14 +1,14 @@
 #!/usr/bin/env modbuild
 
 pbuild::configure() {
-	cat <<EOF > "${MODULE_SRCDIR}/make.inc"
+	cat <<EOF > "${SRC_DIR}/make.inc"
 SHELL = /bin/sh
 PLAT = 
 DRVOPTS  = \$(OPTS)
 LOADER   = \$(FORTRAN) -pthread
 ARCHFLAGS= -ru
 EOF
-	cat <<EOF > "${MODULE_SRCDIR}/Makefile.rule"
+	cat <<EOF > "${SRC_DIR}/Makefile.rule"
 VERSION = 0.2.9
 TARGET = CORE2
 CC = gcc
@@ -24,7 +24,7 @@ EOF
 }
 
 pbuild::build() {
-	cd "${MODULE_SRCDIR}"
+	cd "${SRC_DIR}"
 	make
 }
 
diff --git a/Compiler/SuperLU/build b/Compiler/SuperLU/build
index 9136e86..db460da 100755
--- a/Compiler/SuperLU/build
+++ b/Compiler/SuperLU/build
@@ -4,7 +4,7 @@ SOURCE_URL="http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_$V.tar.gz"
 
 if (( V_MAJOR < 5 )); then
 pbuild::configure() {
-	cat <<EOF > "${MODULE_SRCDIR}/make.inc"
+	cat <<EOF > "${SRC_DIR}/make.inc"
 PLAT		= 
 SuperLUroot 	= \${PREFIX}
 SUPERLULIB   	= \$(SuperLUroot)/lib/libsuperlu.a
@@ -30,7 +30,7 @@ EOF
 }
 else
 pbuild::configure() {
-	cmake "${MODULE_SRCDIR}" \
+	cmake "${SRC_DIR}" \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		|| exit 1 
 
@@ -39,7 +39,7 @@ fi
 
 pbuild::build() {
 	if (( V_MAJOR < 5 )); then
-		cd "${MODULE_SRCDIR}"
+		cd "${SRC_DIR}"
 		mkdir -p "${PREFIX}/lib"
 	fi
 	make
@@ -48,7 +48,7 @@ pbuild::build() {
 pbuild::install() {
 	make install
 	mkdir -p "${PREFIX}/include"
-	install -m 0444 "${MODULE_SRCDIR}"/SRC/*.h "${PREFIX}/include"
+	install -m 0444 "${SRC_DIR}"/SRC/*.h "${PREFIX}/include"
 }
 
 pbuild::add_to_group 'Compiler'
diff --git a/Compiler/UMFPACK/build b/Compiler/UMFPACK/build
index 13ee965..17ce52b 100755
--- a/Compiler/UMFPACK/build
+++ b/Compiler/UMFPACK/build
@@ -3,7 +3,7 @@
 SOURCE_URL="file://$PMODULES_DISTFILESDIR/$P-V.tar.bz2"
 
 pbuild::configure() {
-	cat <<EOF > "${MODULE_SRCDIR}/SuiteSparse_config/SuiteSparse_config.mk"
+	cat <<EOF > "${SRC_DIR}/SuiteSparse_config/SuiteSparse_config.mk"
 CF = \$(CFLAGS) \$(CPPFLAGS) \$(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
 RANLIB = ranlib
 ARCHIVE = \$(AR) \$(ARFLAGS)
@@ -27,12 +27,12 @@ EOF
 }
 
 pbuild::build() {
-	cd "${MODULE_SRCDIR}/UMFPACK"
+	cd "${SRC_DIR}/UMFPACK"
 	make TARGET=CORE2 BINARY=64 USE_THREAD=0 NO_SHARED=1
 }
 
 pbuild::install() {
-	cd "${MODULE_SRCDIR}/UMFPACK"
+	cd "${SRC_DIR}/UMFPACK"
 	install -d "${PREFIX}/include"
 	install -d "${PREFIX}/lib"
 	make PREFIX="${PREFIX}" install
diff --git a/Compiler/atlas/build b/Compiler/atlas/build
index 48318b9..96ee7be 100755
--- a/Compiler/atlas/build
+++ b/Compiler/atlas/build
@@ -3,7 +3,7 @@
 SOURCE_URL="https://sourceforge.net/projects/math-atlas/files/Stable/$V/atlas$V.tar.bz2"
 
 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
diff --git a/Compiler/boost/build b/Compiler/boost/build
index 01f99e8..29c54b8 100755
--- a/Compiler/boost/build
+++ b/Compiler/boost/build
@@ -2,11 +2,11 @@
 
 SOURCE_URL="https://netcologne.dl.sourceforge.net/project/boost/boost/$V/boost_${V_MAJOR}_${V_MINOR}_${V_PATCHLVL}.tar.gz"
 
-BOOST_BUILD_PATH="${MODULE_BUILDDIR}"
+BOOST_BUILD_PATH="${BUILD_DIR}"
 
 pbuild::configure() {
-	cd "${MODULE_SRCDIR}"
-	"${MODULE_SRCDIR}"/bootstrap.sh \
+	cd "${SRC_DIR}"
+	"${SRC_DIR}"/bootstrap.sh \
 		--prefix="${PREFIX}" \
 		--with-libraries=all \
 		--with-python-root="${PYTHON_PREFIX}" \
@@ -14,10 +14,10 @@ pbuild::configure() {
 }
 
 pbuild::build() {
-	cd "${MODULE_SRCDIR}"
+	cd "${SRC_DIR}"
 	./b2 \
 		--build-type=minimal \
-		--build-dir="${MODULE_BUILDDIR}" \
+		--build-dir="${BUILD_DIR}" \
 		--layout=system \
 		--without-mpi \
 		variant=release \
@@ -27,10 +27,10 @@ pbuild::build() {
 }
 
 pbuild::install() {
-	cd "${MODULE_SRCDIR}"
+	cd "${SRC_DIR}"
 	./b2 \
 		--build-type=minimal \
-		--build-dir="${MODULE_BUILDDIR}" \
+		--build-dir="${BUILD_DIR}" \
 		--layout=system \
 		--without-mpi \
 		variant=release \
diff --git a/Compiler/clapack/build b/Compiler/clapack/build
index c0f0175..380fafb 100755
--- a/Compiler/clapack/build
+++ b/Compiler/clapack/build
@@ -5,15 +5,15 @@ SOURCE_URL="http://www.netlib.org/$P/$P-$V-CMAKE.tgz"
 
 pbuild::configure() {
 	cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
-		"${MODULE_SRCDIR}" \
+		"${SRC_DIR}" \
 		|| exit 1
 }
 
 pbuild::install() {
 	mkdir -p "${PREFIX}/include"
 	mkdir -p "${PREFIX}/lib"
-	install -m 0644 "${MODULE_BUILDDIR}/F2CLIBS/libf2c/libf2c.a" "${PREFIX}/lib"
-	install -m 0644 "${MODULE_BUILDDIR}/SRC/liblapack.a" "${PREFIX}/lib"
+	install -m 0644 "${BUILD_DIR}/F2CLIBS/libf2c/libf2c.a" "${PREFIX}/lib"
+	install -m 0644 "${BUILD_DIR}/SRC/liblapack.a" "${PREFIX}/lib"
 }
 
 pbuild::add_to_group 'Compiler'
diff --git a/Compiler/eigen3/build b/Compiler/eigen3/build
index f69eef1..03e756a 100755
--- a/Compiler/eigen3/build
+++ b/Compiler/eigen3/build
@@ -21,7 +21,7 @@ pbuild::configure() {
 	config_args+=( "-DSUPERLU_LIBRARIES=${SUPERLU_LIBRARY_DIR}" )
 	cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
 		"${config_args[@]}" \
-		"${MODULE_SRCDIR}"
+		"${SRC_DIR}"
 }
 
 pbuild::add_to_group 'Compiler'
diff --git a/Compiler/gsl/build b/Compiler/gsl/build
index fdcaa2d..8b367ed 100755
--- a/Compiler/gsl/build
+++ b/Compiler/gsl/build
@@ -3,7 +3,7 @@
 SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"
 
 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
diff --git a/Compiler/gtest/build b/Compiler/gtest/build
index 192730c..8f03d4d 100755
--- a/Compiler/gtest/build
+++ b/Compiler/gtest/build
@@ -22,11 +22,11 @@ pbuild::configure() {
                 -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
                 -DCMAKE_BUILD_TYPE=RELEASE \
                 "${config_args[@]}" \
-                "${MODULE_SRCDIR}"
+                "${SRC_DIR}"
 }
 
 pbuild::install() {
-	local -r _include_srcdir="${MODULE_SRCDIR}/include/gtest"
+	local -r _include_srcdir="${SRC_DIR}/include/gtest"
 	local -r _include_dstdir="${PREFIX}/include/gtest"
 	if [[ -e "${_include_dstdir}" ]]; then
 		chmod -R u+w "${_include_dstdir}"
diff --git a/Compiler/hdf5_serial/build b/Compiler/hdf5_serial/build
index 5526142..937642c 100755
--- a/Compiler/hdf5_serial/build
+++ b/Compiler/hdf5_serial/build
@@ -8,7 +8,7 @@ pbuild::configure() {
 		CXX=g++
 		echo "INFO: substituted pgprepro with cpp, and pgc++ with g++!"
 	}
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-shared \
 		--enable-cxx \
diff --git a/Compiler/mpich/build b/Compiler/mpich/build
index da4105d..4a3a425 100755
--- a/Compiler/mpich/build
+++ b/Compiler/mpich/build
@@ -4,7 +4,7 @@ SOURCE_URL="http://www.mpich.org/static/downloads/$V/$P-$V.tar.gz"
 
 pbuild::configure() {
 	unset F90
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-cxx \
 		--enable-fortran \
diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build
index fc3dc31..d90aa5f 100755
--- a/Compiler/openmpi/build
+++ b/Compiler/openmpi/build
@@ -8,7 +8,7 @@ pbuild::configure() {
 		config_args+=( "--with-cuda=${CUDA_HOME}" )
 	fi
 
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-mpi-cxx \
 		--enable-mpi-cxx-seek \
diff --git a/Compiler/roger/build b/Compiler/roger/build
index c3fc752..73a1381 100755
--- a/Compiler/roger/build
+++ b/Compiler/roger/build
@@ -5,7 +5,7 @@ pbuild::pre_configure() {
 }
 
 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}"
 }
 
diff --git a/Compiler/root/build b/Compiler/root/build
index b6b08d8..63be797 100755
--- a/Compiler/root/build
+++ b/Compiler/root/build
@@ -43,7 +43,7 @@ esac
 #	xml
 #
 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--enable-asimage \
 		--enable-mathmore \
 		--disable-ldap \
diff --git a/Compiler/vtk/build b/Compiler/vtk/build
index 752ceca..ffafd2c 100755
--- a/Compiler/vtk/build
+++ b/Compiler/vtk/build
@@ -23,7 +23,7 @@ pbuild::configure() {
 		-DVTK_INSTALL_INCLUDE_DIR:PATH=include \
 		-DVTK_INSTALL_LIB_DIR:PATH=lib \
 		-DVTK_USE_COCOA:BOOL=OFF \
-		"${MODULE_SRCDIR}"
+		"${SRC_DIR}"
 }
 
 pbuild::add_to_group 'Compiler'