diff --git a/scripts/exgdas_atmos_chgres_forenkf.sh b/scripts/exgdas_atmos_chgres_forenkf.sh
index afc7cc9f5e..db628915df 100755
--- a/scripts/exgdas_atmos_chgres_forenkf.sh
+++ b/scripts/exgdas_atmos_chgres_forenkf.sh
@@ -21,7 +21,7 @@ source "$HOMEgfs/ush/preamble.sh"
 
 #  Directories.
 pwd=$(pwd)
-export FIXgsm=${FIXgsm:-$HOMEgfs/fix/fix_am}
+export FIXgsm=${FIXgsm:-$HOMEgfs/fix/am}
 
 # Base variables
 CDATE=${CDATE:-"2001010100"}
diff --git a/scripts/exgdas_enkf_ecen.sh b/scripts/exgdas_enkf_ecen.sh
index 91e7483be9..c964e1dc7e 100755
--- a/scripts/exgdas_enkf_ecen.sh
+++ b/scripts/exgdas_enkf_ecen.sh
@@ -75,8 +75,8 @@ CYCLESH=${CYCLESH:-$HOMEgfs/ush/global_cycle.sh}
 export CYCLEXEC=${CYCLEXEC:-$HOMEgfs/exec/global_cycle}
 APRUN_CYCLE=${APRUN_CYCLE:-${APRUN:-""}}
 NTHREADS_CYCLE=${NTHREADS_CYCLE:-${NTHREADS:-1}}
-export FIXfv3=${FIXfv3:-$HOMEgfs/fix/fix_fv3_gmted2010}
-export FIXgsm=${FIXgsm:-$HOMEgfs/fix/fix_am}
+export FIXfv3=${FIXfv3:-$HOMEgfs/fix/orog}
+export FIXgsm=${FIXgsm:-$HOMEgfs/fix/am}
 export CYCLVARS=${CYCLVARS:-"FSNOL=-2.,FSNOS=99999.,"}
 export FHOUR=${FHOUR:-0}
 export DELTSFC=${DELTSFC:-6}
diff --git a/scripts/exgdas_enkf_fcst.sh b/scripts/exgdas_enkf_fcst.sh
index cd79681887..7fa9d3df4a 100755
--- a/scripts/exgdas_enkf_fcst.sh
+++ b/scripts/exgdas_enkf_fcst.sh
@@ -23,7 +23,7 @@ source "$HOMEgfs/ush/preamble.sh"
 # Directories.
 pwd=$(pwd)
 export FIX_DIR=${FIX_DIR:-$HOMEgfs/fix}
-export FIX_AM=${FIX_AM:-$FIX_DIR/fix_am}
+export FIX_AM=${FIX_AM:-$FIX_DIR/am}
 
 # Utilities
 export NCP=${NCP:-"/bin/cp -p"}
diff --git a/scripts/exgdas_enkf_sfc.sh b/scripts/exgdas_enkf_sfc.sh
index 4589a59356..044030c494 100755
--- a/scripts/exgdas_enkf_sfc.sh
+++ b/scripts/exgdas_enkf_sfc.sh
@@ -57,8 +57,8 @@ CYCLESH=${CYCLESH:-$HOMEgfs/ush/global_cycle.sh}
 export CYCLEXEC=${CYCLEXEC:-$HOMEgfs/exec/global_cycle}
 APRUN_CYCLE=${APRUN_CYCLE:-${APRUN:-""}}
 NTHREADS_CYCLE=${NTHREADS_CYCLE:-${NTHREADS:-1}}
-export FIXfv3=${FIXfv3:-$HOMEgfs/fix/fix_fv3_gmted2010}
-export FIXgsm=${FIXgsm:-$HOMEgfs/fix/fix_am}
+export FIXfv3=${FIXfv3:-$HOMEgfs/fix/orog}
+export FIXgsm=${FIXgsm:-$HOMEgfs/fix/am}
 export CYCLVARS=${CYCLVARS:-"FSNOL=-2.,FSNOS=99999.,"}
 export FHOUR=${FHOUR:-0}
 export DELTSFC=${DELTSFC:-6}
diff --git a/scripts/exglobal_atmos_analysis_calc.sh b/scripts/exglobal_atmos_analysis_calc.sh
index 2fa44c16b4..78ab3eb78f 100755
--- a/scripts/exglobal_atmos_analysis_calc.sh
+++ b/scripts/exglobal_atmos_analysis_calc.sh
@@ -23,7 +23,7 @@ source "$HOMEgfs/ush/preamble.sh"
 
 #  Directories.
 pwd=$(pwd)
