diff --git a/parm/FV3LAM_wflow.xml b/parm/FV3LAM_wflow.xml
index 33cd227bc..06537fefc 100644
--- a/parm/FV3LAM_wflow.xml
+++ b/parm/FV3LAM_wflow.xml
@@ -1232,7 +1232,7 @@ MODULES_RUN_TASK_FP script.
         <and>
           <timedep><cyclestr offset="&START_TIME_CONVENTIONAL;">@Y@m@d@H@M00</cyclestr></timedep>
           <or>
-            <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_ensinit_&envir;_m#mem#_@H/RESTART/</cyclestr><cyclestr offset="{{ dt_atmos }}">@Y@m@d.@H@M@S.coupler.res</cyclestr></datadep>
+            <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_ensinit_m#mem#_&envir;_@H/RESTART/</cyclestr><cyclestr offset="{{ dt_atmos }}">@Y@m@d.@H@M@S.coupler.res</cyclestr></datadep>
             <datadep age="00:00:00:05"><cyclestr>&FG_ROOT;/&RUN;.@Y@m@d/@H/m#mem#/run_blending</cyclestr> </datadep>
           </or>
         </and>
@@ -2041,8 +2041,8 @@ MODULES_RUN_TASK_FP script.
           <timedep><cyclestr offset="&START_TIME_CONVENTIONAL;">@Y@m@d@H@M00</cyclestr></timedep>
           <or>
             {%- if do_ensemble %}
-              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_spinup_&envir;_m#mem#_@H/RESTART/coupler.res</cyclestr></datadep>
-              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_spinup_&envir;_m#mem#_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@d.@H0000.coupler.res</cyclestr></datadep>
+              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_spinup_m#mem#_&envir;_@H/RESTART/coupler.res</cyclestr></datadep>
+              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_spinup_m#mem#_&envir;_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@d.@H0000.coupler.res</cyclestr></datadep>
             {%- else %}
               <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_spinup_&envir;_@H/RESTART/coupler.res</cyclestr></datadep>
               <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_spinup_&envir;_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@d.@H0000.coupler.res</cyclestr></datadep>
@@ -3200,11 +3200,11 @@ MODULES_RUN_TASK_FP script.
           <timedep><cyclestr offset="&START_TIME_CONVENTIONAL;">@Y@m@d@H@M00</cyclestr></timedep>
           <or>
             {%- if do_ensemble %}
-              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_prod_&envir;_m#mem#_@H/RESTART/coupler.res</cyclestr></datadep>
-              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_prod_&envir;_m#mem#_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@d.@H0000.coupler.res</cyclestr></datadep>
+              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_m#mem#_&envir;_@H/RESTART/coupler.res</cyclestr></datadep>
+              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_m#mem#_&envir;_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@d.@H0000.coupler.res</cyclestr></datadep>
             {%- else %}
-              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_prod_&envir;_@H/RESTART/coupler.res</cyclestr></datadep>
-              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_prod_&envir;_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@d.@H0000.coupler.res</cyclestr></datadep>
+              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_&envir;_@H/RESTART/coupler.res</cyclestr></datadep>
+              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_&envir;_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@d.@H0000.coupler.res</cyclestr></datadep>
             {%- endif %}
           </or>
         </and>
@@ -3249,11 +3249,11 @@ MODULES_RUN_TASK_FP script.
           <timedep><cyclestr offset="&START_TIME_CONVENTIONAL;">@Y@m@d@H@M00</cyclestr></timedep>
           <or>
             {%- if do_ensemble %}
-              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_prod_long_&envir;_m#mem#_@H/RESTART/coupler.res</cyclestr></datadep>
-              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_prod_long_&envir;_m#mem#_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@d.@H0000.coupler.res</cyclestr></datadep>
+              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_m#mem#_&envir;_@H/RESTART/coupler.res</cyclestr></datadep>
+              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_m#mem#_&envir;_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@d.@H0000.coupler.res</cyclestr></datadep>
             {%- else %}
