diff --git a/parm/metplus/GridStat_APCP.conf b/parm/metplus/GridStat_APCP.conf
index 1391256eb7..7722f8df38 100644
--- a/parm/metplus/GridStat_APCP.conf
+++ b/parm/metplus/GridStat_APCP.conf
@@ -113,20 +113,7 @@ GRID_STAT_DESC = NA
 
 GRID_STAT_MET_CONFIG_OVERRIDES = cat_thresh = [NA]; cnt_thresh = [NA]; cnt_logic = UNION; wind_thresh = [NA]; wind_logic = UNION; ci_alpha = [0.05]; rank_corr_flag = FALSE;
 #
-# String to search for in the foreast input files for forecast variable
-# 1.
-#
-# Note that this configuration file reads in forecast files created by
-# another MET tool (PcpCombine) that names the arrays in its output
-# according to fieldname_in_met_output, so the input forecast field name
-# to look for here must also given by fieldname_in_met_output.
-#
-FCST_VAR1_NAME = {{fieldname_in_met_output}}
-#
-# List of levels to evaluate for forecast variable 1.
-#
-ACCUM_HH = {{accum_hh}}
-FCST_VAR1_LEVELS = A{ACCUM_HH}
+# List of forecast and corresponding observation fields to process.
 #
 # Lead to use both in naming of the output .stat and .nc files and for
 # lead values in those files.
@@ -141,25 +128,15 @@ FCST_VAR1_LEVELS = A{ACCUM_HH}
 # member is time-lagged.  That would cause confusion, so here, we always
 # use lead values with zero lead corresponding to cdate.
 #
-FCST_VAR1_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
+ACCUM_HH = {{accum_hh}}
+FCST_VAR1_NAME = {{fieldname_in_met_output}}
+FCST_VAR1_LEVELS = A{ACCUM_HH}
 FCST_VAR1_THRESH = {{field_thresholds}}
-#
-# String to search for in the observation input files for observation
-# variable 1.
-#
-# As with the forecast input files, the observation input files to this
-# configuration file are from another MET tool (PcpCombine) that have
-# output array names specified by fieldname_in_met_output, so here we
-# use this variable to search for the field name in the input observation
-# files.
-#
+FCST_VAR1_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
 OBS_VAR1_NAME = {{fieldname_in_met_output}}
-#
-# List of levels to evaluate for observation variable 1.  Must be the
-# same length as FCST_VAR1_LEVELS.
-#
 OBS_VAR1_LEVELS = A{ACCUM_HH}
 OBS_VAR1_THRESH = {{field_thresholds}}
+
 #
 # Forecast data time window(s).
 #
diff --git a/parm/metplus/GridStat_REFC.conf b/parm/metplus/GridStat_REFC.conf
index 01e71352c4..8d510e06a7 100644
--- a/parm/metplus/GridStat_REFC.conf
+++ b/parm/metplus/GridStat_REFC.conf
@@ -112,12 +112,7 @@ GRID_STAT_DESC = NA
 
 GRID_STAT_MET_CONFIG_OVERRIDES = cat_thresh = []; cnt_thresh = [NA]; cnt_logic = UNION; wind_thresh = [NA]; wind_logic = UNION; ci_alpha = [0.05]; rank_corr_flag = FALSE;
 #
-# String to search for in the foreast input files for forecast variable
-# 1.
-#
-FCST_VAR1_NAME = {{fieldname_in_fcst_input}}
-FCST_VAR1_LEVELS = L0
-FCST_VAR1_THRESH = {{field_thresholds}}
+# List of forecast and corresponding observation fields to process.
 #
 # Lead to use both in naming of the output .stat and .nc files and for
 # lead values in those files.
@@ -132,13 +127,12 @@ FCST_VAR1_THRESH = {{field_thresholds}}
 # member is time-lagged.  That would cause confusion, so here, we always
 # use lead values with zero lead corresponding to cdate.
 #
