diff --git a/etc/aliases.csh b/etc/aliases.csh
index a278c20d32..3ee5a555a6 100644
--- a/etc/aliases.csh
+++ b/etc/aliases.csh
@@ -26,16 +26,17 @@
 #
 # Description
 #     Aliases for working with OpenFOAM
-#     Sourced from OpenFOAM-??/etc/cshrc and/or ~/.cshrc
+#     Sourced from OpenFOAM-<VERSION>/etc/cshrc and/or ~/.cshrc
 #
 #------------------------------------------------------------------------------
 
 # Change compiled version aliases
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-alias wm64 'setenv WM_ARCH_OPTION 64; source $WM_PROJECT_DIR/etc/cshrc'
-alias wm32 'setenv WM_ARCH_OPTION 32; source $WM_PROJECT_DIR/etc/cshrc'
-alias wmSP 'setenv WM_PRECISION_OPTION SP; source $WM_PROJECT_DIR/etc/cshrc'
-alias wmDP 'setenv WM_PRECISION_OPTION DP; source $WM_PROJECT_DIR/etc/cshrc'
+alias wmSET 'source $WM_PROJECT_DIR/etc/cshrc'
+alias wm64 'wmSET WM_ARCH_OPTION=64'
+alias wm32 'wmSET WM_ARCH_OPTION=32'
+alias wmSP 'wmSET WM_PRECISION_OPTION=SP'
+alias wmDP 'wmSET WM_PRECISION_OPTION=DP'
 
 # Toggle wmakeScheduler on/off
 #  - also need to set WM_HOSTS
diff --git a/etc/aliases.sh b/etc/aliases.sh
index 628df5e90e..9755f000a5 100644
--- a/etc/aliases.sh
+++ b/etc/aliases.sh
@@ -26,16 +26,17 @@
 #
 # Description
 #     Aliases for working with OpenFOAM
-#     Sourced from OpenFOAM-??/etc/bashrc and/or ~/.bashrc
+#     Sourced from OpenFOAM-<VERSION>/etc/bashrc and/or ~/.bashrc
 #
 #------------------------------------------------------------------------------
 
 # Change compiled version aliases
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-alias wm64='export WM_ARCH_OPTION=64; . $WM_PROJECT_DIR/etc/bashrc'
-alias wm32='export WM_ARCH_OPTION=32; . $WM_PROJECT_DIR/etc/bashrc'
-alias wmSP='export WM_PRECISION_OPTION=SP; . $WM_PROJECT_DIR/etc/bashrc'
-alias wmDP='export WM_PRECISION_OPTION=DP; . $WM_PROJECT_DIR/etc/bashrc'
+alias wmSET='. $WM_PROJECT_DIR/etc/bashrc'
+alias wm64='wmSET WM_ARCH_OPTION=64'
+alias wm32='wmSET WM_ARCH_OPTION=32'
+alias wmSP='wmSET WM_PRECISION_OPTION=SP'
+alias wmDP='wmSET WM_PRECISION_OPTION=DP'
 
 # Toggle wmakeScheduler on/off
 #  - also need to set WM_HOSTS