diff --git a/modulefiles/cheyenne.gnu/fv3 b/modulefiles/ufs_cheyenne.gnu
similarity index 61%
rename from modulefiles/cheyenne.gnu/fv3
rename to modulefiles/ufs_cheyenne.gnu
index 0b352c162e..1421aaae77 100644
--- a/modulefiles/cheyenne.gnu/fv3
+++ b/modulefiles/ufs_cheyenne.gnu
@@ -24,22 +24,4 @@ module load hpc/1.1.0
 module load hpc-gnu/9.1.0
 module load hpc-mpt/2.22
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common
diff --git a/modulefiles/cheyenne.gnu/fv3_debug b/modulefiles/ufs_cheyenne.gnu_debug
similarity index 60%
rename from modulefiles/cheyenne.gnu/fv3_debug
rename to modulefiles/ufs_cheyenne.gnu_debug
index c4a2bb4cfe..a9da2d8c46 100644
--- a/modulefiles/cheyenne.gnu/fv3_debug
+++ b/modulefiles/ufs_cheyenne.gnu_debug
@@ -24,22 +24,4 @@ module load hpc/1.1.0
 module load hpc-gnu/9.1.0
 module load hpc-mpt/2.22
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47-debug
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common_debug
diff --git a/modulefiles/cheyenne.intel/fv3 b/modulefiles/ufs_cheyenne.intel
similarity index 61%
rename from modulefiles/cheyenne.intel/fv3
rename to modulefiles/ufs_cheyenne.intel
index b17446fdd1..208915684c 100644
--- a/modulefiles/cheyenne.intel/fv3
+++ b/modulefiles/ufs_cheyenne.intel
@@ -24,22 +24,4 @@ module load hpc/1.1.0
 module load hpc-intel/19.1.1
 module load hpc-mpt/2.22
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common
diff --git a/modulefiles/cheyenne.intel/fv3_debug b/modulefiles/ufs_cheyenne.intel_debug
similarity index 61%
rename from modulefiles/cheyenne.intel/fv3_debug
rename to modulefiles/ufs_cheyenne.intel_debug
index 79ed0b1e81..d866492d22 100644
--- a/modulefiles/cheyenne.intel/fv3_debug
+++ b/modulefiles/ufs_cheyenne.intel_debug
@@ -24,22 +24,4 @@ module load hpc/1.1.0
 module load hpc-intel/19.1.1
 module load hpc-mpt/2.22
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47-debug
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common_debug
diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
new file mode 100644
index 0000000000..c4f5707fbc
--- /dev/null
+++ b/modulefiles/ufs_common
@@ -0,0 +1,21 @@
+#%Module
+
+module load jasper/2.0.22
+module load zlib/1.2.11
+module load png/1.6.35
+
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load pio/2.5.1
+module load esmf/8_1_0_beta_snapshot_47
+
+module load bacio/2.4.1
+module load crtm/2.3.0
+module load g2/3.4.1
+module load g2tmpl/1.9.1
+module load ip/3.3.3
+module load nemsio/2.5.2
+module load sp/2.3.3
+module load w3emc/2.7.3
+module load w3nco/2.4.1
+module load upp/10.0.5
diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
new file mode 100644
index 0000000000..865379e77a
--- /dev/null
+++ b/modulefiles/ufs_common_debug
@@ -0,0 +1,21 @@
+#%Module
+
+module load jasper/2.0.22
+module load zlib/1.2.11
+module load png/1.6.35
+
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load pio/2.5.1
+module load esmf/8_1_0_beta_snapshot_47-debug
+
+module load bacio/2.4.1
+module load crtm/2.3.0
+module load g2/3.4.1
+module load g2tmpl/1.9.1
+module load ip/3.3.3
+module load nemsio/2.5.2
+module load sp/2.3.3
+module load w3emc/2.7.3
+module load w3nco/2.4.1
+module load upp/10.0.5
diff --git a/modulefiles/gaea.intel/fv3 b/modulefiles/ufs_gaea.intel
similarity index 63%
rename from modulefiles/gaea.intel/fv3
rename to modulefiles/ufs_gaea.intel
index 93d74d916d..48eeacc3a3 100644
--- a/modulefiles/gaea.intel/fv3
+++ b/modulefiles/ufs_gaea.intel
@@ -13,6 +13,8 @@ module rm netcdf
 module load intel/18.0.6.288
 module load cray-mpich/7.7.11
 module load cray-python/3.7.3.2
