diff --git a/regression/regression_var.sh b/regression/regression_var.sh
index 5d865a7cc8..02ffb24b12 100755
--- a/regression/regression_var.sh
+++ b/regression/regression_var.sh
@@ -42,9 +42,9 @@ elif [[ -d /sw/gaea ]]; then # Gaea
   export machine="Gaea"
 elif [[ -d /data/prod ]]; then # S4
   export machine="S4"
-elif [[ -d /work && $(hostname -d) =~ "Orion" ]]; then # Orion
+elif [[ -d /work && $(hostname) =~ "Orion" ]]; then # Orion
   export machine="Orion"
-elif [[ -d /work && $(hostname -d) =~ "Hercules" ]]; then # Hercules
+elif [[ -d /work && $(hostname) =~ "hercules" ]]; then # Hercules
   export machine="Hercules"
 elif [[ -d /lfs/h2 ]]; then # wcoss2
   export machine="wcoss2"
diff --git a/ush/module-setup.sh b/ush/module-setup.sh
index 192a21509c..d13da1efa3 100755
--- a/ush/module-setup.sh
+++ b/ush/module-setup.sh
@@ -18,7 +18,7 @@ elif [[ $MACHINE_ID = hera* ]] ; then
 elif [[ $MACHINE_ID = hercules* ]] ; then
     # We are on Hercules
     if ( ! eval module help > /dev/null 2>&1 ) ; then
-        source /apps/lmod/lmod/init/bash
+        source /apps/other/lmod/lmod/init/bash
     fi
     module purge
 
diff --git a/ush/sub_hercules b/ush/sub_hercules
index 3466c5a79d..573378fdb6 100755
--- a/ush/sub_hercules
+++ b/ush/sub_hercules
@@ -126,7 +126,7 @@ echo "" >>$cfile
 echo ". "$(awk '{ print $1, $2, $3, $4, $5, $6, $7, $8, $9 }' $regdir/regression_var.out)  >>$cfile
 echo "" >>$cfile
 
-echo ". /apps/lmod/lmod/init/sh"                           >> $cfile
+echo ". /apps/other/lmod/lmod/init/sh"                     >> $cfile
 echo "module purge"                                        >> $cfile
 echo "module use $modulefiles"                      >> $cfile
 echo "module load gsi_hercules" >> $cfile