diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc
index f1f05e236889388022012f1aa8e09d30af4f7034..ec6608e56bc35cf7b266b224308d2ab34abed5d5 100644
--- a/etc/apps/paraview3/bashrc
+++ b/etc/apps/paraview3/bashrc
@@ -33,6 +33,9 @@
 #     The env. variable 'ParaView_DIR' is required for building plugins
 #------------------------------------------------------------------------------
 
+#- Clean PATH
+cleanedEnv=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/cmake- $WM_THIRD_PARTY_DIR/paraview-"` && PATH="$cleanedEnv"
+
 # determine the cmake to be used
 unset CMAKE_HOME
 for cmake in cmake-2.8.0 cmake-2.6.4 cmake-2.6.2 cmake-2.4.6
@@ -88,5 +91,5 @@ else
 fi
 
 
-unset cmake paraviewInstDir paraviewPython
+unset cleanedEnv cmake paraviewInstDir paraviewPython
 # -----------------------------------------------------------------------------
diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc
index 2217d27725f71881d9dbf9a95c91ed851ec06835..547869c58492cff6dcf4b9ea66ab23d5804654f1 100644
--- a/etc/apps/paraview3/cshrc
+++ b/etc/apps/paraview3/cshrc
@@ -33,6 +33,14 @@
 #     The env. variable 'ParaView_DIR' is required for building plugins
 #------------------------------------------------------------------------------
 
+#- Clean PATH
+set colonPath=`echo "$path" | sed -e 's/ /:/g'`
+set cleanedEnv=`$WM_PROJECT_DIR/bin/foamCleanPath "$colonPath" "$WM_THIRD_PARTY_DIR/cmake- $WM_THIRD_PARTY_DIR/paraview-"`
+if ( $status == 0 ) then
+    set path=`echo "$cleanedEnv" | sed -e 's/:/ /g'`
+endif
+
+
 # determine the cmake to be used
 unsetenv CMAKE_HOME
 foreach cmake ( cmake-2.8.0 cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 )
@@ -45,7 +53,7 @@ foreach cmake ( cmake-2.8.0 cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 )
 end
 
 # set VERSION and MAJOR (version) variables if not already set
-if ( ! $?ParaView_VERSION ) setenv ParaView_VERSION 3.6.1
+if ( ! $?ParaView_VERSION || "x$ParaView_VERSION" == "x" ) setenv ParaView_VERSION 3.6.1
 if ( ! $?ParaView_MAJOR )   setenv ParaView_MAJOR unknown
 
 # if needed, set MAJOR version to correspond to VERSION
@@ -83,5 +91,5 @@ else
 endif
 
 
-unset cmake paraviewInstDir paraviewPython
+unset cleanedEnv colonPath cmake paraviewInstDir paraviewPython
 # -----------------------------------------------------------------------------
diff --git a/etc/bashrc b/etc/bashrc
index 3d5be555f04e586d2729325990ad7cb8b3822eb3..e48b1f6ca1c16cf4f0329a0e899ce37f8918d80c 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -208,13 +208,13 @@ esac
 cleanProg=$WM_PROJECT_DIR/bin/foamCleanPath
 
 #- Clean PATH
-cleanEnv=`$cleanProg "$PATH" "$foamOldDirs"` && PATH="$cleanEnv"
+cleanedEnv=`$cleanProg "$PATH" "$foamOldDirs"` && PATH="$cleanedEnv"
 
 #- Clean LD_LIBRARY_PATH
-cleanEnv=`$cleanProg "$LD_LIBRARY_PATH" "$foamOldDirs"` && LD_LIBRARY_PATH="$cleanEnv"
+cleanedEnv=`$cleanProg "$LD_LIBRARY_PATH" "$foamOldDirs"` && LD_LIBRARY_PATH="$cleanedEnv"
 
 #- Clean MANPATH
-cleanEnv=`$cleanProg "$MANPATH" "$foamCleanDirs"` && MANPATH="$cleanEnv"
+cleanedEnv=`$cleanProg "$MANPATH" "$foamCleanDirs"` && MANPATH="$cleanedEnv"
 
 export PATH LD_LIBRARY_PATH MANPATH
 
@@ -245,27 +245,27 @@ _foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc
 # Clean environment paths again. Only remove duplicates
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #- Clean PATH
-cleanEnv=`$cleanProg "$PATH"` && PATH="$cleanEnv"
+cleanedEnv=`$cleanProg "$PATH"` && PATH="$cleanedEnv"
 
 #- Clean LD_LIBRARY_PATH
-cleanEnv=`$cleanProg "$LD_LIBRARY_PATH"` && LD_LIBRARY_PATH="$cleanEnv"
+cleanedEnv=`$cleanProg "$LD_LIBRARY_PATH"` && LD_LIBRARY_PATH="$cleanedEnv"
 
 #- Clean MANPATH
-cleanEnv=`$cleanProg "$MANPATH"` && MANPATH="$cleanEnv:"
+cleanedEnv=`$cleanProg "$MANPATH"` && MANPATH="$cleanedEnv:"
 
 export PATH LD_LIBRARY_PATH MANPATH
 
 #- Clean LD_PRELOAD
 if [ "$LD_PRELOAD" != "" ]
 then
-    cleanEnv=`$cleanProg "$LD_PRELOAD"` && LD_PRELOAD="$cleanEnv"
+    cleanedEnv=`$cleanProg "$LD_PRELOAD"` && LD_PRELOAD="$cleanedEnv"
     export LD_PRELOAD
 fi
 
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unset cleanEnv cleanProg foamInstall foamOldDirs
+unset cleanedEnv cleanProg foamInstall foamOldDirs
 unset _foamSource
 
 # -----------------------------------------------------------------------------
diff --git a/etc/cshrc b/etc/cshrc
index 9ef6fb2d068da7d25cee0f81ef369b6521958d1f..fa20261f7a732a8457416392d7c212cbf895d072 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -212,9 +212,9 @@ endif
 
 #- Clean path/PATH
 set colonPath=`echo "$path" | sed -e 's/ /:/g'`
-set cleanEnv=`$cleanProg "$colonPath" "$foamOldDirs"`
+set cleanedEnv=`$cleanProg "$colonPath" "$foamOldDirs"`
 if ( $status == 0 ) then
-    set path=`echo "$cleanEnv" | sed -e 's/:/ /g'`
+    set path=`echo "$cleanedEnv" | sed -e 's/:/ /g'`
 endif
 
 #- Clean LD_LIBRARY_PATH
@@ -242,9 +242,9 @@ _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #- Clean path/PATH
 set colonPath=`echo "$path" | sed -e 's/ /:/g'`
-set cleanEnv=`$cleanProg "$colonPath"`
+set cleanedEnv=`$cleanProg "$colonPath"`
 if ( $status == 0 ) then
-    set path=`echo "$cleanEnv" | sed -e 's/:/ /g'`
+    set path=`echo "$cleanedEnv" | sed -e 's/:/ /g'`
 endif
 
 #- Clean LD_LIBRARY_PATH
@@ -260,7 +260,7 @@ endif
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unset cleanEnv cleanProg colonPath foamInstall foamOldDirs
+unset cleanedEnv cleanProg colonPath foamInstall foamOldDirs
 unalias _foamSource
 
 # -----------------------------------------------------------------------------