+# Needed at runtime:
+module load alps
 
 module load cmake/3.17.0
 setenv CMAKE_C_COMPILER cc
@@ -26,25 +28,4 @@ module load hpc/1.1.0
 module load hpc-intel/18.0.6.288
 module load hpc-cray-mpich/7.7.11
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
-
-# Needed at runtime:
-module load alps
+module load ufs_common
diff --git a/modulefiles/gaea.intel/fv3_debug b/modulefiles/ufs_gaea.intel_debug
similarity index 63%
rename from modulefiles/gaea.intel/fv3_debug
rename to modulefiles/ufs_gaea.intel_debug
index 521a230cb1..118356f6b5 100644
--- a/modulefiles/gaea.intel/fv3_debug
+++ b/modulefiles/ufs_gaea.intel_debug
@@ -13,6 +13,8 @@ module rm netcdf
 module load intel/18.0.6.288
 module load cray-mpich/7.7.11
 module load cray-python/3.7.3.2
+# Needed at runtime:
+module load alps
 
 module load cmake/3.17.0
 setenv CMAKE_C_COMPILER cc
@@ -26,25 +28,4 @@ module load hpc/1.1.0
 module load hpc-intel/18.0.6.288
 module load hpc-cray-mpich/7.7.11
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47-debug
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
-
-# Needed at runtime:
-module load alps
+module load ufs_common_debug
diff --git a/modulefiles/hera.gnu/fv3 b/modulefiles/ufs_hera.gnu
similarity index 55%
rename from modulefiles/hera.gnu/fv3
rename to modulefiles/ufs_hera.gnu
index 5d97431b89..041b5d3d14 100644
--- a/modulefiles/hera.gnu/fv3
+++ b/modulefiles/ufs_hera.gnu
@@ -19,24 +19,5 @@ module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
 module load hpc/1.1.0
 module load hpc-gnu/9.2.0
 module load hpc-mpich/3.3.2
