diff --git a/jobs/JREGIONAL_NONVARCLD b/jobs/JREGIONAL_NONVARCLD
index 684658dd1..61b537a6d 100755
--- a/jobs/JREGIONAL_NONVARCLD
+++ b/jobs/JREGIONAL_NONVARCLD
@@ -64,7 +64,7 @@ if [ ${CYCLE_TYPE} == "spinup" ]; then
 else
   analworkname="nonvar_cldanl"
 fi
-if [ ${RRFSENS_TYPE} == "MEAN" ]; then
+if [ ${MEM_TYPE} == "MEAN" ]; then
   workdir="${CYCLE_DIR}/ensmean/${analworkname}"
   SLASH_ENSMEM_SUBDIR=""
 else
@@ -83,7 +83,7 @@ mkdir_vrfy -p ${workdir}
 $SCRIPTSDIR/exregional_nonvarcldanl.sh \
              cycle_dir="${CYCLE_DIR}" \
              cycle_type="${CYCLE_TYPE}" \
-             rrfsens_type="${RRFSENS_TYPE}" \
+             mem_type="${MEM_TYPE}" \
              workdir="${workdir}"  \
              slash_ensmem_subdir="${SLASH_ENSMEM_SUBDIR}" || \
 print_err_msg_exit "\
diff --git a/jobs/JREGIONAL_REFL2TTEN b/jobs/JREGIONAL_REFL2TTEN
index fe41a1d16..35a196c8b 100755
--- a/jobs/JREGIONAL_REFL2TTEN
+++ b/jobs/JREGIONAL_REFL2TTEN
@@ -64,7 +64,7 @@ if [ ${CYCLE_TYPE} == "spinup" ]; then
 else
   analworkname="refl2tten"
 fi
-if [ ${RRFSENS_TYPE} == "MEAN" ]; then
+if [ ${MEM_TYPE} == "MEAN" ]; then
   workdir="${CYCLE_DIR}/ensmean/${analworkname}"
   SLASH_ENSMEM_SUBDIR=""
 else
@@ -83,7 +83,7 @@ mkdir_vrfy -p ${workdir}
 $SCRIPTSDIR/exregional_refl2tten.sh \
              cycle_dir="${CYCLE_DIR}" \
              cycle_type="${CYCLE_TYPE}" \
-             rrfsens_type="${RRFSENS_TYPE}" \
+             mem_type="${MEM_TYPE}" \
              workdir="${workdir}" || \
              slash_ensmem_subdir="${SLASH_ENSMEM_SUBDIR}" || \
 print_err_msg_exit "\
diff --git a/jobs/JREGIONAL_RUN_ANAL b/jobs/JREGIONAL_RUN_ANAL
index bfd079e00..9eb7d53b8 100755
--- a/jobs/JREGIONAL_RUN_ANAL
+++ b/jobs/JREGIONAL_RUN_ANAL
@@ -73,7 +73,7 @@ else
 fi
 
 if [ ${GSI_TYPE} == "OBSERVER" ]; then
-  if [ ${RRFSENS_TYPE} == "MEAN" ]; then
+  if [ ${MEM_TYPE} == "MEAN" ]; then
     analworkdir="${CYCLE_DIR}/ensmean/observer${analworkname}"
     SLASH_ENSMEM_SUBDIR=""
     observer_nwges_dir="${NWGES_DIR}/ensmean/observer${analworkname}"
@@ -100,7 +100,7 @@ $SCRIPTSDIR/exregional_run_analysis.sh \
              cycle_dir="${CYCLE_DIR}" \
              cycle_type="${CYCLE_TYPE}" \
              gsi_type="${GSI_TYPE}" \
-             rrfsens_type="${RRFSENS_TYPE}" \
+             mem_type="${MEM_TYPE}" \
              analworkdir="${analworkdir}" \
              observer_nwges_dir="${observer_nwges_dir}" \
              slash_ensmem_subdir="${SLASH_ENSMEM_SUBDIR}" || \
diff --git a/scripts/exregional_nonvarcldanl.sh b/scripts/exregional_nonvarcldanl.sh
index 37db5def9..88a209978 100755
--- a/scripts/exregional_nonvarcldanl.sh
+++ b/scripts/exregional_nonvarcldanl.sh
@@ -55,7 +55,7 @@ with FV3 for the specified cycle.
 #
 #-----------------------------------------------------------------------
 #
-valid_args=( "cycle_dir" "cycle_type" "rrfsens_type" "workdir" "slash_ensmem_subdir" )
+valid_args=( "cycle_dir" "cycle_type" "mem_type" "workdir" "slash_ensmem_subdir" )
 process_args valid_args "$@"
 #
 #-----------------------------------------------------------------------
@@ -162,7 +162,7 @@ if [ ${cycle_type} == "spinup" ]; then
 else
   cycle_tag=""
 fi