-              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_prod_long_&envir;_@H/RESTART/coupler.res</cyclestr></datadep>
-              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_prod_long_&envir;_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@d.@H0000.coupler.res</cyclestr></datadep>
+              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_&envir;_@H/RESTART/coupler.res</cyclestr></datadep>
+              <datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_&envir;_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@d.@H0000.coupler.res</cyclestr></datadep>
             {%- endif %}
           </or>
         </and>
diff --git a/scripts/exrrfs_analysis_enkf.sh b/scripts/exrrfs_analysis_enkf.sh
index 30865439a..faa594b69 100755
--- a/scripts/exrrfs_analysis_enkf.sh
+++ b/scripts/exrrfs_analysis_enkf.sh
@@ -141,10 +141,10 @@ for imem in  $(seq 1 $nens) ensmean; do
     memcharv0="mem"$( printf "%03d" $imem )
   fi
   if [ "${CYCLE_TYPE}" = "spinup" ]; then
-    bkpath=${DATAROOT}/${RUN}_forecast_spinup_${envir}_${memchar}_${cyc}/INPUT
+    bkpath=${DATAROOT}/${RUN}_forecast_spinup_${memchar}_${envir}_${cyc}/INPUT
     observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}_spinup/${memchar}/observer_gsi_spinup"
   else
-    bkpath=${DATAROOT}/${RUN}_forecast_prod_${envir}_${memchar}_${cyc}/INPUT
+    bkpath=${DATAROOT}/${RUN}_forecast_${memchar}_${envir}_${cyc}/INPUT
     observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}/${memchar}/observer_gsi"
   fi
   if [ "${imem}" = "ensmean" ]; then
diff --git a/scripts/exrrfs_analysis_gsi.sh b/scripts/exrrfs_analysis_gsi.sh
index f845a0fd4..09b23fa7a 100755
--- a/scripts/exrrfs_analysis_gsi.sh
+++ b/scripts/exrrfs_analysis_gsi.sh
@@ -128,7 +128,7 @@ if [ "${CYCLE_TYPE}" = "spinup" ]; then
     bkpath=${DATAROOT}/${RUN}_calc_ensmean_spinup_${envir}_${cyc}
   else
     if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-      bkpath=${DATAROOT}/${RUN}_forecast_spinup_${envir}_${mem_num}_${cyc}/INPUT
+      bkpath=${DATAROOT}/${RUN}_forecast_spinup_${mem_num}_${envir}_${cyc}/INPUT
     else
       bkpath=${DATAROOT}/${RUN}_forecast_spinup_${envir}_${cyc}/INPUT
     fi
@@ -138,9 +138,9 @@ else
     bkpath=${DATAROOT}/${RUN}_calc_ensmean_${envir}_${cyc}
   else
     if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-      bkpath=${DATAROOT}/${RUN}_forecast_prod_${envir}_${mem_num}_${cyc}/INPUT
+      bkpath=${DATAROOT}/${RUN}_forecast_${mem_num}_${envir}_${cyc}/INPUT
     else
-      bkpath=${DATAROOT}/${RUN}_forecast_prod_${envir}_${cyc}/INPUT
+      bkpath=${DATAROOT}/${RUN}_forecast_${envir}_${cyc}/INPUT
     fi
   fi
 fi
diff --git a/scripts/exrrfs_calc_ensmean.sh b/scripts/exrrfs_calc_ensmean.sh
index ac07e9ace..6c924872c 100755
--- a/scripts/exrrfs_calc_ensmean.sh
+++ b/scripts/exrrfs_calc_ensmean.sh
@@ -121,9 +121,9 @@ for imem in  $(seq 1 $nens)
   memberstring=$( printf "%03d" $imem )
 
   if [ "${CYCLE_TYPE}" = "spinup" ]; then
