From b129a8d05db9fe60cbee19465de7020c912f9e60 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 4 Jun 2015 20:38:33 +0200
Subject: [PATCH] - em.xyz renamed to pmodules.xxy - underscore removed as
 prefix of function names - keyword function removed

---
 lib/lib.bash                                 |   2 +-
 lib/libpmodules.bash                         | 149 ++++++++++---------
 scripts/Bootstrap/Modules/build              |  10 +-
 scripts/Bootstrap/Pmodules/bash              |   2 +-
 scripts/Bootstrap/Pmodules/dialog.bash       |  36 ++---
 scripts/Bootstrap/Pmodules/modmanage.bash.in |   4 +-
 scripts/Bootstrap/Pmodules/modsync.bash      |  22 +--
 scripts/Bootstrap/Tcl/build                  |  12 +-
 scripts/Bootstrap/bash/build                 |   8 +-
 scripts/Bootstrap/coreutils/build            |   8 +-
 scripts/Bootstrap/dialog/build               |   8 +-
 scripts/Bootstrap/getopt/build               |  14 +-
 scripts/Bootstrap/gettext/build              |   8 +-
 scripts/Compiler/H5root/build                |  14 +-
 scripts/Compiler/OpenBLAS/build              |  22 +--
 scripts/Compiler/OpenBLAS_OMP/build          |  22 +--
 scripts/Compiler/SuperLU/build               |  20 +--
 scripts/Compiler/UMFPACK/build               |  18 +--
 scripts/Compiler/atlas/build                 |  12 +-
 scripts/Compiler/boost/build                 |  17 +--
 scripts/Compiler/gsl/build                   |  14 +-
 scripts/Compiler/hdf5_serial/build           |  12 +-
 scripts/Compiler/mpich/build                 |  14 +-
 scripts/Compiler/openmpi/build               |  14 +-
 scripts/Compiler/root/build                  |  16 +-
 scripts/Compiler/vtk/build                   |  14 +-
 scripts/HDF5/H5hut/build                     |  20 +--
 scripts/HDF5/netcdf/build                    |  16 +-
 scripts/HDF5_serial/H5hut_serial/build       |  16 +-
 scripts/Libraries/giflib/build               |  10 +-
 scripts/Libraries/gmp/build                  |   8 +-
 scripts/Libraries/libungif/build             |  10 +-
 scripts/Libraries/mpc/build                  |  10 +-
 scripts/Libraries/mpfr/build                 |  10 +-
 scripts/Libraries/tiff/build                 |  10 +-
 scripts/MPI/BoxLib/build                     |  14 +-
 scripts/MPI/OPAL.14/build                    |  14 +-
 scripts/MPI/OPAL/build                       |  14 +-
 scripts/MPI/SuperLU_DIST/build               |  20 +--
 scripts/MPI/cpmd/build                       |  14 +-
 scripts/MPI/gromacs/build                    |  14 +-
 scripts/MPI/hdf5/build                       |  14 +-
 scripts/MPI/ippl/build                       |  14 +-
 scripts/MPI/parmetis/build                   |  20 +--
 scripts/MPI/trilinos/build                   |  14 +-
 scripts/OPAL/opt-pilot/build                 |  14 +-
 scripts/Programming/Python/build             |  14 +-
 scripts/Programming/Tcl/build                |  12 +-
 scripts/Programming/Tk/build                 |  14 +-
 scripts/Programming/autoconf/build           |  12 +-
 scripts/Programming/automake/build           |  12 +-
 scripts/Programming/binutils/build           |  10 +-
 scripts/Programming/cmake/build              |  10 +-
 scripts/Programming/gcc/build                |  12 +-
 scripts/Programming/gtest/build              |  10 +-
 scripts/Programming/libtool/build            |  12 +-
 scripts/Programming/m4/build                 |   8 +-
 scripts/Programming/psi-python27/build       |  12 +-
 scripts/System/filebench/build               |  12 +-
 scripts/System/fsstress/build                |  16 +-
 scripts/System/mdtest/build                  |  16 +-
 scripts/System/nmap/build                    |  14 +-
 scripts/System/patchelf/build                |  12 +-
 scripts/System/unison/build                  |  16 +-
 scripts/Tools/emacs/build                    |  14 +-
 scripts/Tools/git/build                      |  14 +-
 scripts/Tools/global/build                   |  12 +-
 scripts/Tools/gnuplot/build                  |  12 +-
 68 files changed, 522 insertions(+), 522 deletions(-)

diff --git a/lib/lib.bash b/lib/lib.bash
index 1d76ebf..99c1d38 100644
--- a/lib/lib.bash
+++ b/lib/lib.bash
@@ -34,7 +34,7 @@ set -o errexit
 
 trap "error_handler" ERR
 