-if [ ${rrfsens_type} == "MEAN" ]; then
+if [ ${mem_type} == "MEAN" ]; then
     bkpath=${cycle_dir}/ensmean/fcst_fv3lam${cycle_tag}/INPUT
 else
     bkpath=${cycle_dir}${slash_ensmem_subdir}/fcst_fv3lam${cycle_tag}/INPUT
@@ -237,7 +237,7 @@ cat << EOF > gsiparm.anl
    r_cleanSnow_WarmTs_threshold=5.0,
    l_conserve_thetaV=.true.,
    i_conserve_thetaV_iternum=3,
-   l_cld_bld=.false.,
+   l_cld_bld=.true.,
    l_numconc=.true.,
    cld_bld_hgt=1200.0,
    build_cloud_frac_p=0.50,
diff --git a/scripts/exregional_refl2tten.sh b/scripts/exregional_refl2tten.sh
index 456f1ef63..ce15787f0 100755
--- a/scripts/exregional_refl2tten.sh
+++ b/scripts/exregional_refl2tten.sh
@@ -55,7 +55,7 @@ with FV3 for the specified cycle.
 #
 #-----------------------------------------------------------------------
 #
-valid_args=( "cycle_dir" "cycle_type" "rrfsens_type" "workdir" "slash_ensmem_subdir" )
+valid_args=( "cycle_dir" "cycle_type" "mem_type" "workdir" "slash_ensmem_subdir" )
 process_args valid_args "$@"
 #
 #-----------------------------------------------------------------------
@@ -165,7 +165,7 @@ if [ ${cycle_type} == "spinup" ]; then
 else
   cycle_tag=""
 fi
-if [ ${rrfsens_type} == "MEAN" ]; then
+if [ ${mem_type} == "MEAN" ]; then
     bkpath=${cycle_dir}/ensmean/fcst_fv3lam${cycle_tag}/INPUT
 else
     bkpath=${cycle_dir}${slash_ensmem_subdir}/fcst_fv3lam${cycle_tag}/INPUT
diff --git a/scripts/exregional_run_analysis.sh b/scripts/exregional_run_analysis.sh
index d44bf86a7..960f49762 100755
--- a/scripts/exregional_run_analysis.sh
+++ b/scripts/exregional_run_analysis.sh
@@ -55,7 +55,7 @@ specified cycle.
 #
 #-----------------------------------------------------------------------
 #
-valid_args=( "cycle_dir" "cycle_type" "gsi_type" "rrfsens_type" "analworkdir" "observer_nwges_dir" "slash_ensmem_subdir" )
+valid_args=( "cycle_dir" "cycle_type" "gsi_type" "mem_type" "analworkdir" "observer_nwges_dir" "slash_ensmem_subdir" )
 process_args valid_args "$@"
 #
 #-----------------------------------------------------------------------
@@ -172,13 +172,13 @@ cd_vrfy ${analworkdir}
 
 fixgriddir=$FIX_GSI/${PREDEF_GRID_NAME}
 if [ ${cycle_type} == "spinup" ]; then
-  if [ ${rrfsens_type} == "MEAN" ]; then
+  if [ ${mem_type} == "MEAN" ]; then
     bkpath=${cycle_dir}/ensmean/fcst_fv3lam_spinup/INPUT
   else
     bkpath=${cycle_dir}${slash_ensmem_subdir}/fcst_fv3lam_spinup/INPUT
   fi
 else
-  if [ ${rrfsens_type} == "MEAN" ]; then
+  if [ ${mem_type} == "MEAN" ]; then
     bkpath=${cycle_dir}/ensmean/fcst_fv3lam/INPUT
   else
     bkpath=${cycle_dir}${slash_ensmem_subdir}/fcst_fv3lam/INPUT
@@ -206,7 +206,7 @@ print_info_msg "$VERBOSE" "background type is is $BKTYPE"
 stampcycle=$(date -d "${START_DATE}" +%s)
 minHourDiff=100
 loops="009"    # or 009s for GFSv15
-ens_type="nc"  # or nemsio for GFSv15
+ftype="nc"  # or nemsio for GFSv15
 foundens="false"
 cat "no ens found" >> filelist03
 
@@ -215,7 +215,7 @@ case $MACHINE in
 "WCOSS_C" | "WCOSS" | "WCOSS_DELL_P3")
 
   for loop in $loops; do
-    for timelist in $(ls ${ENKF_FCST}/enkfgdas.*/*/atmos/mem080/gdas*.atmf${loop}.${ens_type}); do
+    for timelist in $(ls ${ENKF_FCST}/enkfgdas.*/*/atmos/mem080/gdas*.atmf${loop}.${ftype}); do
       availtimeyyyymmdd=$(echo ${timelist} | cut -d'/' -f9 | cut -c 10-17)
       availtimehh=$(echo ${timelist} | cut -d'/' -f10)
       availtime=${availtimeyyyymmdd}${availtimehh}