+FCST_VAR1_NAME = {{fieldname_in_fcst_input}}
+FCST_VAR1_LEVELS = L0
+FCST_VAR1_THRESH = {{field_thresholds}}
 FCST_VAR1_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
                     cnt_thresh = [ >15 ];
                     cnt_logic = UNION;
-#
-# String to search for in the observation input files for observation
-# variable 1.
-#
 OBS_VAR1_NAME = {{fieldname_in_obs_input}}
 OBS_VAR1_LEVELS = Z500
 OBS_VAR1_THRESH = {{field_thresholds}}
@@ -146,6 +140,7 @@ OBS_VAR1_OPTIONS = censor_thresh = [eq-999, <-20];
                    censor_val = [-9999, -20];
                    cnt_thresh = [ >15 ];
                    cnt_logic = UNION;
+
 #
 # Forecast data time window(s).
 #
diff --git a/parm/metplus/GridStat_RETOP.conf b/parm/metplus/GridStat_RETOP.conf
index 05ed104c25..5a13b4e7e6 100644
--- a/parm/metplus/GridStat_RETOP.conf
+++ b/parm/metplus/GridStat_RETOP.conf
@@ -112,12 +112,7 @@ GRID_STAT_DESC = NA
 
 GRID_STAT_MET_CONFIG_OVERRIDES = cat_thresh = []; cnt_thresh = [NA]; cnt_logic = UNION; wind_thresh = [NA]; wind_logic = UNION; ci_alpha = [0.05]; rank_corr_flag = FALSE;
 #
-# String to search for in the foreast input files for forecast variable
-# 1.
-#
-FCST_VAR1_NAME = {{fieldname_in_fcst_input}}
-FCST_VAR1_LEVELS = L0
-FCST_VAR1_THRESH = {{field_thresholds}}
+# List of forecast and corresponding observation fields to process.
 #
 # Lead to use both in naming of the output .stat and .nc files and for
 # lead values in those files.
@@ -132,14 +127,13 @@ FCST_VAR1_THRESH = {{field_thresholds}}
 # member is time-lagged.  That would cause confusion, so here, we always
 # use lead values with zero lead corresponding to cdate.
 #
+FCST_VAR1_NAME = {{fieldname_in_fcst_input}}
+FCST_VAR1_LEVELS = L0
+FCST_VAR1_THRESH = {{field_thresholds}}
 FCST_VAR1_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
                     convert(x) = x * 3.28084 * 0.001;
                     cnt_thresh = [ >0 ];
                     cnt_logic = UNION;
-#
-# String to search for in the observation input files for observation
-# variable 1.
-#
 OBS_VAR1_NAME = {{fieldname_in_obs_input}}
 OBS_VAR1_LEVELS = Z500
 OBS_VAR1_THRESH = {{field_thresholds}}
@@ -148,6 +142,7 @@ OBS_VAR1_OPTIONS = convert(x) = x * 3280.84 * 0.001;
                    censor_val = [-9999,-16.4042];
                    cnt_thresh = [ >0 ];
                    cnt_logic = UNION;
+
 #
 # Forecast data time window(s).
 #
diff --git a/parm/metplus/PointStat_ADPSFC.conf b/parm/metplus/PointStat_ADPSFC.conf
index 133f5923a0..8a175b57bd 100644
--- a/parm/metplus/PointStat_ADPSFC.conf
+++ b/parm/metplus/PointStat_ADPSFC.conf
@@ -174,17 +174,7 @@ POINT_STAT_MESSAGE_TYPE = {{fieldname_in_met_filedir_names}}
 # set to False to run PointStat once per run time including all fields
 POINT_STAT_ONCE_PER_FIELD = False
 #