-function error_handler() {
+error_handler() {
 	local -i ec=$?
 
 	exit ${ec}
diff --git a/lib/libpmodules.bash b/lib/libpmodules.bash
index 6c61f69..d7333da 100644
--- a/lib/libpmodules.bash
+++ b/lib/libpmodules.bash
@@ -56,7 +56,7 @@ declare -x  DYLD_LIBRARY_PATH
 
 ##############################################################################
 #
-function usage() {
+usage() {
 	error "
 Usage: $0 [OPTIONS..] [VERSION] [ENV=VALUE...]
 
@@ -104,28 +104,24 @@ is_release () {
 
 ##############################################################################
 #
-# test whether a module is loaded or not
+# set supported OS
 #
-# $1: module name
+# $1: OS (as printed by 'uname -s')
 #
-em.is_loaded() {
-        [[ :${LOADEDMODULES}: =~ :$1: ]]
-}
-
-function em.set_release() {
-	is_release "$1" || die 1 "$P: unknown release type: $1"
-	[[ "$1" == "deprecated" ]] && die 0 "$P: is deprecated, we don't rebuild it."
-	MODULE_RELEASE="$1"
-}
-
-function em.supported_os() {
+pmodules.supported_os() {
 	for os in "$@"; do
 		[[ ${os} == ${OS} ]] && return 0
 	done
 	die 0 "${P}: Not available for ${OS}."
 }
 
-function em.add_to_group() {
+##############################################################################
+#
+# install module in given group
+#
+# $1: group
+#
+pmodules.add_to_group() {
 	if [[ -z ${1} ]]; then
 		die 42 "${FUNCNAME}: Missing group argument."
 	fi
@@ -135,31 +131,36 @@ function em.add_to_group() {
 	MODULE_GROUP=$1
 }
 
-em.add_to_family() {
-	em.add_to_group "$@"
-}
-
-function em.set_build_dependencies() {
+##############################################################################
+#
+# install module in given group
+#
+# $1: group
+#
+pmodules.set_build_dependencies() {
 	MODULE_BUILD_DEPENDENCIES=("$@")
 }
 
-function em.set_runtime_dependencies() {
-	MODULE_DEPENDENCIES=("$@")
-}
-
-function em.set_supported_compilers() {
-	MODULE_SUPPORTED_COMPILERS=("$@")
-}
-
-function em.set_docfiles() {
+pmodules.set_docfiles() {
 	MODULE_DOCFILES=("$@")
 }
 
-function module_is_available() {
+module_is_available() {
 	[[ -n $("${MODULECMD}" bash avail "$1" 2>&1 1>/dev/null) ]]
 }
 
-function _load_build_dependencies() {
+##############################################################################
+#
+# test whether a module is loaded or not
+#
+# $1: module name
+#
+is_loaded() {
+        [[ :${LOADEDMODULES}: =~ :$1: ]]
+}
+
+
+load_build_dependencies() {
 	for m in "${MODULE_BUILD_DEPENDENCIES[@]}"; do
 		[[ -z $m ]] && continue
 		if [[ ! $m =~ "*/*" ]]; then
@@ -170,7 +171,7 @@ function _load_build_dependencies() {
 				echo "$m: warning: No version set, loading default ..."
 			fi
 		fi
-		em.is_loaded "$m" && continue
+		is_loaded "$m" && continue
 		if ! module_is_available "$m"; then
 		        debug "${m}: module not available"
 			local rels=( ${releases//:/ } )
@@ -240,12 +241,12 @@ function _load_build_dependencies() {
 }
 
 if [[ ${bootstrap} == yes ]]; then
-    function _load_build_dependencies() {
+    load_build_dependencies() {
 	    :
     }
 fi
 
-function _write_runtime_dependencies() {
+write_runtime_dependencies() {
 	local -r fname="${PREFIX}/.dependencies"
 	info "Writing run-time dependencies to ${fname}"
 	local dep
@@ -260,7 +261,7 @@ function _write_runtime_dependencies() {
 	done
 }
 
-function _write_build_dependencies() {
+write_build_dependencies() {
 	local -r fname="${PREFIX}/.build_dependencies"
 	info "Writing build dependencies to ${fname}"
 	local dep
@@ -279,7 +280,7 @@ function _write_build_dependencies() {
 # 
 # cleanup environment
 #
-em.cleanup_env() {
+pmodules.cleanup_env() {
 
 	C_INCLUDE_PATH=''
 	CPLUS_INCLUDE_PATH=''
@@ -320,7 +321,7 @@ em.cleanup_env() {
 # $2: name without version
 # $3: version
 #
-function find_tarball() {
+find_tarball() {
 	local -r dir=$1
 	local -r name=$2
 	local -r version=$3
@@ -346,7 +347,7 @@ function find_tarball() {
 }
 
 #setup module specific environment
-function _setup_env2() {
+setup_env2() {
 	if [[ -z ${MODULE_GROUP} ]]; then
 		die 1 "$P: group not set."
 	fi
@@ -499,7 +500,7 @@ function _setup_env2() {
 }
 
 # redefine function for bootstrapping
-function _setup_env2_bootstrap() {
+setup_env2_bootstrap() {
 	if [[ -z ${MODULE_GROUP} ]]; then
 		die 1 "$P: group not set."
 	fi
@@ -538,7 +539,7 @@ function _setup_env2_bootstrap() {
 	PATH+=":${PREFIX}/bin"
 }
 
-function _prep() {
+prep() {
 
 	# untar sources
 	if [[ ! -d ${MODULE_SRCDIR} ]]; then
@@ -551,34 +552,34 @@ function _prep() {
 
 }
 
-function em.pre_configure() {
+pmodules.pre_configure() {
 	:
 }
 
-function em.configure() {
+pmodules.configure() {
 	${MODULE_SRCDIR}/configure \
 		--prefix="${PREFIX}"
 }
 
-function em.build() {
+pmodules.build() {
 	make -j${JOBS}
 }
 
-function em.install() {
+pmodules.install() {
 	make install
 }
 
-function em.post_install() {
+pmodules.post_install() {
 	:
 }
 
-function em.install_doc() {
+pmodules.install_doc() {
 	info "Installing documentation to ${DOCDIR}"
 	install -m 0755 -d "${DOCDIR}"
 	install -m0444 "${MODULE_DOCFILES[@]/#/${MODULE_SRCDIR}/}" "${BUILDSCRIPT}" "${DOCDIR}"
 }
 
-function _set_legacy_link() {
+set_legacy_link() {
 	local -r link_name="${PMODULES_ROOT}/${PMODULES_MODULEFILES_DIR}/${MODULE_GROUP}/${MODULE_NAME}"
 	local -r dir_name=${link_name%/*}
 	local -r release_file="${dir_name}/.release-${MODULE_NAME##*/}"
@@ -598,7 +599,7 @@ function _set_legacy_link() {
 	echo "${MODULE_RELEASE}" > "${release_file}"
 }
 
-function _set_link() {
+set_link() {
 	local -r link_name="${PMODULES_ROOT}/${MODULE_GROUP}/${PMODULES_MODULEFILES_DIR}/${MODULE_NAME}"
 	local -r dir_name=${link_name%/*}
 	local -r release_file="${dir_name}/.release-${MODULE_NAME##*/}"
@@ -618,7 +619,7 @@ function _set_link() {
 	echo "${MODULE_RELEASE}" > "${release_file}"
 }
 
-function em.cleanup_build() {
+pmodules.cleanup_build() {
 	[[ -n "${MODULE_BUILDDIR}" ]]     \
 		|| die 1 "Oops: internal error: MODULE_BUILDDIR is set to empty string..."
 	[[ "${MODULE_BUILDDIR}" == "/" ]] \
@@ -629,7 +630,7 @@ function em.cleanup_build() {
 	rm -rf  "/${MODULE_BUILDDIR}"
 }
 
-function em.cleanup_src() {
+pmodules.cleanup_src() {
     (
 	[[ -d /${MODULE_SRCDIR} ]] || return 0
 	cd "/${MODULE_SRCDIR}/..";
@@ -641,7 +642,7 @@ function em.cleanup_src() {
 	return 0
 }
 
-function _check_compiler() {
+check_compiler() {
 	test -z ${MODULE_SUPPORTED_COMPILERS} && return 0
 	for cc in ${MODULE_SUPPORTED_COMPILERS[@]}; do
 		if [[ ${COMPILER}/${COMPILER_VERSION} =~ ${cc} ]]; then
@@ -652,62 +653,62 @@ function _check_compiler() {
 }
 
 # unfortunatelly we need sometime an OS depended post-install
-function _post_install_linux() {
+post_install_linux() {
 	cd "${PREFIX}"
 	# solve multilib problem with LIBRARY_PATH on 64bit Linux
 	[[ -d "lib" ]] && [[ ! -d "lib64" ]] && ln -s lib lib64
 	return 0
 }
 
-function _post_install() {
+post_install() {
 	info "Run post-installation for ${OS} ..."
-	[[ "${OS}" == "Linux" ]] && _post_install_linux
+	[[ "${OS}" == "Linux" ]] && post_install_linux
 	info "Post-installation done ..."
 	return 0
 }
 
-function em.make_all() {
+pmodules.make_all() {
 	local building='no'
 	echo "${P}:"
 	_setup_env1
-	_load_build_dependencies
+	load_build_dependencies
 	# setup module specific environment
 	if [[ ${bootstrap} == no ]]; then
-		_setup_env2
+		setup_env2
 	else
-		_setup_env2_bootstrap
+		setup_env2_bootstrap
 	fi
 
 	if [[ ! -d "${PREFIX}" ]] || [[ ${force_rebuild} == 'yes' ]]; then
 		building='yes'
  		echo "Building $P/$V ..."
 		[[ ${dry_run} == yes ]] && die 0 ""
-		_check_compiler
-		_prep
+		check_compiler
+		prep
 		cd "${MODULE_SRCDIR}"
-		em.pre_configure
+		pmodules.pre_configure
 		cd "${MODULE_BUILDDIR}"
-		em.configure
-		em.build
-		em.install
-		em.post_install
-		em.install_doc
-		_post_install
+		pmodules.configure
+		pmodules.build
+		pmodules.install
+		pmodules.post_install
+		pmodules.install_doc
+		post_install
 		if [[ ${bootstrap} == 'no' ]]; then
-			_write_runtime_dependencies
-			_write_build_dependencies
+			write_runtime_dependencies
+			write_build_dependencies
 		fi
-		[[ ${enable_cleanup_build} == yes ]] && em.cleanup_build
-		[[ ${enable_cleanup_src} == yes ]] && em.cleanup_src
+		[[ ${enable_cleanup_build} == yes ]] && pmodules.cleanup_build
+		[[ ${enable_cleanup_src} == yes ]] && pmodules.cleanup_src
 		
 	else
  		echo "Not rebuilding $P/$V ..."
 	fi
 	if [[ ${bootstrap} == 'no' ]]; then
 		if [[ -d "${PMODULES_ROOT}/${PMODULES_MODULEFILES_DIR}" ]]; then
-			_set_legacy_link
+			set_legacy_link
 		fi
-		_set_link
+		set_link
 	fi
 	return 0
 }
@@ -722,7 +723,7 @@ bootstrap='no'
 enable_cleanup_build='yes'
 enable_cleanup_src='no'
 
-em.cleanup_env
+pmodules.cleanup_env
 
 # array collecting all modules specified on the command line via '--with=module'
 with_modules=()
diff --git a/scripts/Bootstrap/Modules/build b/scripts/Bootstrap/Modules/build
index b8795df..a7285bb 100755
--- a/scripts/Bootstrap/Modules/build
+++ b/scripts/Bootstrap/Modules/build
@@ -1,12 +1,12 @@
 #!/bin/bash
 #set -o functrace
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
 TCL_DIR="${PMODULES_ROOT}/Tools/Pmodules/${PMODULES_VERSION}"
 
 PATH="${TCL_DIR}/bin:${PATH}"
 
-function em.configure() {
+pmodules.configure() {
 	case ${OS} in
 		Linux )
 			declare -x LIBS="-lz -lpthread"
@@ -25,7 +25,7 @@ function em.configure() {
 		|| exit 1
 }
 
-function em.post_install() {
+pmodules.post_install() {
 	rm -v    ${PREFIX}/Modules/bin/add.modules
 	rm -v    ${PREFIX}/Modules/bin/mkroot
 	rm -rfv  ${PREFIX}/Modules/modulefiles
@@ -47,8 +47,8 @@ module() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family 'Tools'
-em.make_all
+pmodules.add_to_group 'Tools'
+pmodules.make_all
 
 # Local Variables:
 # mode: sh
diff --git a/scripts/Bootstrap/Pmodules/bash b/scripts/Bootstrap/Pmodules/bash
index 3a8293a..0b48b74 100644
--- a/scripts/Bootstrap/Pmodules/bash
+++ b/scripts/Bootstrap/Pmodules/bash
@@ -108,7 +108,7 @@ prepend_path () {
 # Based on solution published here:
 # https://stackoverflow.com/questions/273909/how-do-i-manipulate-path-elements-in-shell-scripts 
 #
-function replace_path () {
+replace_path () {
 	local -r path=$1
 	local -r removepat=$2
 	local -r replacestr=$3
diff --git a/scripts/Bootstrap/Pmodules/dialog.bash b/scripts/Bootstrap/Pmodules/dialog.bash
index fe2df76..161546f 100755
--- a/scripts/Bootstrap/Pmodules/dialog.bash
+++ b/scripts/Bootstrap/Pmodules/dialog.bash
@@ -13,7 +13,7 @@ declare -A fmmap        # module name to family member mapping
 declare -a relmap       # module info index to release mapping
 declare tempfile        # temporary dialog results
 
-function set_difference() {  #  $1 \ $2
+set_difference() {  #  $1 \ $2
     local -a operand1=($1)
     local -a operand2=($2)
     local -A members
@@ -27,7 +27,7 @@ function set_difference() {  #  $1 \ $2
     echo ${!members[@]}
 }
 
-function set_merge() {  # $1 U $2  (where $1 and $2 are disjoint)
+set_merge() {  # $1 U $2  (where $1 and $2 are disjoint)
     if [[ -z "$1" ]]; then
         echo "$2"
     elif [[ -z "$2" ]]; then
@@ -37,7 +37,7 @@ function set_merge() {  # $1 U $2  (where $1 and $2 are disjoint)
     fi
 }
 
-function set_union() { # $1 U $2 (sorted)
+set_union() { # $1 U $2 (sorted)
     local -a operand1=($1)
     local -a operand2=($2)
     local -A members
@@ -49,7 +49,7 @@ function set_union() { # $1 U $2 (sorted)
 }
 
 # unique id for a module
-function unique_id() { # $1: module info index
+unique_id() { # $1: module info index
     local -a minfo=( ${modlist[$1]} )
     if (( ${#minfo[@]} < 4 )); then
         echo ${minfo[0]}
@@ -58,7 +58,7 @@ function unique_id() { # $1: module info index
     fi
 }
 
-function mod_path() {   # $1: module info index
+mod_path() {   # $1: module info index
     local -i i
     local -a m=(${modlist[$1]})
     local res="$PMODULES_ROOT/${fmmap[${m[0]%%/*}]}/${m[0]}"
@@ -68,7 +68,7 @@ function mod_path() {   # $1: module info index
     echo "$res"
 }
 
-function calc_deps() {  # $1: module info index
+calc_deps() {  # $1: module info index
     local dpath="$(mod_path $1)/.dependencies"
     [[ ! -r "$dpath" ]] && return
     local -a d=( $(< "$dpath") ) # dependencies as versioned module names
@@ -96,7 +96,7 @@ function calc_deps() {  # $1: module info index
     echo "${deps[@]}"
 }
 
-function update_deps() { # $1: 1-add dependency, -1-remove dependency   $2: set of module info indices
+update_deps() { # $1: 1-add dependency, -1-remove dependency   $2: set of module info indices
     [[ -z "$2" ]] && return
     local -a q=($2)     # work queue
     local deps=""       # set of dependencies
@@ -117,7 +117,7 @@ function update_deps() { # $1: 1-add dependency, -1-remove dependency   $2: set
 }
 
 # "$1": source module environment
-function find_modules() {
+find_modules() {
     # construct modlist/modmap/uidmap/depcnt/fmmap/relmap arrays from module search output
     local -a mc         # module info components
     local -i i=0
@@ -144,7 +144,7 @@ function find_modules() {
 }
 
 # "$1": source module environment
-function find_families() {
+find_families() {
     # construct fdmap
     local -a t  # tcl file components
     local l s n
@@ -159,7 +159,7 @@ function find_families() {
     done < <(grep -R set-family "$1/*/${PMODULES_MODULEFILES_DIR}")
 }
 
-function select_uid() { # $1: module uid
+select_uid() { # $1: module uid
     local -a uidc=($1) # uid components
     local name=${uidc[-1]%%/*} # module name
     local midx=${uidmap["$1"]} # module info index
@@ -168,7 +168,7 @@ function select_uid() { # $1: module uid
     update_deps 1 "$midx"
 }
 
-function preselect() { # "$1": prefix for preselected modules
+preselect() { # "$1": prefix for preselected modules
     # module paths must not contain white space
     [[ -z "$1" ]] && return
     local -a mpc # module path components
@@ -193,7 +193,7 @@ function preselect() { # "$1": prefix for preselected modules
     trap - EXIT
 }
 
-function is_dependency() { # $1: module name
+is_dependency() { # $1: module name
     local -a map=(${modmap[$1]})
     local -i m
     for ((m=0; m<${#map[@]}; m++)); do
@@ -202,7 +202,7 @@ function is_dependency() { # $1: module name
     return 1
 }
 
-function dialog_1() {
+dialog_1() {
     local -a input
     local marker
     local m
@@ -220,15 +220,15 @@ function dialog_1() {
     return $?
 }
 
-function module_id() { # $@: module info components
+module_id() { # $@: module info components
     echo "$1 ${@:4}"
 }
 
-function module_release() { # $@: module info components
+module_release() { # $@: module info components
     echo "$2"
 }
 
-function dialog_2() {   # $1: module name
+dialog_2() {   # $1: module name
     local -a map=(${modmap[$1]})
     local -a sel=(${selected[$1]})
     local -i j          # mapping index
@@ -250,14 +250,14 @@ function dialog_2() {   # $1: module name
 }
 
 # final dialog output
-function module_out() { # $1: module info index
+module_out() { # $1: module info index
     local -a args=(${modlist[$1]})
     echo "${args[@]}"
 }
 
 # "$1": prefix for preselected modules (destination module environment)
 # "$2": prefix for selectable modules (source module environment)
-function module_picker() {
+module_picker() {
     find_families "$2"
     find_modules "$2"
     preselect "$1"
diff --git a/scripts/Bootstrap/Pmodules/modmanage.bash.in b/scripts/Bootstrap/Pmodules/modmanage.bash.in
index 9744cad..f36fc26 100755
--- a/scripts/Bootstrap/Pmodules/modmanage.bash.in
+++ b/scripts/Bootstrap/Pmodules/modmanage.bash.in
@@ -476,7 +476,7 @@ subcommand_sync() {
 
 	# Redefine module_out to append modules to the selected_modules variable
         local -a selected_modules
-	function module_out() {
+	module_out() {
 		local -a args=(${modlist[$1]})
 		local path=""
 		IFS=/
@@ -495,7 +495,7 @@ subcommand_sync() {
 	local -a destination_modules=( $(cd "${dst_prefix}/${PMODULES_MODULEFILES_DIR}"; find -L . -type f | while read f; do n=${f##*/}; [[ "${n:0:1}" == "." ]] || echo ${f#./}; done) )
 
 	# redefine set difference, the version in dialog.bash only handles integers
-	function set_difference() {  #  $1 \ $2
+	set_difference() {  #  $1 \ $2
 		local -a operand1=($1)
 		local -a operand2=($2)
 		local -A members
diff --git a/scripts/Bootstrap/Pmodules/modsync.bash b/scripts/Bootstrap/Pmodules/modsync.bash
index 988f8f3..3b15c17 100755
--- a/scripts/Bootstrap/Pmodules/modsync.bash
+++ b/scripts/Bootstrap/Pmodules/modsync.bash
@@ -3,7 +3,7 @@
 declare -r DEFAULT_SRC="/afs/psi.ch/sys/psi.@sys"
 declare -r DEFAULT_DST="/opt/psi.local"
 
-function usage() {
+usage() {
     echo "
 $0 [--from=<source>] [--to=<destination>] [--dryrun] [--delete]
     --from    source module installation (default: $DEFAULT_SRC)
@@ -17,13 +17,13 @@ $0 [--from=<source>] [--to=<destination>] [--dryrun] [--delete]
               (destination cleanup)" >&2
 }
 
-function die() {
+die() {
     echo "$1" >&2
     exit 1
 }
 
 # check if directory $1 is a valid prefix
-function is_module_prefix() {
+is_module_prefix() {
     if [[ -d "$1" ]] &&
        [[ -d "$1/$PMODULES_CONFIG_DIR" ]] &&
        [[ -d "$1/$PMODULES_MODULEFILES_DIR" ]]
@@ -34,7 +34,7 @@ function is_module_prefix() {
 }
 
 # set the source and destination module installations
-function get_options() {
+get_options() {
     local src_dir="$DEFAULT_SRC"
     local dst_dir="$DEFAULT_DST"
     local dryrun=false
@@ -82,7 +82,7 @@ function get_options() {
 # Derive the relative module installation path
 #    from the relative module file path
 # $1 relative module file path
-function get_modpath() {
+get_modpath() {
     local -a comp=( ${1//\// } )    # split rel.path into components
     local -a path		    # result path
     local -i i
@@ -98,14 +98,14 @@ function get_modpath() {
 # Derive the relative module release file path
 #    from the relative module file path
 # $1 relative module file path
-function get_release_path() {
+get_release_path() {
     echo "$(dirname "$1")/.release-$(basename "$1")"
 }
 
 # $1 dryrun=(true|false)
 # $2 relative module file path of destination module to be deleted
 # $3 destination prefix
-function delete_module() {
+delete_module() {
     if [[ "$1" != "false" ]]; then
         echo "(dryrun) delete: $2 at $3" 1>&2
         return 0
@@ -126,7 +126,7 @@ function delete_module() {
 # $2 relative module file path of source module to be copied to the destination
 # $3 source prefix
 # $4 destination prefix
-function copy_module() {
+copy_module() {
     if [[ "$1" != "false" ]]; then
         echo "(dryrun) copy: $2 from $3 to $4" 1>&2
         return 0
@@ -147,7 +147,7 @@ function copy_module() {
 # destination module installations
 # --from=<source>        default: /afs/psi.ch/sys/psi.@sys
 # --to=<destination>     default: /opt/psi.local
-function sync_modules() {
+sync_modules() {
     local -a options=( $(get_options "$@") )
     [[ -z "$options" ]] && exit 1
     local src_dir="${options[0]}"
@@ -177,7 +177,7 @@ function sync_modules() {
     local -a selected_modules
 
     # Redefine module_out to append modules to the selected_modules variable
-    function module_out() {
+    module_out() {
         local -a args=(${modlist[$1]})
         local path=""
         IFS=/
@@ -191,7 +191,7 @@ function sync_modules() {
     local -a destination_modules=( $(cd "$dst_dir/$PMODULES_MODULEFILES_DIR"; find -L . -type f | while read f; do echo ${f#./}; done) )
 
     # redefine set difference, the version in dialog.bash only handles integers
-    function set_difference() {  #  $1 \ $2
+    set_difference() {  #  $1 \ $2
         local -a operand1=($1)
         local -a operand2=($2)
         local -A members
diff --git a/scripts/Bootstrap/Tcl/build b/scripts/Bootstrap/Tcl/build
index 78de767..9dacb87 100755
--- a/scripts/Bootstrap/Tcl/build
+++ b/scripts/Bootstrap/Tcl/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	case ${OS} in
 	Linux )
 		srcdir="${MODULE_SRCDIR}/unix"
@@ -17,10 +17,10 @@ function em.configure() {
 		|| exit 1
 }
 
-function em.post_install() {
+pmodules.post_install() {
 	{ cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
 }
 
-em.add_to_family 'Tools'
-em.set_docfiles 'license.terms' 'README'
-em.make_all
+pmodules.add_to_group 'Tools'
+pmodules.set_docfiles 'license.terms' 'README'
+pmodules.make_all
diff --git a/scripts/Bootstrap/bash/build b/scripts/Bootstrap/bash/build
index edc9d5b..02f522f 100755
--- a/scripts/Bootstrap/bash/build
+++ b/scripts/Bootstrap/bash/build
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-em.add_to_family 'Tools'
-em.make_all
+pmodules.add_to_group 'Tools'
+pmodules.make_all
diff --git a/scripts/Bootstrap/coreutils/build b/scripts/Bootstrap/coreutils/build
index 416a5c1..7b0a965 100755
--- a/scripts/Bootstrap/coreutils/build
+++ b/scripts/Bootstrap/coreutils/build
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
     "${MODULE_SRCDIR}"/configure \
 		      --prefix="${PREFIX}" \
 	|| exit 1
 }
 
-em.add_to_family 'Tools'
-em.make_all
+pmodules.add_to_group 'Tools'
+pmodules.make_all
diff --git a/scripts/Bootstrap/dialog/build b/scripts/Bootstrap/dialog/build
index edc9d5b..02f522f 100755
--- a/scripts/Bootstrap/dialog/build
+++ b/scripts/Bootstrap/dialog/build
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-em.add_to_family 'Tools'
-em.make_all
+pmodules.add_to_group 'Tools'
+pmodules.make_all
diff --git a/scripts/Bootstrap/getopt/build b/scripts/Bootstrap/getopt/build
index e910f51..8bacc92 100755
--- a/scripts/Bootstrap/getopt/build
+++ b/scripts/Bootstrap/getopt/build
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	:
 }
 
-function em.build() {
+pmodules.build() {
 	case ${OS} in
 		Linux )
 			declare -x LDFLAGS="-lintl"
@@ -20,20 +20,20 @@ function em.build() {
 	make -e
 }
 
-function em.install() {
+pmodules.install() {
 	cd "${MODULE_SRCDIR}"
 	declare -x DESTDIR="${PREFIX}"
 	declare -x prefix=''
 	make -e install
 }
 
-function em.cleanup_build() {
+pmodules.cleanup_build() {
 	cd "${MODULE_SRCDIR}"
 	make -e realclean
 }
 
-em.add_to_family 'Tools'
-em.make_all
+pmodules.add_to_group 'Tools'
+pmodules.make_all
 
 # Local Variables:
 # mode: sh
diff --git a/scripts/Bootstrap/gettext/build b/scripts/Bootstrap/gettext/build
index f4a2685..9b355bd 100755
--- a/scripts/Bootstrap/gettext/build
+++ b/scripts/Bootstrap/gettext/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
     "${MODULE_SRCDIR}"/configure \
 		      --prefix="${PREFIX}" \
 		      --disable-java \
@@ -20,5 +20,5 @@ function em.configure() {
 	|| exit 1
 }
 
-em.add_to_family 'Tools'
-em.make_all
+pmodules.add_to_group 'Tools'
+pmodules.make_all
diff --git a/scripts/Compiler/H5root/build b/scripts/Compiler/H5root/build
index 8de11a3..9298d47 100755
--- a/scripts/Compiler/H5root/build
+++ b/scripts/Compiler/H5root/build
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-source $(dirname $0)/../../../lib/libem.bash
+source $(dirname $0)/../../../lib/libpmodules.bash
 
-function em.pre_configure() {
+pmodules.pre_configure() {
 	./autogen.sh
 }
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-h5hut \
@@ -15,8 +15,8 @@ function em.configure() {
 		--with-pic
 }
 
-em.add_to_family 'Compiler'
-em.set_runtime_dependencies "${COMPILER}" 'hdf5_serial' 'root'
-em.set_build_dependencies 'autoconf' 'automake' 'libtool' "${COMPILER}" 'hdf5_serial' 'H5hut_serial' 'root'
-em.make_all
+pmodules.add_to_group 'Compiler'
+pmodules.set_runtime_dependencies "${COMPILER}" 'hdf5_serial' 'root'
+pmodules.set_build_dependencies 'autoconf' 'automake' 'libtool' "${COMPILER}" 'hdf5_serial' 'H5hut_serial' 'root'
+pmodules.make_all
 
diff --git a/scripts/Compiler/OpenBLAS/build b/scripts/Compiler/OpenBLAS/build
index 4707c8f..5d915ad 100755
--- a/scripts/Compiler/OpenBLAS/build
+++ b/scripts/Compiler/OpenBLAS/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	cat <<EOF > "${MODULE_SRCDIR}/make.inc"
 SHELL = /bin/sh
 PLAT = 
@@ -25,12 +25,12 @@ COMMON_PROF = -pg
 EOF
 }
 
-function em.build() {
+pmodules.build() {
 	cd "${MODULE_SRCDIR}"
 	make
 }
 
-function em.install() {
+pmodules.install() {
 	make PREFIX="${PREFIX}" install
 	# We have to build shared libs and remove them here.
 	# Building with NOSHARED gives an error during install -
@@ -40,10 +40,10 @@ function em.install() {
 	#( cd "${PREFIX}/lib"; ln -fs
 }
 
-em.add_to_family 'Compiler'
-em.set_runtime_dependencies "${COMPILER}"
-em.set_build_dependencies "${COMPILER}"
-em.set_docfiles 'LICENSE' 'README.md'
-em.set_supported_compilers 'gcc'
-em.make_all
-em.cleanup_src
+pmodules.add_to_group 'Compiler'
+pmodules.set_runtime_dependencies "${COMPILER}"
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.set_docfiles 'LICENSE' 'README.md'
+pmodules.set_supported_compilers 'gcc'
+pmodules.make_all
+pmodules.cleanup_src
diff --git a/scripts/Compiler/OpenBLAS_OMP/build b/scripts/Compiler/OpenBLAS_OMP/build
index 0bf5565..72fdb1c 100755
--- a/scripts/Compiler/OpenBLAS_OMP/build
+++ b/scripts/Compiler/OpenBLAS_OMP/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	cat <<EOF > "${MODULE_SRCDIR}/make.inc"
 SHELL = /bin/sh
 PLAT = 
@@ -25,12 +25,12 @@ COMMON_PROF = -pg
 EOF
 }
 
-function em.build() {
+pmodules.build() {
 	cd "${MODULE_SRCDIR}"
 	make
 }
 
-function em.install() {
+pmodules.install() {
 	make PREFIX="${PREFIX}" install
 	# We have to build shared libs and remove them here.
 	# Building with NOSHARED gives an error during install -
@@ -40,10 +40,10 @@ function em.install() {
 	#( cd "${PREFIX}/lib"; ln -fs
 }
 
-em.add_to_family 'Compiler'
-em.set_runtime_dependencies "${COMPILER}"
-em.set_build_dependencies "${COMPILER}"
-em.set_docfiles 'LICENSE' 'README.md'
-em.set_supported_compilers 'gcc'
-em.make_all
-em.cleanup_src
+pmodules.add_to_group 'Compiler'
+pmodules.set_runtime_dependencies "${COMPILER}"
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.set_docfiles 'LICENSE' 'README.md'
+pmodules.set_supported_compilers 'gcc'
+pmodules.make_all
+pmodules.cleanup_src
diff --git a/scripts/Compiler/SuperLU/build b/scripts/Compiler/SuperLU/build
index 328d30f..92e3f7d 100755
--- a/scripts/Compiler/SuperLU/build
+++ b/scripts/Compiler/SuperLU/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	cat <<EOF > "${MODULE_SRCDIR}/make.inc"
 PLAT		= 
 SuperLUroot 	= \${PREFIX}
@@ -28,21 +28,21 @@ CDEFS        = -DAdd_
 EOF
 }
 
-function em.build() {
+pmodules.build() {
 	cd "${MODULE_SRCDIR}"
 	mkdir -p "${PREFIX}/lib"
 	make
 }
 
-function em.install() {
+pmodules.install() {
 	make install
 	mkdir -p "${PREFIX}/include"
 	install -m 0444 "${MODULE_SRCDIR}"/SRC/*.h "${PREFIX}/include"
 }
 
-em.add_to_family 'Compiler'
-em.set_runtime_dependencies "${COMPILER}"
-em.set_build_dependencies "${COMPILER}" 'OpenBLAS'
-em.set_docfiles 'README'
-em.make_all
-em.cleanup_src
+pmodules.add_to_group 'Compiler'
+pmodules.set_runtime_dependencies "${COMPILER}"
+pmodules.set_build_dependencies "${COMPILER}" 'OpenBLAS'
+pmodules.set_docfiles 'README'
+pmodules.make_all
+pmodules.cleanup_src
diff --git a/scripts/Compiler/UMFPACK/build b/scripts/Compiler/UMFPACK/build
index c4e11bd..b42b3af 100755
--- a/scripts/Compiler/UMFPACK/build
+++ b/scripts/Compiler/UMFPACK/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	cat <<EOF > "${MODULE_SRCDIR}/SuiteSparse_config/SuiteSparse_config.mk"
 CF = \$(CFLAGS) \$(CPPFLAGS) \$(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
 RANLIB = ranlib
@@ -26,19 +26,19 @@ TBB =
 EOF
 }
 
-function em.build() {
+pmodules.build() {
 	cd "${MODULE_SRCDIR}/UMFPACK"
 	make TARGET=CORE2 BINARY=64 USE_THREAD=0 NO_SHARED=1
 }
 
-function em.install() {
+pmodules.install() {
 	install -d "${PREFIX}/include"
 	install -d "${PREFIX}/lib"
 	make PREFIX="${PREFIX}" install
 }
 
-em.add_to_family 'Compiler'
-em.set_runtime_dependencies "${COMPILER}" 'OpenBLAS'
-em.set_build_dependencies "${COMPILER}" 'OpenBLAS'
-em.make_all
-#em.cleanup_src
+pmodules.add_to_group 'Compiler'
+pmodules.set_runtime_dependencies "${COMPILER}" 'OpenBLAS'
+pmodules.set_build_dependencies "${COMPILER}" 'OpenBLAS'
+pmodules.make_all
+#pmodules.cleanup_src
diff --git a/scripts/Compiler/atlas/build b/scripts/Compiler/atlas/build
index 33e7b00..2db157e 100755
--- a/scripts/Compiler/atlas/build
+++ b/scripts/Compiler/atlas/build
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-em.add_to_family 'Compiler'
-em.set_runtime_dependencies "${COMPILER}"
-em.set_build_dependencies "${COMPILER}"
-em.make_all
+pmodules.add_to_group 'Compiler'
+pmodules.set_runtime_dependencies "${COMPILER}"
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.make_all
 
 # Local Variables:
 # mode: sh
diff --git a/scripts/Compiler/boost/build b/scripts/Compiler/boost/build
index 9d5797c..9f94bb7 100755
--- a/scripts/Compiler/boost/build
+++ b/scripts/Compiler/boost/build
@@ -1,21 +1,20 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
 # :TODO: detect compiler
 TOOLSET=gcc
 
-function em.configure() {
+pmodules.configure() {
 	cd "${MODULE_SRCDIR}"
 	"${MODULE_SRCDIR}"/bootstrap.sh \
 		--prefix="${PREFIX}" \
-		--with-toolset=${TOOLSET} \
 		--with-libraries=all \
 		--with-python-root="${PYTHON_PREFIX}" \
 		|| exit 1
 }
 
-function em.build() {
+pmodules.build() {
 	cd "${MODULE_SRCDIR}"
 	./b2 \
 		--build-type=minimal \
@@ -28,7 +27,7 @@ function em.build() {
 		stage
 }
 
-function em.install() {
+pmodules.install() {
 	cd "${MODULE_SRCDIR}"
 	./b2 \
 		--build-type=minimal \
@@ -41,8 +40,8 @@ function em.install() {
 		install
 }
 
-em.add_to_family 'Compiler'
-em.set_runtime_dependencies "${COMPILER}"
-em.set_build_dependencies "${COMPILER}" 'Python'
-em.make_all
+pmodules.add_to_group 'Compiler'
+pmodules.set_runtime_dependencies "${COMPILER}"
+pmodules.set_build_dependencies "${COMPILER}" 'Python'
+pmodules.make_all
 
diff --git a/scripts/Compiler/gsl/build b/scripts/Compiler/gsl/build
index fb32eac..8e9f07c 100755
--- a/scripts/Compiler/gsl/build
+++ b/scripts/Compiler/gsl/build
@@ -1,15 +1,15 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-em.add_to_family 'Compiler'
-em.set_docfiles \
+pmodules.add_to_group 'Compiler'
+pmodules.set_docfiles \
 	'AUTHORS' \
 	'BUGS' \
 	'COPYING' \
@@ -20,9 +20,9 @@ em.set_docfiles \
 	'THANKS' \
 	'TODO'
 
-em.set_runtime_dependencies "${COMPILER}"
-em.set_build_dependencies "${COMPILER}"
-em.make_all
+pmodules.set_runtime_dependencies "${COMPILER}"
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.make_all
 
 # Local Variables:
 # mode: sh
diff --git a/scripts/Compiler/hdf5_serial/build b/scripts/Compiler/hdf5_serial/build
index 38c8a3d..8c63690 100755
--- a/scripts/Compiler/hdf5_serial/build
+++ b/scripts/Compiler/hdf5_serial/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-shared \
@@ -12,8 +12,8 @@ function em.configure() {
 		|| exit 1
 }
 
-em.add_to_family 'Compiler'
-em.set_runtime_dependencies "${COMPILER}"
-em.set_build_dependencies "${COMPILER}"
-em.make_all
+pmodules.add_to_group 'Compiler'
+pmodules.set_runtime_dependencies "${COMPILER}"
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.make_all
 
diff --git a/scripts/Compiler/mpich/build b/scripts/Compiler/mpich/build
index 5b18de7..454ba7c 100755
--- a/scripts/Compiler/mpich/build
+++ b/scripts/Compiler/mpich/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	unset F90
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
@@ -12,8 +12,8 @@ function em.configure() {
 }
 
 
-em.add_to_family 'Compiler'
-em.set_runtime_dependencies "${COMPILER}"
-em.set_build_dependencies "${COMPILER}"
-em.set_docfiles 'COPYRIGHT' 'README'
-em.make_all
+pmodules.add_to_group 'Compiler'
+pmodules.set_runtime_dependencies "${COMPILER}"
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.set_docfiles 'COPYRIGHT' 'README'
+pmodules.make_all
diff --git a/scripts/Compiler/openmpi/build b/scripts/Compiler/openmpi/build
index 30c7e06..473503e 100755
--- a/scripts/Compiler/openmpi/build
+++ b/scripts/Compiler/openmpi/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-mpi-cxx \
@@ -15,8 +15,8 @@ function em.configure() {
 }
 
 
-em.add_to_family 'Compiler'
-em.set_runtime_dependencies "${COMPILER}"
-em.set_build_dependencies "${COMPILER}"
-em.set_docfiles 'AUTHORS' 'LICENSE' 'NEWS' 'README'
-em.make_all
+pmodules.add_to_group 'Compiler'
+pmodules.set_runtime_dependencies "${COMPILER}"
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.set_docfiles 'AUTHORS' 'LICENSE' 'NEWS' 'README'
+pmodules.make_all
diff --git a/scripts/Compiler/root/build b/scripts/Compiler/root/build
index 7a502e0..0d53a70 100755
--- a/scripts/Compiler/root/build
+++ b/scripts/Compiler/root/build
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
 case ${OS} in
 Darwin )
@@ -12,7 +12,7 @@ Darwin )
 	;;
 esac
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--disable-ldap \
 		--disable-mysql \
@@ -27,11 +27,11 @@ function em.configure() {
 		|| exit 1
 }
 
-function em.build() {
+pmodules.build() {
 	make -j 4
 }
 
-function em.install() {
+pmodules.install() {
 	make clean
 
 	rm -f  Makefile
@@ -66,7 +66,7 @@ function em.install() {
 	mv "${PREFIX}/README"  "${DOCDIR}"
 }
 
-em.add_to_family 'Compiler'
-em.set_runtime_dependencies "${COMPILER}"
-em.set_build_dependencies "${COMPILER}"
-em.make_all
+pmodules.add_to_group 'Compiler'
+pmodules.set_runtime_dependencies "${COMPILER}"
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.make_all
diff --git a/scripts/Compiler/vtk/build b/scripts/Compiler/vtk/build
index f83c828..36ad503 100755
--- a/scripts/Compiler/vtk/build
+++ b/scripts/Compiler/vtk/build
@@ -6,11 +6,11 @@
 #   and remove these strings.
 #
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
 case ${OS} in
 Darwin )
-	em.pre_configure() {
+	pmodules.pre_configure() {
 		# for the time being: on Mac OS X we need GL/gl.h from MacPorts:
 		append_path C_INLCUDE_PATH '/opt/local/include'
 		append_path CPLUS_INCLUDE_PATH '/opt/local/include'
@@ -18,7 +18,7 @@ Darwin )
 	;;
 esac
 
-function em.configure() {
+pmodules.configure() {
 	cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
 		-DVTK_INSTALL_INCLUDE_DIR:PATH=include \
 		-DVTK_INSTALL_LIB_DIR:PATH=lib \
@@ -26,8 +26,8 @@ function em.configure() {
 		"${MODULE_SRCDIR}"
 }
 
-em.add_to_family 'Compiler'
-em.set_runtime_dependencies "${COMPILER}"
-em.set_build_dependencies 'cmake' "${COMPILER}"
-em.make_all
+pmodules.add_to_group 'Compiler'
+pmodules.set_runtime_dependencies "${COMPILER}"
+pmodules.set_build_dependencies 'cmake' "${COMPILER}"
+pmodules.make_all
 
diff --git a/scripts/HDF5/H5hut/build b/scripts/HDF5/H5hut/build
index 4420013..7f5131f 100755
--- a/scripts/HDF5/H5hut/build
+++ b/scripts/HDF5/H5hut/build
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.pre_configure() {
+pmodules.pre_configure() {
 	./autogen.sh
 }
 
-function em.configure() {
+pmodules.configure() {
 	CC=$MPICC
 	CXX=$MPICXX
 	F77=$MPIF77
@@ -23,20 +23,20 @@ function em.configure() {
 		|| exit 1
 }
 
-function em.build() {
+pmodules.build() {
 	make -C src
 	make -C tools 
 }
 
-function em.install() {
+pmodules.install() {
 	make -C src install
 	make -C tools install
 }
 
 
-em.add_to_family 'HDF5'
-em.set_runtime_dependencies "${COMPILER}" "${MPI}" 'hdf5'
-em.set_build_dependencies   "autoconf" "automake" "libtool" "${COMPILER}" "${MPI}" "hdf5"
-em.set_docfiles 'AUTHORS' 'COPYING'
-em.make_all
+pmodules.add_to_group 'HDF5'
+pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}" 'hdf5'
+pmodules.set_build_dependencies   "autoconf" "automake" "libtool" "${COMPILER}" "${MPI}" "hdf5"
+pmodules.set_docfiles 'AUTHORS' 'COPYING'
+pmodules.make_all
 
diff --git a/scripts/HDF5/netcdf/build b/scripts/HDF5/netcdf/build
index 6f23e05..3d3e819 100755
--- a/scripts/HDF5/netcdf/build
+++ b/scripts/HDF5/netcdf/build
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.pre_configure() {
+pmodules.pre_configure() {
 	:
 }
 
-function em.configure() {
+pmodules.configure() {
 	CC=$MPICC
 	CXX=$MPICXX
 	F77=$MPIF77
@@ -20,9 +20,9 @@ function em.configure() {
 		|| exit 1
 }
 
-em.add_to_family 'HDF5'
-em.set_runtime_dependencies "${COMPILER}" "${MPI}" 'hdf5'
-em.set_build_dependencies   "${COMPILER}" "${MPI}" 'hdf5'
-em.set_docfiles 'COPYRIGHT' 'README.md' 'RELEASE_NOTES.md'
-em.make_all
+pmodules.add_to_group 'HDF5'
+pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}" 'hdf5'
+pmodules.set_build_dependencies   "${COMPILER}" "${MPI}" 'hdf5'
+pmodules.set_docfiles 'COPYRIGHT' 'README.md' 'RELEASE_NOTES.md'
+pmodules.make_all
 
diff --git a/scripts/HDF5_serial/H5hut_serial/build b/scripts/HDF5_serial/H5hut_serial/build
index 608109c..7e94ee6 100755
--- a/scripts/HDF5_serial/H5hut_serial/build
+++ b/scripts/HDF5_serial/H5hut_serial/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	(cd "${MODULE_SRCDIR}" && ./autogen.sh)
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
@@ -13,18 +13,18 @@ function em.configure() {
 		|| exit 1
 }
 
-function em.build() {
+pmodules.build() {
 	make -C src
 	make -C tools 
 }
 
-function em.install() {
+pmodules.install() {
 	make -C src install
 	make -C tools install
 }
 
-em.add_to_family 'HDF5_serial'
-em.set_runtime_dependencies "${COMPILER}" 'hdf5_serial'
-em.set_build_dependencies   "autoconf" "automake" "libtool" "${COMPILER}" "vtk" "hdf5_serial"
-em.make_all
+pmodules.add_to_group 'HDF5_serial'
+pmodules.set_runtime_dependencies "${COMPILER}" 'hdf5_serial'
+pmodules.set_build_dependencies   "autoconf" "automake" "libtool" "${COMPILER}" "vtk" "hdf5_serial"
+pmodules.make_all
 
diff --git a/scripts/Libraries/giflib/build b/scripts/Libraries/giflib/build
index b99ddf3..616cc8b 100755
--- a/scripts/Libraries/giflib/build
+++ b/scripts/Libraries/giflib/build
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-em.add_to_family 'Libraries'
-em.set_build_dependencies "${COMPILER}"
-em.make_all
+pmodules.add_to_group 'Libraries'
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.make_all
diff --git a/scripts/Libraries/gmp/build b/scripts/Libraries/gmp/build
index 86b67e9..90a3c4a 100755
--- a/scripts/Libraries/gmp/build
+++ b/scripts/Libraries/gmp/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--disable-shared \
@@ -13,6 +13,6 @@ function em.configure() {
 declare -rx CC=gcc
 declare -rx CPP=/usr/bin/cpp
 
-em.add_to_family 'Libraries'
-em.make_all
+pmodules.add_to_group 'Libraries'
+pmodules.make_all
 
diff --git a/scripts/Libraries/libungif/build b/scripts/Libraries/libungif/build
index b99ddf3..616cc8b 100755
--- a/scripts/Libraries/libungif/build
+++ b/scripts/Libraries/libungif/build
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-em.add_to_family 'Libraries'
-em.set_build_dependencies "${COMPILER}"
-em.make_all
+pmodules.add_to_group 'Libraries'
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.make_all
diff --git a/scripts/Libraries/mpc/build b/scripts/Libraries/mpc/build
index eb28492..142bfae 100755
--- a/scripts/Libraries/mpc/build
+++ b/scripts/Libraries/mpc/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--with-gmp=$GMP_PREFIX \
@@ -15,7 +15,7 @@ function em.configure() {
 declare -rx CC=gcc
 
 module use 'Libraries'
-em.add_to_family 'Libraries'
-em.set_build_dependencies 'gmp' 'mpfr'
-em.make_all
+pmodules.add_to_group 'Libraries'
+pmodules.set_build_dependencies 'gmp' 'mpfr'
+pmodules.make_all
 
diff --git a/scripts/Libraries/mpfr/build b/scripts/Libraries/mpfr/build
index c3c2bf1..5b2e975 100755
--- a/scripts/Libraries/mpfr/build
+++ b/scripts/Libraries/mpfr/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--with-gmp=$GMP_PREFIX \
@@ -15,6 +15,6 @@ declare -rx CC=gcc
 
 module use 'Libraries'
 
-em.add_to_family 'Libraries'
-em.set_build_dependencies 'gmp'
-em.make_all
+pmodules.add_to_group 'Libraries'
+pmodules.set_build_dependencies 'gmp'
+pmodules.make_all
diff --git a/scripts/Libraries/tiff/build b/scripts/Libraries/tiff/build
index b99ddf3..616cc8b 100755
--- a/scripts/Libraries/tiff/build
+++ b/scripts/Libraries/tiff/build
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-em.add_to_family 'Libraries'
-em.set_build_dependencies "${COMPILER}"
-em.make_all
+pmodules.add_to_group 'Libraries'
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.make_all
diff --git a/scripts/MPI/BoxLib/build b/scripts/MPI/BoxLib/build
index b0c4a33..3bbefe5 100755
--- a/scripts/MPI/BoxLib/build
+++ b/scripts/MPI/BoxLib/build
@@ -1,18 +1,18 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	CC=$MPICC CXX=$MPICXX cmake \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DCMAKE_BUILD_TYPE=RELEASE \
 		"${MODULE_SRCDIR}"
 }
 
-em.add_to_family 'MPI'
-em.set_runtime_dependencies "${COMPILER}" "${MPI}"
-em.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}"
-em.set_docfiles 'license.txt' 'README.txt'
-em.make_all
+pmodules.add_to_group 'MPI'
+pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
+pmodules.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}"
+pmodules.set_docfiles 'license.txt' 'README.txt'
+pmodules.make_all
 
 
diff --git a/scripts/MPI/OPAL.14/build b/scripts/MPI/OPAL.14/build
index 73d6432..7f66d1a 100755
--- a/scripts/MPI/OPAL.14/build
+++ b/scripts/MPI/OPAL.14/build
@@ -2,13 +2,13 @@
 
 P='OPAL'
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
 
 module use unstable
 
 # add -fopenmp to CC and CXX, if you want to compile with OpenMP
-function em.configure() {
+pmodules.configure() {
 	cmake \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DCMAKE_BUILD_TYPE=RELEASE \
@@ -16,9 +16,9 @@ function em.configure() {
 		"${MODULE_SRCDIR}"
 }
 
-em.add_to_family 'MPI'
-em.set_runtime_dependencies "${COMPILER}" "${MPI}"
-em.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'boost' 'hdf5' 'H5hut' 'trilinos' 'ippl' 'gsl'
-em.set_supported_compilers 'gcc/4.7' 'gcc/4.8'
-em.make_all
+pmodules.add_to_group 'MPI'
+pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
+pmodules.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'boost' 'hdf5' 'H5hut' 'trilinos' 'ippl' 'gsl'
+pmodules.set_supported_compilers 'gcc/4.7' 'gcc/4.8'
+pmodules.make_all
 
diff --git a/scripts/MPI/OPAL/build b/scripts/MPI/OPAL/build
index c83c199..59d9408 100755
--- a/scripts/MPI/OPAL/build
+++ b/scripts/MPI/OPAL/build
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
 module use unstable
 
 # add -fopenmp to CC and CXX, if you want to compile with OpenMP
-function em.configure() {
+pmodules.configure() {
 	cmake \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DCMAKE_BUILD_TYPE=RELEASE \
@@ -13,9 +13,9 @@ function em.configure() {
 		"${MODULE_SRCDIR}"
 }
 
-em.add_to_family 'MPI'
-em.set_runtime_dependencies "${COMPILER}" "${MPI}"
-em.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'boost' 'hdf5' 'H5hut' 'trilinos' 'ippl' 'gsl'
-em.set_supported_compilers 'gcc/4.7' 'gcc/4.8'
-em.make_all
+pmodules.add_to_group 'MPI'
+pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
+pmodules.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'boost' 'hdf5' 'H5hut' 'trilinos' 'ippl' 'gsl'
+pmodules.set_supported_compilers 'gcc/4.7' 'gcc/4.8'
+pmodules.make_all
 
diff --git a/scripts/MPI/SuperLU_DIST/build b/scripts/MPI/SuperLU_DIST/build
index 6ac2d44..c197b2c 100755
--- a/scripts/MPI/SuperLU_DIST/build
+++ b/scripts/MPI/SuperLU_DIST/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	cat <<EOF > "${MODULE_SRCDIR}/make.inc"
 PLAT		= 
 DSuperLUroot 	= \${PREFIX}
@@ -27,22 +27,22 @@ CDEFS        = -DAdd__
 EOF
 }
 
-function em.build() {
+pmodules.build() {
 	cd "${MODULE_SRCDIR}"
 	mkdir -p "${PREFIX}/lib"
 	make
 }
 
-function em.install() {
+pmodules.install() {
 	make install
 	mkdir -p "${PREFIX}/include"
 	install -m 0444 "${MODULE_SRCDIR}"/SRC/*.h "${PREFIX}/include"
 }
 
 
-em.add_to_family 'MPI'
-em.set_runtime_dependencies "${COMPILER}" "${MPI} 'OpenBLAS' 'parmetis'"
-em.set_build_dependencies "${COMPILER}" "${MPI}" 'OpenBLAS' 'parmetis'
-em.set_docfiles 'README'
-em.make_all
-em.cleanup_src
+pmodules.add_to_group 'MPI'
+pmodules.set_runtime_dependencies "${COMPILER}" "${MPI} 'OpenBLAS' 'parmetis'"
+pmodules.set_build_dependencies "${COMPILER}" "${MPI}" 'OpenBLAS' 'parmetis'
+pmodules.set_docfiles 'README'
+pmodules.make_all
+pmodules.cleanup_src
diff --git a/scripts/MPI/cpmd/build b/scripts/MPI/cpmd/build
index 46666be..49821b8 100755
--- a/scripts/MPI/cpmd/build
+++ b/scripts/MPI/cpmd/build
@@ -1,19 +1,19 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-em.configure() {
+pmodules.configure() {
 	cp "${BUILDSCRIPT_DIR}/Makefile" "${MODULE_BUILDDIR}"		|| exit 1
 	cp "${MODULE_SRCDIR}/irat.inc" "${MODULE_BUILDDIR}"	|| exit 1
 }
 
-em.install() {
+pmodules.install() {
 	mkdir -p "${PREFIX}/bin"
 	cp "${MODULE_BUILDDIR}/cpmd.x" "${PREFIX}/bin"
 }
 
-em.add_to_group 'MPI'
-em.set_runtime_dependencies "${COMPILER}" "${MPI}"
-em.set_build_dependencies "${COMPILER}" "${MPI}"
-em.make_all
+pmodules.add_to_group 'MPI'
+pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
+pmodules.set_build_dependencies "${COMPILER}" "${MPI}"
+pmodules.make_all
 
diff --git a/scripts/MPI/gromacs/build b/scripts/MPI/gromacs/build
index 2b7a67c..4510b13 100755
--- a/scripts/MPI/gromacs/build
+++ b/scripts/MPI/gromacs/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	cmake \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DCMAKE_BUILD_TYPE=RELEASE \
@@ -14,12 +14,12 @@ function em.configure() {
 }
 
 
-em.add_to_family 'MPI'
-em.set_runtime_dependencies "${COMPILER}" "${MPI}"
-em.set_build_dependencies "${COMPILER}" "${MPI}" cmake
-em.set_docfiles \
+pmodules.add_to_group 'MPI'
+pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
+pmodules.set_build_dependencies "${COMPILER}" "${MPI}" cmake
+pmodules.set_docfiles \
 		AUTHORS \
 		COPYING \
 		README
-em.make_all
+pmodules.make_all
 
diff --git a/scripts/MPI/hdf5/build b/scripts/MPI/hdf5/build
index a99accd..d588c2f 100755
--- a/scripts/MPI/hdf5/build
+++ b/scripts/MPI/hdf5/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	CC=$MPICC
 	CXX=$MPICXX
 	F77=$MPIF77
@@ -21,13 +21,13 @@ function em.configure() {
 }
 
 
-em.add_to_family 'MPI'
-em.set_runtime_dependencies "${COMPILER}" "${MPI}"
-em.set_build_dependencies "${COMPILER}" "${MPI}"
-em.set_docfiles \
+pmodules.add_to_group 'MPI'
+pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
+pmodules.set_build_dependencies "${COMPILER}" "${MPI}"
+pmodules.set_docfiles \
 		ACKNOWLEDGMENTS \
 		COPYING \
 		MANIFEST \
 		README.txt
-em.make_all
+pmodules.make_all
 
diff --git a/scripts/MPI/ippl/build b/scripts/MPI/ippl/build
index 2fd66ea..0ef2e87 100755
--- a/scripts/MPI/ippl/build
+++ b/scripts/MPI/ippl/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	CC=$MPICC
 	CXX=$MPICXX
 	F77=$MPIF77
@@ -18,9 +18,9 @@ function em.configure() {
 		|| exit 1 
 }
 
-em.add_to_family 'MPI'
-em.set_runtime_dependencies "${COMPILER}" "${MPI}"
-em.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}"
-em.set_docfiles LICENSE README
-em.make_all
+pmodules.add_to_group 'MPI'
+pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
+pmodules.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}"
+pmodules.set_docfiles LICENSE README
+pmodules.make_all
 
diff --git a/scripts/MPI/parmetis/build b/scripts/MPI/parmetis/build
index 3338247..5155065 100755
--- a/scripts/MPI/parmetis/build
+++ b/scripts/MPI/parmetis/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	CC=$MPICC
 	CXX=$MPICXX
 	F77=$MPIF77
@@ -11,7 +11,7 @@ function em.configure() {
 	FORTRAN=$MPIFORTRAN
 }
 
-function em.build() {
+pmodules.build() {
 	local -ri MAJOR_VERSION=${V%%.*}
 	if (( MAJOR_VERSION == 3 )) ; then
 		cd "${MODULE_SRCDIR}"
@@ -39,15 +39,15 @@ function em.build() {
 	fi
 }
 
-function em.install() {
+pmodules.install() {
 	:
 }
 
 
-em.add_to_family 'MPI'
-em.set_runtime_dependencies "${COMPILER}" "${MPI}"
-em.set_build_dependencies "${COMPILER}" "${MPI}"
-em.set_docfiles 'CHANGES' 'INSTALL' 'LICENSE.txt' 'README' 'VERSION' 
-em.make_all
-em.cleanup_src
+pmodules.add_to_group 'MPI'
+pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
+pmodules.set_build_dependencies "${COMPILER}" "${MPI}"
+pmodules.set_docfiles 'CHANGES' 'INSTALL' 'LICENSE.txt' 'README' 'VERSION' 
+pmodules.make_all
+pmodules.cleanup_src
 
diff --git a/scripts/MPI/trilinos/build b/scripts/MPI/trilinos/build
index 64b87e6..27e0017 100755
--- a/scripts/MPI/trilinos/build
+++ b/scripts/MPI/trilinos/build
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
 declare -rx AR=ar
 
-function em.configure() {
+pmodules.configure() {
 	BLAS_PREFIX=$OPENBLAS_PREFIX
 	LAPACK_PREFIX=$OPENBLAS_PREFIX
 
@@ -63,9 +63,9 @@ function em.configure() {
            "${MODULE_SRCDIR}" || exit 1
 }
 
-em.add_to_family 'MPI'
-em.set_runtime_dependencies "${COMPILER}" "${MPI}" 'OpenBLAS' 'parmetis'
-em.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'OpenBLAS' 'parmetis'
-em.set_docfiles Copyright.txt LICENSE README RELEASE_NOTES
-em.make_all
+pmodules.add_to_group 'MPI'
+pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}" 'OpenBLAS' 'parmetis'
+pmodules.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'OpenBLAS' 'parmetis'
+pmodules.set_docfiles Copyright.txt LICENSE README RELEASE_NOTES
+pmodules.make_all
 
diff --git a/scripts/OPAL/opt-pilot/build b/scripts/OPAL/opt-pilot/build
index eee8d88..560a558 100755
--- a/scripts/OPAL/opt-pilot/build
+++ b/scripts/OPAL/opt-pilot/build
@@ -1,20 +1,20 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
 module use unstable
 
 # add -fopenmp to CC and CXX, if you want to compile with OpenMP
-function em.configure() {
+pmodules.configure() {
 	cmake \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DCMAKE_BUILD_TYPE=RELEASE \
 		"${MODULE_SRCDIR}"
 }
 
-em.add_to_family 'OPAL'
-em.set_runtime_dependencies "${COMPILER}" "${MPI}"
-em.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'boost' 'hdf5' 'H5hut' 'trilinos' 'ippl' 'gsl' 'boost' 'OPAL'
-em.set_supported_compilers 'gcc/4.8'
-em.make_all
+pmodules.add_to_group 'OPAL'
+pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
+pmodules.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'boost' 'hdf5' 'H5hut' 'trilinos' 'ippl' 'gsl' 'boost' 'OPAL'
+pmodules.set_supported_compilers 'gcc/4.8'
+pmodules.make_all
 
diff --git a/scripts/Programming/Python/build b/scripts/Programming/Python/build
index 4475082..76ee418 100755
--- a/scripts/Programming/Python/build
+++ b/scripts/Programming/Python/build
@@ -1,21 +1,21 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-function em.post_install() {
+pmodules.post_install() {
 	ln -fs "${PREFIX}/bin/python${V%%.*}" "${PREFIX}/bin/python"
 	ln -fs "${PREFIX}/include/python${V%.*}m" "${PREFIX}/include/python"
 	ln -fs "${PREFIX}/include/python${V%.*}m" "${PREFIX}/include/python${V%.*}"
 }
 
-em.add_to_family 'Programming'
-em.set_runtime_dependencies ""
-em.set_build_dependencies   "${COMPILER}"
-em.make_all
+pmodules.add_to_group 'Programming'
+pmodules.set_runtime_dependencies ""
+pmodules.set_build_dependencies   "${COMPILER}"
+pmodules.make_all
 
diff --git a/scripts/Programming/Tcl/build b/scripts/Programming/Tcl/build
index 6aa8add..83d6aa4 100755
--- a/scripts/Programming/Tcl/build
+++ b/scripts/Programming/Tcl/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	case ${OS} in
 	Linux )
 		srcdir="${MODULE_SRCDIR}/unix"
@@ -17,13 +17,13 @@ function em.configure() {
 		|| exit 1
 }
 
-function em.post_install() {
+pmodules.post_install() {
 	{ cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
 }
 
 # use system's cc
 declare CC=cc
 
-em.add_to_family 'Programming'
-em.set_docfiles 'license.terms' 'README'
-em.make_all
+pmodules.add_to_group 'Programming'
+pmodules.set_docfiles 'license.terms' 'README'
+pmodules.make_all
diff --git a/scripts/Programming/Tk/build b/scripts/Programming/Tk/build
index 9ca58c4..dad9c60 100755
--- a/scripts/Programming/Tk/build
+++ b/scripts/Programming/Tk/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	case ${OS} in
 	Linux )
 		srcdir="${MODULE_SRCDIR}/unix"
@@ -18,7 +18,7 @@ function em.configure() {
 		|| exit 1
 }
 
-function em.post_install() {
+pmodules.post_install() {
 	:
 	#{ cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
 }
@@ -26,7 +26,7 @@ function em.post_install() {
 # use system's cc
 declare CC=cc
 
-em.add_to_family 'Programming'
-em.set_build_dependencies 'Tcl'
-em.set_docfiles 'license.terms' 'README'
-em.make_all
+pmodules.add_to_group 'Programming'
+pmodules.set_build_dependencies 'Tcl'
+pmodules.set_docfiles 'license.terms' 'README'
+pmodules.make_all
diff --git a/scripts/Programming/autoconf/build b/scripts/Programming/autoconf/build
index e3bf580..7b13e21 100755
--- a/scripts/Programming/autoconf/build
+++ b/scripts/Programming/autoconf/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
@@ -11,8 +11,8 @@ function em.configure() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family 'Programming'
-em.set_docfiles \
+pmodules.add_to_group 'Programming'
+pmodules.set_docfiles \
 	AUTHORS \
 	COPYING \
 	COPYING.EXCEPTION \
@@ -21,8 +21,8 @@ em.set_docfiles \
 	README \
 	THANKS
 
-em.set_build_dependencies "m4"
-em.make_all
+pmodules.set_build_dependencies "m4"
+pmodules.make_all
 
 # Local Variables:
 # mode: sh
diff --git a/scripts/Programming/automake/build b/scripts/Programming/automake/build
index 481d812..2081002 100755
--- a/scripts/Programming/automake/build
+++ b/scripts/Programming/automake/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
@@ -11,8 +11,8 @@ function em.configure() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family 'Programming'
-em.set_docfiles \
+pmodules.add_to_group 'Programming'
+pmodules.set_docfiles \
 	AUTHORS \
 	COPYING \
 	ChangeLog \
@@ -20,8 +20,8 @@ em.set_docfiles \
 	NEWS \
 	README \
 	THANKS
-em.set_build_dependencies 'm4' 'autoconf'
-em.make_all
+pmodules.set_build_dependencies 'm4' 'autoconf'
+pmodules.make_all
 
 # Local Variables:
 # mode: sh
diff --git a/scripts/Programming/binutils/build b/scripts/Programming/binutils/build
index e63f665..441b0ed 100755
--- a/scripts/Programming/binutils/build
+++ b/scripts/Programming/binutils/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
@@ -11,6 +11,6 @@ function em.configure() {
 # use system gcc to compile
 #declare -rx CC=gcc
 
-em.set_build_dependencies "${COMPILER}"
-em.add_to_family 'Programming'
-em.make_all
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.add_to_group 'Programming'
+pmodules.make_all
diff --git a/scripts/Programming/cmake/build b/scripts/Programming/cmake/build
index ffb9212..793ee7d 100755
--- a/scripts/Programming/cmake/build
+++ b/scripts/Programming/cmake/build
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}/bootstrap" --prefix="${PREFIX}"
 }
 
-em.add_to_family 'Programming'
-em.set_build_dependencies "${COMPILER}"
-em.make_all
+pmodules.add_to_group 'Programming'
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.make_all
 
diff --git a/scripts/Programming/gcc/build b/scripts/Programming/gcc/build
index 7c9ad60..2a51857 100755
--- a/scripts/Programming/gcc/build
+++ b/scripts/Programming/gcc/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-languages=c,c++,objc,obj-c++,lto,fortran \
@@ -21,8 +21,8 @@ declare -rx CC=gcc
 declare -rx CXX=g++
 
 module use 'Libraries'
-em.add_to_family 'Programming'
-em.set_build_dependencies 'gmp' 'mpfr' 'mpc'
-em.set_docfiles 'COPYING' 'COPYING.LIB' 'COPYING.RUNTIME' 'COPYING3' 'COPYING3.LIB' 'NEWS' 'README'
-em.make_all
+pmodules.add_to_group 'Programming'
+pmodules.set_build_dependencies 'gmp' 'mpfr' 'mpc'
+pmodules.set_docfiles 'COPYING' 'COPYING.LIB' 'COPYING.RUNTIME' 'COPYING3' 'COPYING3.LIB' 'NEWS' 'README'
+pmodules.make_all
 
diff --git a/scripts/Programming/gtest/build b/scripts/Programming/gtest/build
index dbca446..12c3c86 100755
--- a/scripts/Programming/gtest/build
+++ b/scripts/Programming/gtest/build
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-em.add_to_family 'Programming'
-em.set_runtime_dependencies ""
-em.set_build_dependencies   "${COMPILER}"
-em.make_all
+pmodules.add_to_group 'Programming'
+pmodules.set_runtime_dependencies ""
+pmodules.set_build_dependencies   "${COMPILER}"
+pmodules.make_all
 
diff --git a/scripts/Programming/libtool/build b/scripts/Programming/libtool/build
index e6b1ba6..62a4531 100755
--- a/scripts/Programming/libtool/build
+++ b/scripts/Programming/libtool/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
@@ -11,8 +11,8 @@ function em.configure() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family 'Programming'
-em.set_docfiles 'AUTHORS' 'COPYING' 'NEWS' 'README' 'THANKS'
-em.set_build_dependencies 'autoconf' 'automake'
-em.make_all
+pmodules.add_to_group 'Programming'
+pmodules.set_docfiles 'AUTHORS' 'COPYING' 'NEWS' 'README' 'THANKS'
+pmodules.set_build_dependencies 'autoconf' 'automake'
+pmodules.make_all
 
diff --git a/scripts/Programming/m4/build b/scripts/Programming/m4/build
index 82c5b86..ad5a34b 100755
--- a/scripts/Programming/m4/build
+++ b/scripts/Programming/m4/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
@@ -11,5 +11,5 @@ function em.configure() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family 'Programming'
-em.make_all
+pmodules.add_to_group 'Programming'
+pmodules.make_all
diff --git a/scripts/Programming/psi-python27/build b/scripts/Programming/psi-python27/build
index 9fce1c3..5eba966 100755
--- a/scripts/Programming/psi-python27/build
+++ b/scripts/Programming/psi-python27/build
@@ -1,19 +1,19 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	:
 }
 
-function em.build() {
+pmodules.build() {
 	:
 }
 
-function em.install() {
+pmodules.install() {
 	cd "${MODULE_SRCDIR}"
 	rsync --exclude=".info" --delete --verbose --archive . "${PREFIX}"
 }
 
-em.add_to_family 'Programming'
-em.make_all
+pmodules.add_to_group 'Programming'
+pmodules.make_all
diff --git a/scripts/System/filebench/build b/scripts/System/filebench/build
index d919ff2..7933b19 100755
--- a/scripts/System/filebench/build
+++ b/scripts/System/filebench/build
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-em.supported_os 'Linux'
-em.add_to_family 'System'
-em.set_build_dependencies "${COMPILER}"
-em.make_all
+pmodules.supported_os 'Linux'
+pmodules.add_to_group 'System'
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.make_all
diff --git a/scripts/System/fsstress/build b/scripts/System/fsstress/build
index f43ae43..b90e910 100755
--- a/scripts/System/fsstress/build
+++ b/scripts/System/fsstress/build
@@ -1,24 +1,24 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	:
 }
 
-function em.build() {
+pmodules.build() {
         cd "${MODULE_SRCDIR}"
 
 	make -j ${JOBS}
 }
 
-function em.install() {
+pmodules.install() {
         cd "${MODULE_SRCDIR}"
 	mkdir -p ${PREFIX}/bin
 	install -m 0755 fsstress "${PREFIX}/bin"
 }
 
-#em.supported_os 'Linux'
-em.add_to_family 'System'
-em.set_build_dependencies "${COMPILER}"
-em.make_all
+#pmodules.supported_os 'Linux'
+pmodules.add_to_group 'System'
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.make_all
diff --git a/scripts/System/mdtest/build b/scripts/System/mdtest/build
index 8395fcd..3b76759 100755
--- a/scripts/System/mdtest/build
+++ b/scripts/System/mdtest/build
@@ -1,24 +1,24 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	:
 }
 
-function em.build() {
+pmodules.build() {
         cd "${MODULE_SRCDIR}"
 
 	make -j ${JOBS}
 }
 
-function em.install() {
+pmodules.install() {
         cd "${MODULE_SRCDIR}"
 	mkdir -p ${PREFIX}/bin
 	install -m 0755 mdtest "${PREFIX}/bin"
 }
 
-#em.supported_os 'Linux'
-em.add_to_family 'System'
-em.set_build_dependencies "${COMPILER}" "${MPI}"
-em.make_all
+#pmodules.supported_os 'Linux'
+pmodules.add_to_group 'System'
+pmodules.set_build_dependencies "${COMPILER}" "${MPI}"
+pmodules.make_all
diff --git a/scripts/System/nmap/build b/scripts/System/nmap/build
index f71397c..608ee20 100755
--- a/scripts/System/nmap/build
+++ b/scripts/System/nmap/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	cd "${MODULE_SRCDIR}"
 	./configure \
 		--prefix="${PREFIX}" \
@@ -13,16 +13,16 @@ function em.configure() {
 		--with-liblinear=included
 }
 
-function em.build() {
+pmodules.build() {
 	cd "${MODULE_SRCDIR}"
 	make -j "${JOBS}"
 }
 
-function em.install() {
+pmodules.install() {
 	cd "${MODULE_SRCDIR}"
 	make install
 }
 
-em.add_to_family 'System'
-em.set_build_dependencies "${COMPILER}"
-em.make_all
+pmodules.add_to_group 'System'
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.make_all
diff --git a/scripts/System/patchelf/build b/scripts/System/patchelf/build
index d919ff2..7933b19 100755
--- a/scripts/System/patchelf/build
+++ b/scripts/System/patchelf/build
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-em.supported_os 'Linux'
-em.add_to_family 'System'
-em.set_build_dependencies "${COMPILER}"
-em.make_all
+pmodules.supported_os 'Linux'
+pmodules.add_to_group 'System'
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.make_all
diff --git a/scripts/System/unison/build b/scripts/System/unison/build
index 715d2be..1a15abd 100755
--- a/scripts/System/unison/build
+++ b/scripts/System/unison/build
@@ -1,26 +1,26 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	:
 }
 
-function em.build() {
+pmodules.build() {
 	cd "${MODULE_SRCDIR}"
 	make
 }
 
-function em.install() {
+pmodules.install() {
 	cd "${MODULE_SRCDIR}"
 	install -m 0755 -d "${PREFIX}/bin"
 	install -m 0755 unison "${PREFIX}/bin"
 }
 
-em.add_to_family 'System'
-em.set_docfiles 'BUGS.txt' 'CONTRIB' 'COPYING' 'NEWS' 'README'
-#em.set_build_dependencies "${COMPILER}"
-em.make_all
+pmodules.add_to_group 'System'
+pmodules.set_docfiles 'BUGS.txt' 'CONTRIB' 'COPYING' 'NEWS' 'README'
+#pmodules.set_build_dependencies "${COMPILER}"
+pmodules.make_all
 
 # Local Variables:
 # mode: sh
diff --git a/scripts/Tools/emacs/build b/scripts/Tools/emacs/build
index fe29eaa..18491fd 100755
--- a/scripts/Tools/emacs/build
+++ b/scripts/Tools/emacs/build
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
 module use 'Libraries'
 
@@ -14,7 +14,7 @@ Darwin )
 	CXX=''
 	COMPILER=''
 	COMPILER_VERSION=''
-	function em.post_install() {
+	pmodules.post_install() {
 		mkdir -p "${PREFIX}"
 		cp -rv "${MODULE_BUILDDIR}"/nextstep/Emacs.app "${PREFIX}"
 	}
@@ -28,7 +28,7 @@ Linux )
 	;;
 esac
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		${configure_args} \
@@ -36,7 +36,7 @@ function em.configure() {
 	install -m 0755 -d "${PREFIX}"
 }
 
-function em.post_install() {
+pmodules.post_install() {
 	if [[ -d "${MODULE_BUILDDIR}/nextstep/Emacs.app" ]]; then
 		cp -a "${MODULE_BUILDDIR}/nextstep/Emacs.app" "${PREFIX}"
 	fi
@@ -69,7 +69,7 @@ EOF
 	chmod 0755 "${PREFIX}/bin/Emacsclient"
 }
 
-em.add_to_family 'Tools'
-em.set_build_dependencies ${build_dependencies}
-em.make_all
+pmodules.add_to_group 'Tools'
+pmodules.set_build_dependencies ${build_dependencies}
+pmodules.make_all
 
diff --git a/scripts/Tools/git/build b/scripts/Tools/git/build
index 0f72c23..af1318b 100755
--- a/scripts/Tools/git/build
+++ b/scripts/Tools/git/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	cd "${MODULE_SRCDIR}"
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
@@ -10,15 +10,15 @@ function em.configure() {
 		|| exit 1
 }
 
-function em.build() {
+pmodules.build() {
         cd "${MODULE_SRCDIR}"
         make
 }
 
-em.add_to_family 'Tools'
-em.set_runtime_dependencies 'Tcl' 'Tk'
-em.set_docfiles 'COPYING' 'README'
-em.make_all
+pmodules.add_to_group 'Tools'
+pmodules.set_runtime_dependencies 'Tcl' 'Tk'
+pmodules.set_docfiles 'COPYING' 'README'
+pmodules.make_all
 
 # Local Variables:
 # mode: sh
diff --git a/scripts/Tools/global/build b/scripts/Tools/global/build
index 7d163b4..14d2516 100755
--- a/scripts/Tools/global/build
+++ b/scripts/Tools/global/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--with-pic=yes \
@@ -10,10 +10,10 @@ function em.configure() {
 		|| exit 1
 }
 
-em.add_to_family 'Tools'
-em.set_docfiles 'AUTHORS' 'COPYING' 'COPYING.LIB' 'LICENSE' 'README' 'THANKS'
-em.set_build_dependencies "gcc/4.8.3"
-em.make_all
+pmodules.add_to_group 'Tools'
+pmodules.set_docfiles 'AUTHORS' 'COPYING' 'COPYING.LIB' 'LICENSE' 'README' 'THANKS'
+pmodules.set_build_dependencies "gcc/4.8.3"
+pmodules.make_all
 
 # Local Variables:
 # mode: sh
diff --git a/scripts/Tools/gnuplot/build b/scripts/Tools/gnuplot/build
index 0216439..5f18b21 100755
--- a/scripts/Tools/gnuplot/build
+++ b/scripts/Tools/gnuplot/build
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source "$(dirname $0)/../../../lib/libem.bash"
+source "$(dirname $0)/../../../lib/libpmodules.bash"
 
-function em.configure() {
+pmodules.configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--with-gif=no \
@@ -10,10 +10,10 @@ function em.configure() {
 		|| exit 1
 }
 
-em.add_to_family 'Tools'
-em.set_docfiles 'Copyright' 'ChangeLog' 'NEWS' 'README'
-em.set_build_dependencies "${COMPILER}"
-em.make_all
+pmodules.add_to_group 'Tools'
+pmodules.set_docfiles 'Copyright' 'ChangeLog' 'NEWS' 'README'
+pmodules.set_build_dependencies "${COMPILER}"
+pmodules.make_all
 
 # Local Variables:
 # mode: sh