diff --git a/etc/settings.csh b/etc/settings.csh
index e1e8a5cd9548b77c75bd033b27024603a45073e7..3fa9f1958faf8876a3df1d0bdae89780787c3038 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -132,9 +132,8 @@ endif
 
 switch ("$WM_MPLIB")
 case OPENMPI:
-    set ompi_version=1.2.6
-    setenv OPENMPI_HOME $thirdParty/openmpi-$ompi_version
-    setenv OPENMPI_ARCH_PATH $OPENMPI_HOME/platforms/$WM_OPTIONS
+    set ompi_version=openmpi-1.2.6
+    setenv OPENMPI_ARCH_PATH $thirdParty/$ompi_version/platforms/$WM_OPTIONS
 
     # Tell OpenMPI where to find it's install directory
     setenv OPAL_PREFIX $OPENMPI_ARCH_PATH
@@ -142,32 +141,31 @@ case OPENMPI:
     AddLib $OPENMPI_ARCH_PATH/lib
     AddPath $OPENMPI_ARCH_PATH/bin
 
-    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/openmpi-$ompi_version
+    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$ompi_version
     unset ompi_version
     breaksw
 
 case LAM:
-    set lam_version=7.1.4
-    setenv LAMHOME $thirdParty/lam-$lam_version
+    set lam_version=lam-7.1.4
+    setenv LAMHOME $thirdParty/$lam_version
     setenv LAM_ARCH_PATH $LAMHOME/platforms/$WM_OPTIONS
 
     AddLib $LAM_ARCH_PATH/lib
     AddPath $LAM_ARCH_PATH/bin
 
-    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/lam-$lam_version
+    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$lam_version
     unset lam_version
     breaksw
 
 case MPICH:
-    set mpich_version=1.2.4
-    setenv MPICH_PATH $thirdParty/mpich-$mpich_version
-    setenv MPICH_ARCH_PATH $MPICH_PATH/platforms/$WM_OPTIONS
+    set mpich_version=mpich-1.2.4
+    setenv MPICH_ARCH_PATH $thirdParty/$mpich_version/platforms/$WM_OPTIONS
     setenv MPICH_ROOT $MPICH_ARCH_PATH
 
     AddLib $MPICH_ARCH_PATH/lib
     AddPath $MPICH_ARCH_PATH/bin
 
-    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/mpich-$mpich_version
+    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpich_version
     unset mpich_version
     breaksw
 
diff --git a/etc/settings.sh b/etc/settings.sh
index 9522d4755f2730c1f03d89793a6676017434b7c6..b1302c23c44b743bf84bb0bfefc9360ecc38a8ca 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -145,42 +145,40 @@ thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
 
 case "$WM_MPLIB" in
 OPENMPI)
-    ompi_version=1.2.6
-    export OPENMPI_HOME=$thirdParty/openmpi-$ompi_version
-    export OPENMPI_ARCH_PATH=$OPENMPI_HOME/platforms/$WM_OPTIONS
+    ompi_version=openmpi-1.2.6
+    export OPENMPI_ARCH_PATH=$thirdParty/$ompi_version/platforms/$WM_OPTIONS
 
-    # Tell OpenMPI where to find it's install directory
+    # Tell OpenMPI where to find its install directory
     export OPAL_PREFIX=$OPENMPI_ARCH_PATH
 
     AddLib $OPENMPI_ARCH_PATH/lib
     AddPath $OPENMPI_ARCH_PATH/bin
 
-    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/openmpi-$ompi_version
+    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$ompi_version
     unset ompi_version
     ;;
 
 LAM)
-    lam_version=7.1.4
-    export LAMHOME=$thirdParty/lam-$lam_version
+    lam_version=lam-7.1.4
+    export LAMHOME=$thirdParty/$lam_version
     export LAM_ARCH_PATH=$LAMHOME/platforms/$WM_OPTIONS
 
     AddLib  $LAM_ARCH_PATH/lib
     AddPath $LAM_ARCH_PATH/bin
 
-    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/lam-$lam_version
+    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$lam_version
     unset lam_version
     ;;
 
 MPICH)
-    mpich_version=1.2.4
-    export MPICH_PATH=$thirdParty/mpich-$mpich_version
-    export MPICH_ARCH_PATH=$MPICH_PATH/platforms/$WM_OPTIONS
+    mpich_version=mpich-1.2.4
+    export MPICH_ARCH_PATH=$thirdParty/$mpich_version/platforms/$WM_OPTIONS
     export MPICH_ROOT=$MPICH_ARCH_PATH
 
     AddLib  $MPICH_ARCH_PATH/lib
     AddPath $MPICH_ARCH_PATH/bin
 
-    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/mpich-$mpich_version
+    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpich_version
     unset mpich_version
     ;;