-# Variables and levels as specified in the field dictionary of the METplus
-# PointStat configuration file. Specify as FCST_VARn_NAME, FCST_VARn_LEVELS,
-# (optional) FCST_VARn_OPTION
-#
-
-# fields to compare
-# Note: If FCST_VAR<n>_* is set, then a corresponding OBS_VAR<n>_* variable must be set
-# To use one variables for both forecast and observation data, set BOTH_VAR<n>_* instead
-
-BOTH_VAR1_NAME = TMP
-BOTH_VAR1_LEVELS = Z2
+# List of forecast and corresponding observation fields to process.
 #
 # Lead to use both in naming of the output .stat and .nc files and for
 # lead values in those files.
@@ -199,36 +189,55 @@ BOTH_VAR1_LEVELS = Z2
 # member is time-lagged.  That would cause confusion, so here, we always
 # use lead values with zero lead corresponding to cdate.
 #
+FCST_VAR1_NAME = TMP
+FCST_VAR1_LEVELS = Z2
 FCST_VAR1_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
+OBS_VAR1_NAME = TMP
+OBS_VAR1_LEVELS = Z2
 
-BOTH_VAR2_NAME = DPT
-BOTH_VAR2_LEVELS = Z2
+FCST_VAR2_NAME = DPT
+FCST_VAR2_LEVELS = Z2
 FCST_VAR2_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
+OBS_VAR2_NAME = DPT
+OBS_VAR2_LEVELS = Z2
 
-BOTH_VAR3_NAME = RH 
-BOTH_VAR3_LEVELS = Z2
+FCST_VAR3_NAME = RH
+FCST_VAR3_LEVELS = Z2
 FCST_VAR3_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
+OBS_VAR3_NAME = RH
+OBS_VAR3_LEVELS = Z2
 
-BOTH_VAR4_NAME = UGRD
-BOTH_VAR4_LEVELS = Z10
-BOTH_VAR4_THRESH = ge2.572 ;; m/s or 5kts
+FCST_VAR4_NAME = UGRD
+FCST_VAR4_LEVELS = Z10
+FCST_VAR4_THRESH = ge2.572 ;; m/s or 5kts
 FCST_VAR4_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
+OBS_VAR4_NAME = UGRD
+OBS_VAR4_LEVELS = Z10
+OBS_VAR4_THRESH = ge2.572 ;; m/s or 5kts
 
-BOTH_VAR5_NAME = VGRD
-BOTH_VAR5_LEVELS = Z10
-BOTH_VAR5_THRESH = ge2.572 ;; m/s or 5kts
+FCST_VAR5_NAME = VGRD
+FCST_VAR5_LEVELS = Z10
+FCST_VAR5_THRESH = ge2.572 ;; m/s or 5kts
 FCST_VAR5_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
+OBS_VAR5_NAME = VGRD
+OBS_VAR5_LEVELS = Z10
+OBS_VAR5_THRESH = ge2.572 ;; m/s or 5kts
 
-BOTH_VAR6_NAME = WIND
-BOTH_VAR6_LEVELS = Z10
-BOTH_VAR6_THRESH = ge2.572, ge2.572&&lt5.144, ge5.144, ge10.288, ge15.433 ;; m/s or 5, 10, 20, 30kts
+FCST_VAR6_NAME = WIND
+FCST_VAR6_LEVELS = Z10
+FCST_VAR6_THRESH = ge2.572, ge2.572&&lt5.144, ge5.144, ge10.288, ge15.433 ;; m/s or 5, 10, 20, 30kts
 FCST_VAR6_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
                     GRIB2_pdt = 0; ;; derive instantaneous 10-m wind from U/V components, overriding max 10-m wind
 OBS_VAR6_OPTIONS = GRIB2_pdt = 0; ;; derive instantaneous 10-m wind from U/V components, overriding max 10-m wind
+OBS_VAR6_NAME = WIND
+OBS_VAR6_LEVELS = Z10
+OBS_VAR6_THRESH = ge2.572, ge2.572&&lt5.144, ge5.144, ge10.288, ge15.433 ;; m/s or 5, 10, 20, 30kts
 