-    bkpath=${DATAROOT}/${RUN}_forecast_spinup_${envir}_m${ensmem}_${cyc}/INPUT  # cycling, use background from RESTART
+    bkpath=${DATAROOT}/${RUN}_forecast_spinup_m${ensmem}_${envir}_${cyc}/INPUT  # cycling, use background from RESTART
   else
-    bkpath=${DATAROOT}/${RUN}_forecast_prod_${envir}_m${ensmem}_${cyc}/INPUT  # cycling, use background from RESTART
+    bkpath=${DATAROOT}/${RUN}_forecast_m${ensmem}_${envir}_${cyc}/INPUT  # cycling, use background from RESTART
   fi
 
   dynvarfile=${bkpath}/fv_core.res.tile1.nc
diff --git a/scripts/exrrfs_recenter.sh b/scripts/exrrfs_recenter.sh
index 36d75eaad..6f328da16 100755
--- a/scripts/exrrfs_recenter.sh
+++ b/scripts/exrrfs_recenter.sh
@@ -117,9 +117,9 @@ for imem in  $(seq 1 $nens)
   memberstring=$( printf "%03d" $imem )
 
   if [ "${CYCLE_TYPE}" = "spinup" ]; then
-    bkpath=${DATAROOT}/${RUN}_forecast_spinup_${envir}_m${ensmem}_${cyc}/INPUT  # cycling, use background from RESTART
+    bkpath=${DATAROOT}/${RUN}_forecast_spinup_m${ensmem}_${envir}_${cyc}/INPUT  # cycling, use background from RESTART
   else
-    bkpath=${DATAROOT}/${RUN}_forecast_${envir}_m${ensmem}_${cyc}/INPUT  # cycling, use background from RESTART
+    bkpath=${DATAROOT}/${RUN}_forecast_m${ensmem}_${envir}_${cyc}/INPUT  # cycling, use background from RESTART
   fi
 
   dynvarfile=${bkpath}/fv_core.res.tile1.nc
diff --git a/scripts/exrrfs_update_lbc_soil.sh b/scripts/exrrfs_update_lbc_soil.sh
index 5b0cb55ce..8bc3ba39b 100755
--- a/scripts/exrrfs_update_lbc_soil.sh
+++ b/scripts/exrrfs_update_lbc_soil.sh
@@ -125,7 +125,7 @@ if [ "${MEM_TYPE}" = "MEAN" ]; then
   bkpath=${DATAROOT}/${RUN}_calc_ensmean${cycle_tag}_${envir}_${cyc}/INPUT
 else
   if [ ${DO_ENSEMBLE} = "TRUE" ]; then
-    bkpath=${DATAROOT}/${RUN}_forecast${cycle_tag}_${envir}_${mem_num}_${cyc}/INPUT
+    bkpath=${DATAROOT}/${RUN}_forecast${cycle_tag}_${mem_num}_${envir}_${cyc}/INPUT
   else
     bkpath=${DATAROOT}/${RUN}_forecast${cycle_tag}_${envir}_${cyc}/INPUT
   fi
diff --git a/ush/set_rrfs_config_general.sh b/ush/set_rrfs_config_general.sh
index 2e40a77c7..76bfaa37d 100644
--- a/ush/set_rrfs_config_general.sh
+++ b/ush/set_rrfs_config_general.sh
@@ -79,8 +79,8 @@ elif [[ $MACHINE == "wcoss2" ]] ; then
   fi
   if [[ $MACHINETYPE == "backup" ]] ; then
     QUEUE_DEFAULT="devhigh"
-    QUEUE_FORECAST="devmax"
-    QUEUE_ANALYSIS="devmax"
+    QUEUE_FORECAST="devhigh"
+    QUEUE_ANALYSIS="devhigh"
     QUEUE_POST="devhigh"
     QUEUE_PRDGEN="devhigh"
   elif [[ $MACHINETYPE == "person" ]] ; then