diff --git a/etc/config.csh/aliases b/etc/config.csh/aliases
index 6d922a435..8cab2641d 100644
--- a/etc/config.csh/aliases
+++ b/etc/config.csh/aliases
@@ -50,29 +50,10 @@ alias wmUnset 'source $WM_PROJECT_DIR/etc/config.csh/unset'
 alias wmSchedOn 'setenv WM_SCHEDULER $WM_PROJECT_DIR/wmake/wmakeScheduler'
 alias wmSchedOff 'unsetenv WM_SCHEDULER'
 
-# Change ParaView version
-# ~~~~~~~~~~~~~~~~~~~~~~~
-alias foamPV 'source `$WM_PROJECT_DIR/etc/config.csh/paraview` ParaView_VERSION=\!*; echo paraview-$ParaView_VERSION'
-
 
 # Change directory aliases
 # ~~~~~~~~~~~~~~~~~~~~~~~~
-alias src 'cd $FOAM_SRC'
-alias lib 'cd $FOAM_LIBBIN'
-alias run 'cd $FOAM_RUN'
 alias foam 'cd $WM_PROJECT_DIR'
-alias foamsrc 'cd $FOAM_SRC/$WM_PROJECT'
-alias foamfv 'cd $FOAM_SRC/finiteVolume'
-alias app 'cd $FOAM_APP'
-alias util 'cd $FOAM_UTILITIES'
-alias sol 'cd $FOAM_SOLVERS'
-alias tut 'cd $FOAM_TUTORIALS'
-
-alias foamApps 'cd $FOAM_APP'
-alias foamSol 'cd $FOAM_SOLVERS'
-alias foamTuts 'cd $FOAM_TUTORIALS'
-alias foamUtils 'cd $FOAM_UTILITIES'
-alias foam3rdParty 'cd $WM_THIRD_PARTY_DIR'
 
 if ( $?WM_PROJECT_SITE ) then
     alias foamSite 'cd $WM_PROJECT_SITE'
@@ -80,4 +61,25 @@ else
     alias foamSite 'cd $WM_PROJECT_INST_DIR/site'
 endif
 
+alias src 'cd $FOAM_SRC'
+alias lib 'cd $FOAM_LIBBIN'
+alias app 'cd $FOAM_APP'
+alias sol 'cd $FOAM_SOLVERS'
+alias util 'cd $FOAM_UTILITIES'
+alias tut 'cd $FOAM_TUTORIALS'
+alias run 'cd $FOAM_RUN'
+
+
+# Change OpenFOAM version
+# ~~~~~~~~~~~~~~~~~~~~~~~
+alias foamVersion \
+    'if ( "\!*" != "" ) source $FOAM_INST_DIR/OpenFOAM-\!*/etc/cshrc; foam; echo OpenFOAM-$WM_PROJECT_VERSION'
+
+
+# Change ParaView version
+# ~~~~~~~~~~~~~~~~~~~~~~~
+alias foamPV \
+    'source $WM_PROJECT_DIR/etc/config.csh/paraview ParaView_VERSION=\!*; echo paraview-$ParaView_VERSION'
+
+
 #------------------------------------------------------------------------------
diff --git a/etc/config.csh/unset b/etc/config.csh/unset
index 648b20743..8b128d487 100644
--- a/etc/config.csh/unset
+++ b/etc/config.csh/unset
@@ -169,25 +169,20 @@ unalias wmUnset
 
 unalias wmSchedOn
 unalias wmSchedOff
-unalias foamPV
+
+unalias foam
+unalias foamSite
 
 unalias src
 unalias lib
-unalias run
-unalias foam
-unalias foamsrc
-unalias foamfv
 unalias app
-unalias util
 unalias sol
+unalias util
 unalias tut
+unalias run
 