@@ -248,7 +248,7 @@ case $MACHINE in
 "JET" | "HERA")
 
   for loop in $loops; do
-    for timelist in $(ls ${ENKF_FCST}/*.gdas.t*z.atmf${loop}.mem080.${ens_type}); do
+    for timelist in $(ls ${ENKF_FCST}/*.gdas.t*z.atmf${loop}.mem080.${ftype}); do
       availtimeyy=$(basename ${timelist} | cut -c 1-2)
       availtimeyyyy=20${availtimeyy}
       availtimejjj=$(basename ${timelist} | cut -c 3-5)
@@ -275,7 +275,7 @@ case $MACHINE in
   done
 
   if [ $foundens = "true" ]; then
-    ls ${ENKF_FCST}/${enkfcstname}.mem0??.${ens_type} >> filelist03
+    ls ${ENKF_FCST}/${enkfcstname}.mem0??.${ftype} >> filelist03
   fi
 
 esac
@@ -563,7 +563,7 @@ done
 if [ ${gsi_type} == "OBSERVER" ]; then
   miter=0
   ifhyb=.false.
-  if [ ${rrfsens_type} == "MEAN" ]; then
+  if [ ${mem_type} == "MEAN" ]; then
     lread_obs_save=.true.
     lread_obs_skip=.false.
   else
diff --git a/ush/templates/FV3LAM_wflow.xml b/ush/templates/FV3LAM_wflow.xml
index 3db6672ed..6187ed46c 100644
--- a/ush/templates/FV3LAM_wflow.xml
+++ b/ush/templates/FV3LAM_wflow.xml
@@ -904,7 +904,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>CYCLE_ROOT</name><value><cyclestr>&CYCLE_BASEDIR;</cyclestr></value></envar>
     <envar><name>CYCLE_TYPE</name><value><cyclestr>#type#</cyclestr></value></envar>
     <envar><name>GSI_TYPE</name><value><cyclestr>ANALYSIS</cyclestr></value></envar>
-    <envar><name>RRFSENS_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
+    <envar><name>MEM_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
     <envar><name>SLASH_ENSMEM_SUBDIR</name><value><cyclestr>{{ slash_ensmem_subdir }}</cyclestr></value></envar>
 
     <dependency>
@@ -940,7 +940,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
     <envar><name>CYCLE_DIR</name><value><cyclestr>&CYCLE_BASEDIR;/@Y@m@d@H</cyclestr></value></envar>
     <envar><name>CYCLE_TYPE</name><value><cyclestr>#type#</cyclestr></value></envar>
-    <envar><name>RRFSENS_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
+    <envar><name>MEM_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
     <envar><name>SLASH_ENSMEM_SUBDIR</name><value><cyclestr>{{ slash_ensmem_subdir }}</cyclestr></value></envar>
 
     <dependency>
@@ -980,7 +980,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
     <envar><name>CYCLE_DIR</name><value><cyclestr>&CYCLE_BASEDIR;/@Y@m@d@H</cyclestr></value></envar>
     <envar><name>CYCLE_TYPE</name><value><cyclestr>#type#</cyclestr></value></envar>
-    <envar><name>RRFSENS_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
+    <envar><name>MEM_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
     <envar><name>SLASH_ENSMEM_SUBDIR</name><value><cyclestr>{{ slash_ensmem_subdir }}</cyclestr></value></envar>
 
     <dependency>
@@ -1377,7 +1377,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>CYCLE_ROOT</name><value><cyclestr>&CYCLE_BASEDIR;</cyclestr></value></envar>
     <envar><name>NWGES_DIR</name><value><cyclestr>&NWGES_BASEDIR;/@Y@m@d@H</cyclestr></value></envar>
     <envar><name>GSI_TYPE</name><value><cyclestr>OBSERVER</cyclestr></value></envar>
-    <envar><name>RRFSENS_TYPE</name><value><cyclestr>MEAN</cyclestr></value></envar>
+    <envar><name>MEM_TYPE</name><value><cyclestr>MEAN</cyclestr></value></envar>
 
     <dependency>
        <and>
@@ -1425,7 +1425,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>CYCLE_ROOT</name><value><cyclestr>&CYCLE_BASEDIR;</cyclestr></value></envar>
     <envar><name>NWGES_DIR</name><value><cyclestr>&NWGES_BASEDIR;/@Y@m@d@H</cyclestr></value></envar>
     <envar><name>GSI_TYPE</name><value><cyclestr>OBSERVER</cyclestr></value></envar>
-    <envar><name>RRFSENS_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
+    <envar><name>MEM_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
     <envar><name>SLASH_ENSMEM_SUBDIR</name><value><cyclestr>{{ slash_ensmem_subdir }}</cyclestr></value></envar>
 
     <dependency>