-export FIXgsm=${FIXgsm:-$HOMEgfs/fix/fix_am}
+export FIXgsm=${FIXgsm:-$HOMEgfs/fix/am}
 
 # Base variables
 CDATE=${CDATE:-"2001010100"}
diff --git a/scripts/exglobal_atmos_sfcanl.sh b/scripts/exglobal_atmos_sfcanl.sh
index 899e0ae84a..34eb863614 100755
--- a/scripts/exglobal_atmos_sfcanl.sh
+++ b/scripts/exglobal_atmos_sfcanl.sh
@@ -61,8 +61,8 @@ export SNOW_NUDGE_COEFF=${SNOW_NUDGE_COEFF:-'-2.'}
 export CYCLVARS=${CYCLVARS:-""}
 export FHOUR=${FHOUR:-0}
 export DELTSFC=${DELTSFC:-6}
-export FIXgsm=${FIXgsm:-$HOMEgfs/fix/fix_am}
-export FIXfv3=${FIXfv3:-$HOMEgfs/fix/fix_fv3_gmted2010}
+export FIXgsm=${FIXgsm:-$HOMEgfs/fix/am}
+export FIXfv3=${FIXfv3:-$HOMEgfs/fix/orog}
 
 # FV3 specific info (required for global_cycle)
 export CASE=${CASE:-"C384"}
diff --git a/scripts/run_reg2grb2.sh b/scripts/run_reg2grb2.sh
index bcdcb1d0be..668368056e 100755
--- a/scripts/run_reg2grb2.sh
+++ b/scripts/run_reg2grb2.sh
@@ -5,7 +5,7 @@ source "$HOMEgfs/ush/preamble.sh"
 #requires grib_util module 
 
 MOM6REGRID=${MOM6REGRID:-$HOMEgfs}
-export mask_file=$MOM6REGRID/fix/fix_reg2grb2/mask.0p25x0p25.grb2
+export mask_file=$MOM6REGRID/fix/reg2grb2/mask.0p25x0p25.grb2
 
 # offline testing:
 #export DATA=
diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh
index eeae89c11b..1e0e1631e7 100755
--- a/ush/forecast_postdet.sh
+++ b/ush/forecast_postdet.sh
@@ -179,7 +179,7 @@ EOF
 
   # Fractional grid related
   if [ $FRAC_GRID = ".true." ]; then
-    OROFIX=${OROFIX:-"${FIX_DIR}/fix_fv3_fracoro/${CASE}.mx${OCNRES}_frac"}
+    OROFIX=${OROFIX:-"${FIX_DIR}/orog/${CASE}.mx${OCNRES}_frac"}
     FIX_SFC=${FIX_SFC:-"${OROFIX}/fix_sfc"}
     for n in $(seq 1 $ntiles); do
       $NLN ${OROFIX}/oro_${CASE}.mx${OCNRES}.tile${n}.nc $DATA/INPUT/oro_data.tile${n}.nc
@@ -240,7 +240,7 @@ EOF
   fi
 
   # Files for GWD
-  OROFIX_ugwd=${OROFIX_ugwd:-"${FIX_DIR}/fix_ugwd"}
+  OROFIX_ugwd=${OROFIX_ugwd:-"${FIX_DIR}/ugwd"}
   $NLN ${OROFIX_ugwd}/ugwp_limb_tau.nc $DATA/ugwp_limb_tau.nc
   for n in $(seq 1 $ntiles); do
     $NLN ${OROFIX_ugwd}/$CASE/${CASE}_oro_data_ls.tile${n}.nc $DATA/INPUT/oro_data_ls.tile${n}.nc
@@ -278,12 +278,12 @@ EOF
 
   ## merra2 aerosol climo
   if [ $IAER -eq "1011" ]; then
-    FIX_AER="${FIX_DIR}/fix_aer"
+    FIX_AER="${FIX_DIR}/aer"
     for month in $(seq 1 12); do
       MM=$(printf %02d $month)
       $NLN "${FIX_AER}/merra2.aerclim.2003-2014.m${MM}.nc" "aeroclim.m${MM}.nc"
     done
-    FIX_LUT="${FIX_DIR}/fix_lut"
+    FIX_LUT="${FIX_DIR}/lut"
     $NLN $FIX_LUT/optics_BC.v1_3.dat $DATA/optics_BC.dat
     $NLN $FIX_LUT/optics_OC.v1_3.dat $DATA/optics_OC.dat
     $NLN $FIX_LUT/optics_DU.v15_3.dat $DATA/optics_DU.dat
@@ -784,7 +784,7 @@ MOM6_postdet() {
   $NCP -pf $FIXmom/$OCNRES/* $DATA/INPUT/
 
   # Copy coupled grid_spec
-  spec_file="$FIX_DIR/fix_cpl/a${CASE}o${OCNRES}/grid_spec.nc"
+  spec_file="$FIX_DIR/cpl/a${CASE}o${OCNRES}/grid_spec.nc"
   if [ -s $spec_file ]; then
     $NCP -pf $spec_file $DATA/INPUT/
   else
diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh
index 4af2df8b82..28e612e9e9 100755
--- a/ush/forecast_predet.sh
+++ b/ush/forecast_predet.sh
@@ -73,10 +73,10 @@ FV3_GFS_predet(){
   pwd=$(pwd)
   HOMEgfs=${HOMEgfs:-${PACKAGEROOT:-$pwd}}
   FIX_DIR=${FIX_DIR:-$HOMEgfs/fix}
-  FIX_AM=${FIX_AM:-$FIX_DIR/fix_am}
-  FIX_AER=${FIX_AER:-$FIX_DIR/fix_aer}
-  FIX_LUT=${FIX_LUT:-$FIX_DIR/fix_lut}
-  FIXfv3=${FIXfv3:-$FIX_DIR/fix_fv3_gmted2010}
+  FIX_AM=${FIX_AM:-$FIX_DIR/am}
+  FIX_AER=${FIX_AER:-$FIX_DIR/aer}
+  FIX_LUT=${FIX_LUT:-$FIX_DIR/lut}
+  FIXfv3=${FIXfv3:-$FIX_DIR/orog}
   DATA=${DATA:-$pwd/fv3tmp$$}    # temporary running directory
   ROTDIR=${ROTDIR:-$pwd}         # rotating archive directory
   ICSDIR=${ICSDIR:-$pwd}         # cold start initial conditions
diff --git a/ush/fv3gfs_regrid_nemsio.sh b/ush/fv3gfs_regrid_nemsio.sh
index 6a98112578..84b2efa16b 100755
--- a/ush/fv3gfs_regrid_nemsio.sh
+++ b/ush/fv3gfs_regrid_nemsio.sh
@@ -27,8 +27,8 @@ pwd=$(pwd)
 DATA=${DATA:-$pwd}
 HOMEgfs=${HOMEgfs:-$PACKAGEROOT}
 FIX_DIR=${FIX_DIR:-$HOMEgfs/fix}
-FIX_AM=${FIX_AM:-$FIX_DIR/fix_am}
-FIXfv3=${FIXfv3:-$FIX_DIR/fix_fv3_gmted2010}
+FIX_AM=${FIX_AM:-$FIX_DIR/am}
+FIXfv3=${FIXfv3:-$FIX_DIR/orog}
 REGRID_NEMSIO_EXEC=${REGRID_NEMSIO_EXEC:-$HOMEgfs/exec/regrid_nemsio}
 REGRID_NEMSIO_TBL=${REGRID_NEMSIO_TBL:-$HOMEgfs/parm/parm_fv3diag/variable_table.txt}
 
diff --git a/ush/fv3gfs_remap.sh b/ush/fv3gfs_remap.sh
index 619858ea5d..430e96c868 100755
--- a/ush/fv3gfs_remap.sh
+++ b/ush/fv3gfs_remap.sh
@@ -15,7 +15,7 @@ pwd=$(pwd)
 export DATA=${DATA:-$pwd}
 export HOMEgfs=${HOMEgfs:-$PACKAGEROOT}
 export FIX_DIR=${FIX_DIR:-$HOMEgfs/fix}
-export FIXfv3=${FIXfv3:-$FIX_DIR/fix_fv3_gmted2010}
+export FIXfv3=${FIXfv3:-$FIX_DIR/orog}
 export REMAPEXE=${REMAPEXE:-$HOMEgfs/exec/fregrid_parallel}
 export IPD4=${IPD4:-"YES"}
 
diff --git a/ush/gaussian_sfcanl.sh b/ush/gaussian_sfcanl.sh
index 68c91b44a1..69d2db4e5e 100755
--- a/ush/gaussian_sfcanl.sh
+++ b/ush/gaussian_sfcanl.sh
@@ -28,9 +28,9 @@
 #     HOMEgfs       Directory for gfs version.  Default is
 #                   $BASEDIR/gfs_ver.v15.0.0}
 #     FIXam         Directory for the global fixed climatology files.
-#                   Defaults to $HOMEgfs/fix/fix_am
+#                   Defaults to $HOMEgfs/fix/am
 #     FIXfv3        Directory for the model grid and orography netcdf
-#                   files.  Defaults to $HOMEgfs/fix/fix_fv3_gmted2010
+#                   files.  Defaults to $HOMEgfs/fix/orog
 #     FIXWGTS       Weight file to use for interpolation
 #     EXECgfs       Directory of the program executable.  Defaults to
 #                   $HOMEgfs/exec
@@ -133,8 +133,8 @@ gfs_ver=${gfs_ver:-v16.3.0}
 BASEDIR=${BASEDIR:-${PACKAGEROOT:-/lfs/h1/ops/prod/packages}}
 HOMEgfs=${HOMEgfs:-$BASEDIR/gfs.${gfs_ver}}
 EXECgfs=${EXECgfs:-$HOMEgfs/exec}
-FIXfv3=${FIXfv3:-$HOMEgfs/fix/fix_fv3_gmted2010}
-FIXam=${FIXam:-$HOMEgfs/fix/fix_am}
+FIXfv3=${FIXfv3:-$HOMEgfs/fix/orog}
+FIXam=${FIXam:-$HOMEgfs/fix/am}
 FIXWGTS=${FIXWGTS:-$FIXfv3/$CASE/fv3_SCRIP_${CASE}_GRIDSPEC_lon${LONB_SFC}_lat${LATB_SFC}.gaussian.neareststod.nc}
 DATA=${DATA:-$(pwd)}
 COMOUT=${COMOUT:-$(pwd)}
diff --git a/ush/gfs_truncate_enkf.sh b/ush/gfs_truncate_enkf.sh
index c7bdfad0c4..0a7d6fc0dd 100755
--- a/ush/gfs_truncate_enkf.sh
+++ b/ush/gfs_truncate_enkf.sh
@@ -14,7 +14,7 @@ mkdir -p $DATATMP
 cd $DATATMP
 
 export LEVS=${LEVS_LORES:-64}
-export FIXam=${FIXam:-$HOMEgfs/fix/fix_am}
+export FIXam=${FIXam:-$HOMEgfs/fix/am}
 
 export CHGRESSH=${CHGRESSH:-${USHgfs}/global_chgres.sh}
 export CHGRESEXEC=${CHGRESEXEC-${EXECgfs}/global_chgres}
diff --git a/ush/global_nceppost.sh b/ush/global_nceppost.sh
index 2c0711c57f..89b5ac596f 100755
--- a/ush/global_nceppost.sh
+++ b/ush/global_nceppost.sh
@@ -294,8 +294,8 @@ elif [ ${OUTTYP} -eq 4 ] ; then
 
 	export MODEL_OUT_FORM=${MODEL_OUT_FORM:-binarynemsiompiio}
 	export GFSOUT=${NEMSINP}
-	ln -sf $FIXglobal/fix_am/global_lonsperlat.t${JCAP}.${LONB}.${LATB}.txt  ./lonsperlat.dat 
-	ln -sf $FIXglobal/fix_am/global_hyblev.l${LEVS}.txt                      ./global_hyblev.txt
+	ln -sf $FIXglobal/am/global_lonsperlat.t${JCAP}.${LONB}.${LATB}.txt  ./lonsperlat.dat 
+	ln -sf $FIXglobal/am/global_hyblev.l${LEVS}.txt                      ./global_hyblev.txt
 fi
 
 # allow threads to use threading in Jim's sp lib
diff --git a/ush/syndat_qctropcy.sh b/ush/syndat_qctropcy.sh
index 402db48cd1..26d31573d1 100755
--- a/ush/syndat_qctropcy.sh
+++ b/ush/syndat_qctropcy.sh
@@ -76,7 +76,7 @@ HOMENHCp1=${HOMENHCp1:-/gpfs/?p1/nhc/save/guidance/storm-data/ncep}
 HOMENHC=${HOMENHC:-/gpfs/dell2/nhc/save/guidance/storm-data/ncep}
 TANK_TROPCY=${TANK_TROPCY:-${DCOMROOT}/us007003}
 
-FIXSYND=${FIXSYND:-$HOMEgfs/fix/fix_am}
+FIXSYND=${FIXSYND:-$HOMEgfs/fix/am}
 USHSYND=${USHSYND:-$HOMEgfs/ush}
 EXECSYND=${EXECSYND:-$HOMEgfs/exec}
 PARMSYND=${PARMSYND:-$HOMEgfs/parm/relo}