-unalias foamApps
-unalias foamSol
-unalias foamTuts
-unalias foamUtils
-unalias foam3rdParty
-unalias foamSite
+unalias foamVersion
+unalias foamPV
 
 
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/aliases b/etc/config.sh/aliases
index 28a504a25..7c2a7a378 100644
--- a/etc/config.sh/aliases
+++ b/etc/config.sh/aliases
@@ -50,6 +50,43 @@ alias wmUnset='. $WM_PROJECT_DIR/etc/config.sh/unset'
 alias wmSchedOn='export WM_SCHEDULER=$WM_PROJECT_DIR/wmake/wmakeScheduler'
 alias wmSchedOff='unset WM_SCHEDULER'
 
+# Change directory aliases
+# ~~~~~~~~~~~~~~~~~~~~~~~~
+alias foam='cd $WM_PROJECT_DIR'
+
+if [ -n "$WM_PROJECT_SITE" ]
+then
+    alias foamSite='cd $WM_PROJECT_SITE'
+else
+    alias foamSite='cd $WM_PROJECT_INST_DIR/site'
+fi
+
+alias src='cd $FOAM_SRC'
+alias lib='cd $FOAM_LIBBIN'
+alias app='cd $FOAM_APP'
+alias sol='cd $FOAM_SOLVERS'
+alias util='cd $FOAM_UTILITIES'
+alias tut='cd $FOAM_TUTORIALS'
+alias run='cd $FOAM_RUN'
+
+
+# Change OpenFOAM version
+# ~~~~~~~~~~~~~~~~~~~~~~~
+unset foamVersion
+foamVersion()
+{
+    if [ "$1" ]; then
+        foamInstDir=$FOAM_INST_DIR
+        wmUnset
+        . $foamInstDir/OpenFOAM-$1/etc/bashrc
+        foam
+        echo "Changed to OpenFOAM-$1" 1>&2
+    else
+        echo "OpenFOAM-$WM_PROJECT_VERSION" 1>&2
+    fi
+}
+
+
 # Change ParaView version
 # ~~~~~~~~~~~~~~~~~~~~~~~
 unset foamPV
@@ -60,30 +97,4 @@ foamPV()
 }
 
 
-# Change directory aliases
-# ~~~~~~~~~~~~~~~~~~~~~~~~
-alias src='cd $FOAM_SRC'
-alias lib='cd $FOAM_LIBBIN'
-alias run='cd $FOAM_RUN'
-alias foam='cd $WM_PROJECT_DIR'
-alias foamsrc='cd $FOAM_SRC/$WM_PROJECT'
-alias foamfv='cd $FOAM_SRC/finiteVolume'
-alias app='cd $FOAM_APP'
-alias util='cd $FOAM_UTILITIES'
-alias sol='cd $FOAM_SOLVERS'
-alias tut='cd $FOAM_TUTORIALS'
-
-alias foamApps='cd $FOAM_APP'
-alias foamSol='cd $FOAM_SOLVERS'
-alias foamTuts='cd $FOAM_TUTORIALS'
-alias foamUtils='cd $FOAM_UTILITIES'
-alias foam3rdParty='cd $WM_THIRD_PARTY_DIR'
-
-if [ -n "$WM_PROJECT_SITE" ]
-then
-    alias foamSite='cd $WM_PROJECT_SITE'
-else
-    alias foamSite='cd $WM_PROJECT_INST_DIR/site'
-fi
-
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/unset b/etc/config.sh/unset
index 92309add8..2959dd41a 100644
--- a/etc/config.sh/unset
+++ b/etc/config.sh/unset
@@ -155,25 +155,20 @@ unalias wmUnset
 
 unalias wmSchedOn
 unalias wmSchedOff
-unset foamPV
+
+unalias foam
+unalias foamSite
 
 unalias src
 unalias lib
-unalias run
-unalias foam
-unalias foamsrc
-unalias foamfv
 unalias app
-unalias util
 unalias sol
+unalias util
 unalias tut
+unalias run
 
-unalias foamApps
-unalias foamSol
-unalias foamTuts
-unalias foamUtils
-unalias foam3rdParty
-unalias foamSite
+unset foamVersion
+unset foamPV
 
 
 #------------------------------------------------------------------------------