-module load mpich/3.3.2
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common
diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/ufs_hera.intel
similarity index 58%
rename from modulefiles/hera.intel/fv3
rename to modulefiles/ufs_hera.intel
index c9f5e76e7f..fc128bbf60 100644
--- a/modulefiles/hera.intel/fv3
+++ b/modulefiles/ufs_hera.intel
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.0.4
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common
diff --git a/modulefiles/hera.intel/fv3_debug b/modulefiles/ufs_hera.intel_debug
similarity index 57%
rename from modulefiles/hera.intel/fv3_debug
rename to modulefiles/ufs_hera.intel_debug
index 8ee2ef433c..c0490949c1 100644
--- a/modulefiles/hera.intel/fv3_debug
+++ b/modulefiles/ufs_hera.intel_debug
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.0.4
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47-debug
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common_debug
diff --git a/modulefiles/jet.intel/fv3 b/modulefiles/ufs_jet.intel
similarity index 57%
rename from modulefiles/jet.intel/fv3
rename to modulefiles/ufs_jet.intel
index 99f0375ffd..4c0d64bcf2 100644
--- a/modulefiles/jet.intel/fv3
+++ b/modulefiles/ufs_jet.intel
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.4.274
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common
diff --git a/modulefiles/jet.intel/fv3_debug b/modulefiles/ufs_jet.intel_debug
similarity index 57%
rename from modulefiles/jet.intel/fv3_debug
rename to modulefiles/ufs_jet.intel_debug
index 37dbf0c72c..720705fcdf 100644
--- a/modulefiles/jet.intel/fv3_debug
+++ b/modulefiles/ufs_jet.intel_debug
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.4.274
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47-debug
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common_debug
diff --git a/modulefiles/linux.gnu/fv3 b/modulefiles/ufs_linux.gnu
old mode 100755
new mode 100644
similarity index 100%
rename from modulefiles/linux.gnu/fv3
rename to modulefiles/ufs_linux.gnu
diff --git a/modulefiles/linux.gnu/fv3_debug b/modulefiles/ufs_linux.gnu_debug
old mode 100755
new mode 100644
similarity index 100%
rename from modulefiles/linux.gnu/fv3_debug
rename to modulefiles/ufs_linux.gnu_debug
diff --git a/modulefiles/macosx.gnu/fv3 b/modulefiles/ufs_macosx.gnu
old mode 100755
new mode 100644
similarity index 100%
rename from modulefiles/macosx.gnu/fv3
rename to modulefiles/ufs_macosx.gnu
diff --git a/modulefiles/macosx.gnu/fv3_debug b/modulefiles/ufs_macosx.gnu_debug
old mode 100755
new mode 100644
similarity index 100%
rename from modulefiles/macosx.gnu/fv3_debug
rename to modulefiles/ufs_macosx.gnu_debug
diff --git a/modulefiles/odin/fv3 b/modulefiles/ufs_odin
similarity index 100%
rename from modulefiles/odin/fv3
rename to modulefiles/ufs_odin
diff --git a/modulefiles/orion.intel/fv3 b/modulefiles/ufs_orion.intel
similarity index 57%
rename from modulefiles/orion.intel/fv3
rename to modulefiles/ufs_orion.intel
index e0a3c63993..3cb832fcf3 100644
--- a/modulefiles/orion.intel/fv3
+++ b/modulefiles/ufs_orion.intel
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/2018.4
 module load hpc-impi/2018.4
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common
diff --git a/modulefiles/orion.intel/fv3_debug b/modulefiles/ufs_orion.intel_debug
similarity index 56%
rename from modulefiles/orion.intel/fv3_debug
rename to modulefiles/ufs_orion.intel_debug
index b7788646b1..54cf102816 100644
--- a/modulefiles/orion.intel/fv3_debug
+++ b/modulefiles/ufs_orion.intel_debug
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/2018.4
 module load hpc-impi/2018.4
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47-debug
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common_debug
diff --git a/modulefiles/s4.intel/fv3 b/modulefiles/ufs_s4.intel
similarity index 100%
rename from modulefiles/s4.intel/fv3
rename to modulefiles/ufs_s4.intel
diff --git a/modulefiles/stampede.intel/fv3 b/modulefiles/ufs_stampede.intel
similarity index 100%
rename from modulefiles/stampede.intel/fv3
rename to modulefiles/ufs_stampede.intel
diff --git a/modulefiles/wcoss2/fv3_debug b/modulefiles/ufs_wcoss2
similarity index 58%
rename from modulefiles/wcoss2/fv3_debug
rename to modulefiles/ufs_wcoss2
index fbb682affc..5e093f573a 100644
--- a/modulefiles/wcoss2/fv3_debug
+++ b/modulefiles/ufs_wcoss2
@@ -21,22 +21,4 @@ module load hpc/1.0.0-beta1
 module load hpc-intel/19.1.1.217
 module load hpc-cray-mpich/8.0.15
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.0
+module load ufs_common
diff --git a/modulefiles/wcoss2/fv3 b/modulefiles/ufs_wcoss2_debug
similarity index 58%
rename from modulefiles/wcoss2/fv3
rename to modulefiles/ufs_wcoss2_debug
index fbb682affc..8b93843466 100644
--- a/modulefiles/wcoss2/fv3
+++ b/modulefiles/ufs_wcoss2_debug
@@ -21,22 +21,4 @@ module load hpc/1.0.0-beta1
 module load hpc-intel/19.1.1.217
 module load hpc-cray-mpich/8.0.15
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.0
+module load ufs_common_debug
diff --git a/modulefiles/wcoss_cray/fv3 b/modulefiles/ufs_wcoss_cray
similarity index 100%
rename from modulefiles/wcoss_cray/fv3
rename to modulefiles/ufs_wcoss_cray
diff --git a/modulefiles/wcoss_cray/fv3_debug b/modulefiles/ufs_wcoss_cray_debug
similarity index 100%
rename from modulefiles/wcoss_cray/fv3_debug
rename to modulefiles/ufs_wcoss_cray_debug
diff --git a/modulefiles/wcoss_dell_p3/fv3 b/modulefiles/ufs_wcoss_dell_p3
similarity index 60%
rename from modulefiles/wcoss_dell_p3/fv3
rename to modulefiles/ufs_wcoss_dell_p3
index 99ee869b6c..e9059a1b89 100644
--- a/modulefiles/wcoss_dell_p3/fv3
+++ b/modulefiles/ufs_wcoss_dell_p3
@@ -23,22 +23,4 @@ module load hpc/1.1.0
 module load hpc-ips/18.0.1.163
 module load hpc-impi/18.0.1
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common
diff --git a/modulefiles/wcoss_dell_p3/fv3_debug b/modulefiles/ufs_wcoss_dell_p3_debug
similarity index 59%
rename from modulefiles/wcoss_dell_p3/fv3_debug
rename to modulefiles/ufs_wcoss_dell_p3_debug
index defb188486..d6e9beed68 100644
--- a/modulefiles/wcoss_dell_p3/fv3_debug
+++ b/modulefiles/ufs_wcoss_dell_p3_debug
@@ -23,22 +23,4 @@ module load hpc/1.1.0
 module load hpc-ips/18.0.1.163
 module load hpc-impi/18.0.1
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47-debug
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.4
+module load ufs_common_debug
diff --git a/tests/compile.sh b/tests/compile.sh
index ff76688daa..cbb6ea60ab 100755
--- a/tests/compile.sh
+++ b/tests/compile.sh
@@ -56,7 +56,7 @@ hostname
 
 set +x
 if [[ $MACHINE_ID == macosx.* ]] || [[ $MACHINE_ID == linux.* ]]; then
