diff --git a/etc/bashrc b/etc/bashrc
index 3394c0894f..4df0d6c375 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -44,7 +44,7 @@ export WM_PROJECT_VERSION=dev
 #
 [ $BASH_SOURCE ] && \
 export FOAM_INST_DIR=${BASH_SOURCE%/*/*/*} || \
-export FOAM_INST_DIR=$HOME/OpenFOAM
+export FOAM_INST_DIR=$HOME/$WM_PROJECT
 # export FOAM_INST_DIR=~$WM_PROJECT
 # export FOAM_INST_DIR=/opt/$WM_PROJECT
 # export FOAM_INST_DIR=/usr/local/$WM_PROJECT
diff --git a/etc/cshrc b/etc/cshrc
index 13e7177a7f..2fac1a1c83 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -41,8 +41,8 @@ setenv WM_PROJECT_VERSION dev
 #
 # Please set to the appropriate path if the default is not correct.
 #
-setenv FOAM_INST_DIR `lsof +p $$ |& grep -oE '/.*OpenFOAM[^/]*/etc/cshrc' | \
-    sed 's%/OpenFOAM[^/]*/etc/cshrc%%'`
+setenv FOAM_INST_DIR `lsof +p $$ |& grep -oE '/.*'$WM_PROJECT'[^/]*/etc/cshrc' | \
+    sed 's%/'$WM_PROJECT'[^/]*/etc/cshrc%%'`
 echo $FOAM_INST_DIR
 # setenv FOAM_INST_DIR  $HOME/$WM_PROJECT
 # setenv FOAM_INST_DIR  ~$WM_PROJECT