-BOTH_VAR7_NAME = PRMSL
-BOTH_VAR7_LEVELS = Z0
+FCST_VAR7_NAME = PRMSL
+FCST_VAR7_LEVELS = Z0
 FCST_VAR7_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
+OBS_VAR7_NAME = PRMSL
+OBS_VAR7_LEVELS = Z0
 
 FCST_VAR8_NAME = TCDC
 FCST_VAR8_LEVELS = L0
@@ -240,9 +249,9 @@ FCST_VAR8_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
 OBS_VAR8_NAME = TCDC
 OBS_VAR8_LEVELS = L0
 
-BOTH_VAR9_NAME = VIS
-BOTH_VAR9_LEVELS = L0
-BOTH_VAR9_THRESH = lt805, lt1609, lt4828, lt8045 ,ge8045, lt16090
+FCST_VAR9_NAME = VIS
+FCST_VAR9_LEVELS = L0
+FCST_VAR9_THRESH = lt805, lt1609, lt4828, lt8045, ge8045, lt16090
 FCST_VAR9_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
                     censor_thresh = [>16090];
                     censor_val = [16090];
@@ -250,10 +259,15 @@ FCST_VAR9_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
 OBS_VAR9_OPTIONS = censor_thresh = [>16090];
                    censor_val = [16090];
                    interp = { type = [ { method = NEAREST; width = 1; } ]; }
+OBS_VAR9_NAME = VIS
+OBS_VAR9_LEVELS = L0
+OBS_VAR9_THRESH = lt805, lt1609, lt4828, lt8045, ge8045, lt16090
 
-BOTH_VAR10_NAME = GUST
-BOTH_VAR10_LEVELS = Z0
+FCST_VAR10_NAME = GUST
+FCST_VAR10_LEVELS = Z0
 FCST_VAR10_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
+OBS_VAR10_NAME = GUST
+OBS_VAR10_LEVELS = Z0
 
 FCST_VAR11_NAME = HGT
 FCST_VAR11_LEVELS = L0
@@ -267,8 +281,10 @@ OBS_VAR11_THRESH = lt152, lt305, lt914, lt1520, lt3040, ge914
 OBS_VAR11_OPTIONS = GRIB_lvl_typ = 215;
                     interp = { type = [ { method = NEAREST; width = 1; } ]; }
 
-BOTH_VAR12_NAME = SPFH 
-BOTH_VAR12_LEVELS = Z2
+FCST_VAR12_NAME = SPFH
+FCST_VAR12_LEVELS = Z2
+OBS_VAR12_NAME = SPFH
+OBS_VAR12_LEVELS = Z2
 
 FCST_VAR13_NAME = CRAIN
 FCST_VAR13_LEVELS = L0
diff --git a/parm/metplus/PointStat_ADPUPA.conf b/parm/metplus/PointStat_ADPUPA.conf
index d6dc86aad3..25390ddb16 100644
--- a/parm/metplus/PointStat_ADPUPA.conf
+++ b/parm/metplus/PointStat_ADPUPA.conf
@@ -174,17 +174,7 @@ POINT_STAT_MESSAGE_TYPE = {{fieldname_in_met_filedir_names}}
 # set to False to run PointStat once per run time including all fields
 POINT_STAT_ONCE_PER_FIELD = False
 #
-# Variables and levels as specified in the field dictionary of the METplus
-# PointStat configuration file. Specify as FCST_VARn_NAME, FCST_VARn_LEVELS,
-# (optional) FCST_VARn_OPTION
-#
-
-# fields to compare
-# Note: If FCST_VAR<n>_* is set, then a corresponding OBS_VAR<n>_* variable must be set
-# To use one variables for both forecast and observation data, set BOTH_VAR<n>_* instead
-
-BOTH_VAR1_NAME = TMP
-BOTH_VAR1_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
+# List of forecast and corresponding observation fields to process.
 #
 # Lead to use both in naming of the output .stat and .nc files and for
 # lead values in those files.