-  source $PATHTR/modulefiles/${MACHINE_ID}/fv3
+  source $PATHTR/modulefiles/ufs_${MACHINE_ID}
 else
   if [[ $MACHINE_ID == wcoss2 ]]; then
     source /apps/prod/lmodules/startLmod
@@ -66,10 +66,10 @@ else
     source /lustre/f2/pdata/esrl/gsd/contrib/lua-5.1.4.9/init/init_lmod.sh
   fi
   # Load fv3 module
-  module use $PATHTR/modulefiles/${MACHINE_ID}
-  modulefile="fv3"
+  module use $PATHTR/modulefiles
+  modulefile="ufs_${MACHINE_ID}"
   if [[ "${MAKE_OPT}" == *"DEBUG=Y"* ]]; then
-    [[ -f $PATHTR/modulefiles/${MACHINE_ID}/fv3_debug ]] && modulefile="fv3_debug"
+    [[ -f $PATHTR/modulefiles/ufs_${MACHINE_ID}_debug ]] && modulefile="ufs_${MACHINE_ID}_debug"
   fi
   module load $modulefile
   module list
@@ -175,9 +175,9 @@ bash -x ${PATHTR}/build.sh
 
 mv ${BUILD_DIR}/ufs_model ${PATHTR}/tests/${BUILD_NAME}.exe
 if [[ "${MAKE_OPT}" == "DEBUG=Y" ]]; then
-  cp ${PATHTR}/modulefiles/${MACHINE_ID}/fv3_debug ${PATHTR}/tests/modules.${BUILD_NAME}
+  cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}_debug ${PATHTR}/tests/modules.${BUILD_NAME}
 else
-  cp ${PATHTR}/modulefiles/${MACHINE_ID}/fv3 ${PATHTR}/tests/modules.${BUILD_NAME}
+  cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}       ${PATHTR}/tests/modules.${BUILD_NAME}
 fi
 
 if [ $clean_after = YES ] ; then
diff --git a/tests/run_test.sh b/tests/run_test.sh
index 0d6010de23..81b4dbd337 100755
--- a/tests/run_test.sh
+++ b/tests/run_test.sh
@@ -78,6 +78,7 @@ cp ${PATHRT}/fv3_${COMPILE_NR}.exe                 fv3.exe
 
 # modulefile for FV3 prerequisites:
 cp ${PATHRT}/modules.fv3_${COMPILE_NR}             modules.fv3
