diff --git a/Pmodules/environment.bash.in b/Pmodules/environment.bash.in
index b3663d5..bb06aad 100644
--- a/Pmodules/environment.bash.in
+++ b/Pmodules/environment.bash.in
@@ -26,5 +26,5 @@ declare -x PMODULES_CONFIG_DIR=$(basename $(cd $(dirname "${BASH_SOURCE}") && pw
 declare -x PMODULES_HOME="${PMODULES_ROOT}/Tools/Pmodules/${PMODULES_VERSION}"
 declare -x PMODULES_DIR="${PMODULES_HOME}"
 
-declare -x PMODULES_DISTDIR="@PMODULES_DISTDIR@"
+declare -x PMODULES_DISTFILESDIR="@PMODULES_DISTFILESDIR@"
 declare -x PMODULES_TMPDIR="@PMODULES_TMPDIR@"
diff --git a/Pmodules/libpbuild.bash b/Pmodules/libpbuild.bash
index 3a8f896..b952e68 100644
--- a/Pmodules/libpbuild.bash
+++ b/Pmodules/libpbuild.bash
@@ -356,7 +356,7 @@ pbuild::make_all() {
 	#	P		    module name
 	#	_P		    module name in upper case
 	#	MODULEPATH	    module path
-	#	PMODULES_DISTDIR    directory where all the tar-balls are stored
+	#	PMODULES_DISTFILESDIR directory where all the tar-balls are stored
 	#
 	# The following variables might already be set
 	#	V		    module version, if not set ${_P}_VERSION must
@@ -519,7 +519,7 @@ pbuild::make_all() {
 		DOCDIR="${PREFIX}/share/doc/$P"
 
 		# set tar-ball and flags for tar
-		find_tarball "${PMODULES_DISTDIR}" "${P/_serial}" "${V}"
+		find_tarball "${PMODULES_DISTFILESDIR}" "${P/_serial}" "${V}"
 
 	}
 
@@ -551,7 +551,7 @@ pbuild::make_all() {
 		DOCDIR="${PREFIX}/share/doc/$P"
 
 		# set tar-ball and flags for tar
-		find_tarball "${PMODULES_DISTDIR}" "${P/_serial}" "${V}"
+		find_tarball "${PMODULES_DISTFILESDIR}" "${P/_serial}" "${V}"
 
 		C_INCLUDE_PATH="${PREFIX}/include"
 		CPLUS_INCLUDE_PATH="${PREFIX}/include"
diff --git a/Pmodules/modbuild b/Pmodules/modbuild
index f4ae66a..0ab2fe4 100755
--- a/Pmodules/modbuild
+++ b/Pmodules/modbuild
@@ -219,11 +219,11 @@ while (( $# > 0 )); do
 		enable_cleanup_src='no'
 		;;
 	--distdir )
-		PMODULES_DISTDIR=$2
+		PMODULES_DISTFILESDIR=$2
 		shift
 		;;
 	--distdir=* )
-		PMODULES_DISTDIR=${1/--distdir=}
+		PMODULES_DISTFILESDIR=${1/--distdir=}
 		;;
 	--tmpdir )
 		PMODULES_TMPDIR=$2
@@ -287,10 +287,10 @@ else
 fi
 
 : ${PMODULES_TMPDIR:="${BUILD_BASEDIR}/tmp"}
-: ${PMODULES_DISTDIR:="${BUILD_BASEDIR}/Downloads"}
+: ${PMODULES_DISTFILESDIR:="${BUILD_BASEDIR}/Downloads"}
 
 declare -xr PMODULES_TMPDIR
-declare -xr PMODULES_DISTDIR
+declare -xr PMODULES_DISTFILESDIR
 
 declare -xr BUILD_SCRIPTSDIR="${BUILD_BASEDIR}/scripts"
 declare -xr BUILD_VERSIONSFILE="${BUILD_CONFIGDIR}/config/versions.conf"
diff --git a/config/environment.bash.psi b/config/environment.bash.psi
index 3c23fb8..876db49 100644
--- a/config/environment.bash.psi
+++ b/config/environment.bash.psi
@@ -14,6 +14,6 @@ declare -x PMODULES_DEFAULT_GROUPS='Tools Programming'
 declare -x PMODULES_DEFINED_RELEASES=':unstable:stable:deprecated:'
 declare -x PMODULES_DEFAULT_RELEASES='stable'
 
-declare -x PMODULES_DISTDIR='/afs/psi.ch/software/Pmodules/distfiles'
+declare -x PMODULES_DISTFILESDIR='/afs/psi.ch/software/Pmodules/distfiles'
 declare -x PMODULES_TMPDIR='/var/tmp/Pmodules'
 
diff --git a/install_pmodules.sh b/install_pmodules.sh
index c434228..6f03527 100755
--- a/install_pmodules.sh
+++ b/install_pmodules.sh
@@ -13,7 +13,7 @@ echo "Installing to ${PMODULES_HOME} ..."
 sed_cmd="s:@PMODULES_HOME@:${PMODULES_HOME}:g;"
 sed_cmd+="s:@PMODULES_VERSION@:${PMODULES_VERSION}:g;"
 sed_cmd+="s:@MODULES_VERSION@:${MODULES_VERSION}:g;"
-sed_cmd+="s:@PMODULES_DISTDIR@:${PMODULES_DISTDIR}:g;"
+sed_cmd+="s:@PMODULES_DISTFILESDIR@:${PMODULES_DISTFILESDIR}:g;"
 sed_cmd+="s:@PMODULES_TMPDIR@:${PMODULES_TMPDIR}:g;"
 
 sed "${sed_cmd}" "${SRC_DIR}/modulecmd.bash.in" > "${SRC_DIR}/modulecmd.bash"