@@ -199,38 +189,59 @@ BOTH_VAR1_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150,
 # member is time-lagged.  That would cause confusion, so here, we always
 # use lead values with zero lead corresponding to cdate.
 #
+FCST_VAR1_NAME = TMP
+FCST_VAR1_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
 FCST_VAR1_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
+OBS_VAR1_NAME = TMP
+OBS_VAR1_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
 
-BOTH_VAR2_NAME = RH
-BOTH_VAR2_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250
+FCST_VAR2_NAME = RH
+FCST_VAR2_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250
 FCST_VAR2_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
+OBS_VAR2_NAME = RH
+OBS_VAR2_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250
 
-BOTH_VAR3_NAME = DPT
-BOTH_VAR3_LEVELS = P1000, P925, P850, P700, P500, P400, P300
+FCST_VAR3_NAME = DPT
+FCST_VAR3_LEVELS = P1000, P925, P850, P700, P500, P400, P300
 FCST_VAR3_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
+OBS_VAR3_NAME = DPT
+OBS_VAR3_LEVELS = P1000, P925, P850, P700, P500, P400, P300
 
-BOTH_VAR4_NAME = UGRD
-BOTH_VAR4_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
-BOTH_VAR4_THRESH = ge2.572 ;; m/s or 5kts
+FCST_VAR4_NAME = UGRD
+FCST_VAR4_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
+FCST_VAR4_THRESH = ge2.572 ;; m/s or 5kts
 FCST_VAR4_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
+OBS_VAR4_NAME = UGRD
+OBS_VAR4_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
+OBS_VAR4_THRESH = ge2.572 ;; m/s or 5kts
 
-BOTH_VAR5_NAME = VGRD
-BOTH_VAR5_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
-BOTH_VAR5_THRESH = ge2.572 ;; m/s or 5kts
+FCST_VAR5_NAME = VGRD
+FCST_VAR5_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
+FCST_VAR5_THRESH = ge2.572 ;; m/s or 5kts
 FCST_VAR5_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
+OBS_VAR5_NAME = VGRD
+OBS_VAR5_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
+OBS_VAR5_THRESH = ge2.572 ;; m/s or 5kts
 
-BOTH_VAR6_NAME = WIND
-BOTH_VAR6_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
-BOTH_VAR6_THRESH = ge2.572, ge2.572&&lt5.144, ge5.144, ge10.288, ge15.433, ge20.577, ge25.722 ;; m/s or 5, 10, 20, 30, 40, 50kts
+FCST_VAR6_NAME = WIND
+FCST_VAR6_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
+FCST_VAR6_THRESH = ge2.572, ge2.572&&lt5.144, ge5.144, ge10.288, ge15.433, ge20.577, ge25.722 ;; m/s or 5, 10, 20, 30, 40, 50kts
 FCST_VAR6_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
+OBS_VAR6_NAME = WIND
+OBS_VAR6_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
+OBS_VAR6_THRESH = ge2.572, ge2.572&&lt5.144, ge5.144, ge10.288, ge15.433, ge20.577, ge25.722 ;; m/s or 5, 10, 20, 30, 40, 50kts
 
-BOTH_VAR7_NAME = HGT
-BOTH_VAR7_LEVELS = P1000, P950, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
+FCST_VAR7_NAME = HGT
+FCST_VAR7_LEVELS = P1000, P950, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
 FCST_VAR7_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
+OBS_VAR7_NAME = HGT
+OBS_VAR7_LEVELS = P1000, P950, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
 
-BOTH_VAR8_NAME = SPFH
-BOTH_VAR8_LEVELS = P1000, P850, P700, P500, P400, P300
+FCST_VAR8_NAME = SPFH
+FCST_VAR8_LEVELS = P1000, P850, P700, P500, P400, P300
 FCST_VAR8_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
+OBS_VAR8_NAME = SPFH
+OBS_VAR8_LEVELS = P1000, P850, P700, P500, P400, P300
 
 FCST_VAR9_NAME = CAPE
 FCST_VAR9_LEVELS = L0