+cp ${PATHTR}/modulefiles/ufs_common*               .
 
 # Get the shell file that loads the "module" command and purges modules:
 cp ${PATHRT}/../NEMS/src/conf/module-setup.sh.inc  module-setup.sh
diff --git a/tests/utest b/tests/utest
index 28a2a9b8d5..158773aa3f 100755
--- a/tests/utest
+++ b/tests/utest
@@ -428,16 +428,13 @@ fi
 # utility functions in rt_utils need to be able to see variables in utest
 source rt_utils.sh
 
+source $PATHTR/NEMS/src/conf/module-setup.sh.inc
 # Machine-dependent libraries, modules, variables, etc.
 if [[ $MACHINE_ID = hera.* ]]; then
 
-  source $PATHTR/NEMS/src/conf/module-setup.sh.inc
-  module use $PATHTR/modulefiles/${MACHINE_ID}
-  module load fv3
-
-  export PATH=/scratch2/NCEPDEV/fv3-cam/Dusan.Jovic/ecflow/bin:$PATH
-  export PYTHONPATH=/scratch2/NCEPDEV/fv3-cam/Dusan.Jovic/ecflow/lib/python2.7/site-packages
-  ECFLOW_START=/scratch2/NCEPDEV/fv3-cam/Dusan.Jovic/ecflow/bin/ecflow_start.sh
+  export PATH=/scratch1/NCEPDEV/nems/emc.nemspara/soft/miniconda3/bin:$PATH
+  export PYTHONPATH=/scratch1/NCEPDEV/nems/emc.nemspara/soft/miniconda3/lib/python3.8/site-packages
+  ECFLOW_START=/scratch1/NCEPDEV/nems/emc.nemspara/soft/miniconda3/bin/ecflow_start.sh
   ECF_PORT=$(( $(id -u) + 1500 ))
 
   PARTITION=
@@ -453,15 +450,11 @@ if [[ $MACHINE_ID = hera.* ]]; then
 
 elif [[ $MACHINE_ID = orion.* ]]; then
 
-  source $PATHTR/NEMS/src/conf/module-setup.sh.inc
-
-  module use $PATHTR/modulefiles/${MACHINE_ID}
-  module load fv3
   module load gcc/8.3.0
 
-  export PATH=/work/noaa/fv3-cam/djovic/ecflow/bin:$PATH
-  export PYTHONPATH=/work/noaa/fv3-cam/djovic/ecflow/lib/python2.7/site-packages
-  ECFLOW_START=/work/noaa/fv3-cam/djovic/ecflow/bin/ecflow_start.sh
+  export PATH=/work/noaa/nems/emc.nemspara/soft/miniconda3/bin:$PATH
+  export PYTHONPATH=/work/noaa/nems/emc.nemspara/soft/miniconda3/lib/python3.8/site-packages
+  ECFLOW_START=/work/noaa/nems/emc.nemspara/soft/miniconda3/bin/ecflow_start.sh
   ECF_PORT=$(( $(id -u) + 1500 ))
   QUEUE=batch
   COMPILE_QUEUE=batch
@@ -477,17 +470,12 @@ elif [[ $MACHINE_ID = orion.* ]]; then
 
 elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then
 
-  source $PATHTR/NEMS/src/conf/module-setup.sh.inc
   module load lsf/10.1
-
-  module use $PATHTR/modulefiles/${MACHINE_ID}
-  module load fv3
-
-  module load python/2.7.14
+  module load python/3.6.3
 
   module load ips/18.0.1.163
-  module load ecflow/4.7.1
-  ECFLOW_START=${ECF_ROOT}/intel/bin/ecflow_start.sh
+  module load ecflow/4.17.0
+  ECFLOW_START=${ECF_ROOT}/bin/ecflow_start.sh
   ECF_PORT=$(grep $USER /usrx/local/sys/ecflow/assigned_ports.txt | awk '{print $2}')
 
   DISKNM=/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT