diff --git a/parm/product/gfs.anl.paramlist.a.txt b/parm/product/gfs.anl.paramlist.a.txt
index dd340636d6..3c7ba28bb9 100644
--- a/parm/product/gfs.anl.paramlist.a.txt
+++ b/parm/product/gfs.anl.paramlist.a.txt
@@ -152,7 +152,6 @@ HLCY:3000-0 m above ground
 ICAHT:max wind
 ICAHT:tropopause
 ICETK:surface
-ICETMP:surface
 ICMR:50 mb
 ICMR:1000 mb
 ICMR:100 mb
diff --git a/parm/product/gfs.f000.paramlist.a.txt b/parm/product/gfs.f000.paramlist.a.txt
index b1dcb09ccd..34d84ac3c1 100644
--- a/parm/product/gfs.f000.paramlist.a.txt
+++ b/parm/product/gfs.f000.paramlist.a.txt
@@ -166,7 +166,6 @@ ICAHT:max wind
 ICAHT:tropopause
 ICEC:surface
 ICETK:surface
-ICETMP:surface
 ICMR:50 mb
 ICMR:1000 mb
 ICMR:100 mb
@@ -697,4 +696,3 @@ WEASD:surface
 WILT:surface
 SNOD:surface
 VIS:surface
-ICEG:10 m above mean sea level
diff --git a/parm/product/gfs.fFFF.paramlist.a.txt b/parm/product/gfs.fFFF.paramlist.a.txt
index 350a715bac..cb2f82f02a 100644
--- a/parm/product/gfs.fFFF.paramlist.a.txt
+++ b/parm/product/gfs.fFFF.paramlist.a.txt
@@ -45,7 +45,6 @@ ACPCP:surface
 ALBDO:surface
 APCP:surface
 APTMP:2 m above ground
-var discipline=0 master_table=2 parmcat=0 parm=21:2 m above ground
 AOTK:entire atmosphere
 CAPE:180-0 mb above ground
 CAPE:255-0 mb above ground
@@ -177,7 +176,6 @@ ICAHT:max wind
 ICAHT:tropopause
 ICEC:surface
 ICETK:surface
-ICETMP:surface
 ICSEV:100 mb
 ICSEV:150 mb
 ICSEV:200 mb
@@ -758,4 +756,3 @@ WEASD:surface
 WILT:surface
 SNOD:surface
 VIS:surface
-ICEG:10 m above mean sea level
diff --git a/scripts/exglobal_atmos_products.sh b/scripts/exglobal_atmos_products.sh
index 9067819380..5fee3b4631 100755
--- a/scripts/exglobal_atmos_products.sh
+++ b/scripts/exglobal_atmos_products.sh
@@ -42,7 +42,7 @@ fi
 # Section creating pressure grib2 interpolated products
 
 # Files needed by ${INTERP_ATMOS_MASTERSH}
-MASTER_FILE="${COM_ATMOS_MASTER}/${PREFIX}master.grb2${fhr3}"
+MASTER_FILE="${COM_ATMOS_MASTER}/${PREFIX}master${fhr3}.grb2"
 
 # Get inventory from ${MASTER_FILE} that matches patterns from ${paramlista}
 # Extract this inventory from ${MASTER_FILE} into a smaller tmpfile or tmpfileb based on paramlista or paramlistb
@@ -172,7 +172,7 @@ done  # for (( nset=1 ; nset <= downset ; nset++ ))
 #---------------------------------------------------------------
 
 # Create the index file for the sflux master, if it exists.
-FLUX_FILE="${COM_ATMOS_MASTER}/${PREFIX}sfluxgrb${fhr3}.grib2"
+FLUX_FILE="${COM_ATMOS_MASTER}/${PREFIX}sflux${fhr3}.grb2"
 if [[ -s "${FLUX_FILE}" ]]; then
   ${WGRIB2} -s "${FLUX_FILE}" > "${FLUX_FILE}.idx"
 fi
diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh
index 1535c68551..2e1a5effc3 100755
--- a/ush/forecast_postdet.sh
+++ b/ush/forecast_postdet.sh
@@ -479,8 +479,8 @@ EOF
       ${NLN} "${COM_ATMOS_HISTORY}/${RUN}.t${cyc}z.sfcf${FH3}.nc" "sfcf${FH3}.nc"
       ${NLN} "${COM_ATMOS_HISTORY}/${RUN}.t${cyc}z.atm.logf${FH3}.txt" "log.atm.f${FH3}"
       if [[ ${WRITE_DOPOST} = ".true." ]]; then
-        ${NLN} "${COM_ATMOS_MASTER}/${RUN}.t${cyc}z.master.grb2f${FH3}" "GFSPRS.GrbF${FH2}"
-        ${NLN} "${COM_ATMOS_MASTER}/${RUN}.t${cyc}z.sfluxgrbf${FH3}.grib2" "GFSFLX.GrbF${FH2}"
+        ${NLN} "${COM_ATMOS_MASTER}/${RUN}.t${cyc}z.masterf${FH3}.grb2" "GFSPRS.GrbF${FH2}"
+        ${NLN} "${COM_ATMOS_MASTER}/${RUN}.t${cyc}z.sfluxf${FH3}.grb2" "GFSFLX.GrbF${FH2}"
       fi
     done
   else  # TODO: Is this even valid anymore?
diff --git a/ush/hpssarch_gen.sh b/ush/hpssarch_gen.sh
index 0d40cb1a8f..c1d50cbb5c 100755
--- a/ush/hpssarch_gen.sh
+++ b/ush/hpssarch_gen.sh
@@ -168,8 +168,8 @@ if [[ ${type} = "gfs" ]]; then
     fhr=$(printf %03i "${fh}")
     if [[ ${ARCH_GAUSSIAN} = "YES" ]]; then
       {
-        echo "${COM_ATMOS_MASTER/${ROTDIR}\//}/${head}sfluxgrbf${fhr}.grib2"
-        echo "${COM_ATMOS_MASTER/${ROTDIR}\//}/${head}sfluxgrbf${fhr}.grib2.idx"
+        echo "${COM_ATMOS_MASTER/${ROTDIR}\//}/${head}sfluxf${fhr}.grb2"
+        echo "${COM_ATMOS_MASTER/${ROTDIR}\//}/${head}sfluxf${fhr}.grb2.idx"
       } >> "${DATA}/gfs_flux.txt"
 
       {
@@ -395,8 +395,8 @@ if [[ ${type} == "gdas" ]]; then
     fh=0
     while [[ ${fh} -le 9 ]]; do
       fhr=$(printf %03i "${fh}")
-      echo "${COM_ATMOS_MASTER/${ROTDIR}\//}/${head}sfluxgrbf${fhr}.grib2"
-      echo "${COM_ATMOS_MASTER/${ROTDIR}\//}/${head}sfluxgrbf${fhr}.grib2.idx"
+      echo "${COM_ATMOS_MASTER/${ROTDIR}\//}/${head}sfluxf${fhr}.grb2"
+      echo "${COM_ATMOS_MASTER/${ROTDIR}\//}/${head}sfluxf${fhr}.grb2.idx"
       echo "${COM_ATMOS_GRIB_0p25/${ROTDIR}\//}/${head}pgrb2.0p25.f${fhr}"
       echo "${COM_ATMOS_GRIB_0p25/${ROTDIR}\//}/${head}pgrb2.0p25.f${fhr}.idx"
       echo "${COM_ATMOS_GRIB_1p00/${ROTDIR}\//}/${head}pgrb2.1p00.f${fhr}"
@@ -408,7 +408,7 @@ if [[ ${type} == "gdas" ]]; then
     done
     flist="001 002 004 005 007 008"
     for fhr in ${flist}; do
-      file="${COM_ATMOS_MASTER/${ROTDIR}\//}/${head}sfluxgrbf${fhr}.grib2"
+      file="${COM_ATMOS_MASTER/${ROTDIR}\//}/${head}sfluxf${fhr}.grb2"
       if [[ -s "${file}" ]]; then
         echo "${file}"
         echo "${file}.idx"