diff --git a/HISTORY.rc.tmpl b/HISTORY.rc.tmpl
index 8f04cb37..06c322b6 100644
--- a/HISTORY.rc.tmpl
+++ b/HISTORY.rc.tmpl
@@ -845,6 +845,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
                                   'THAT'           , 'SURFACE'     , 'TSH'       ,
                                   'QHAT'           , 'SURFACE'     , 'QSH'       ,
                                   'FRACI'          , 'SURFACE'     , 'FRSEAICE'  ,
+                                  'RUNOFF'         , 'SURFACE'     , 'RUNOFFTOT' ,
                                   'AN_PRCP'        , 'MOIST'       , 'PRECANV'   ,
                                   'CN_PRCP'        , 'MOIST'       , 'PRECCON'   ,
                                   'LS_PRCP'        , 'MOIST'       , 'PRECLSC'   ,
@@ -932,11 +933,12 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
                                   'WCPR'      , 'SURFACE'  , 'PRMC'      ,
                                   'WCRZ'      , 'SURFACE'  , 'RZMC'      ,
                                   'WCSF'      , 'SURFACE'  , 'SFMC'      ,
-                                  'TPSNOW'    , 'SURFACE'  ,
-                                  'TPUNST'    , 'SURFACE'  , 'TUNST'     ,
-                                  'TPSAT'     , 'SURFACE'  , 'TSAT'      ,
-                                  'TPWLT'     , 'SURFACE'  , 'TWLT'      ,
-                                  'TPSURF'    , 'SURFACE'  , 'TSURF'     ,
+                                  'CAPAC'     , 'SURFACE'  , 'INTRWATR'  ,
+                                  'TPSNOW'    , 'SURFACE'  , 'TPSNOWLAND',
+                                  'TPUNST'    , 'SURFACE'  , 'TUNSTLAND' ,
+                                  'TPSAT'     , 'SURFACE'  , 'TSATLAND'  ,
+                                  'TPWLT'     , 'SURFACE'  , 'TWLTLAND'  ,
+                                  'TPSURF'    , 'SURFACE'  , 'TSURFLAND' ,
                                   'TSOIL1'    , 'SURFACE'  ,
                                   'TSOIL2'    , 'SURFACE'  ,
                                   'TSOIL3'    , 'SURFACE'  ,
@@ -945,20 +947,20 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
                                   'TSOIL6'    , 'SURFACE'  ,
                                   'SNOLAND'   , 'SURFACE'  , 'PRECSNOLAND'   ,
                                   'PRLAND'    , 'SURFACE'  , 'PRECTOTLAND'   ,
-                                  'TSLAND'    , 'SURFACE'  , 'SNOMAS'    ,
-                                  'SNOWDP'    , 'SURFACE'  , 'SNODP'     ,
+                                  'TSLAND'    , 'SURFACE'  , 'SNOMASLAND'    ,
+                                  'SNOWDP'    , 'SURFACE'  , 'SNODPLAND'     ,
                                   'EVPSOI'    , 'SURFACE'  , 'LHLANDSOIL',
                                   'EVPVEG'    , 'SURFACE'  , 'LHLANDTRNS',
                                   'EVPINT'    , 'SURFACE'  , 'LHLANDINTR',
                                   'EVPICE'    , 'SURFACE'  , 'LHLANDSBLN',
-                                  'RUNSURF'   , 'SURFACE'  , 'RUNOFF'    ,
-                                  'BASEFLOW'  , 'SURFACE'  ,
+                                  'RUNSURF'   , 'SURFACE'  , 'RUNSURFLAND'   ,
+                                  'BASEFLOW'  , 'SURFACE'  , 'BASEFLOWLAND'  ,
                                   'SMLAND'    , 'SURFACE'  ,
-                                  'QINFIL'    , 'SURFACE'  ,
-                                  'FRUST'     , 'SURFACE'  , 'FRUNST'    ,
-                                  'FRSAT'     , 'SURFACE'  ,
-                                  'ASNOW'     , 'SURFACE'  , 'FRSNO'     ,
-                                  'FRWLT'     , 'SURFACE'  ,
+                                  'QINFIL'    , 'SURFACE'  , 'QINFILLAND',
+                                  'FRUST'     , 'SURFACE'  , 'FRLANDUNST',
+                                  'FRSAT'     , 'SURFACE'  , 'FRLANDSAT' ,
+                                  'ASNOW'     , 'SURFACE'  , 'FRLANDSNO' ,
+                                  'FRWLT'     , 'SURFACE'  , 'FRLANDWLT' ,
                                   'DFPARLAND' , 'SURFACE'  , 'PARDFLAND' ,
                                   'DRPARLAND' , 'SURFACE'  , 'PARDRLAND' ,
                                   'SHLAND'    , 'SURFACE'  ,
@@ -969,8 +971,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
                                   'GHLAND'    , 'SURFACE'  ,
                                   'TWLAND'    , 'SURFACE'  ,
                                   'TELAND'    , 'SURFACE'  ,
-                                  'DWLAND'    , 'SURFACE'  , 'WCHANGE'   ,
-                                  'DHLAND'    , 'SURFACE'  , 'ECHANGE'   ,
+                                  'DWLAND'    , 'SURFACE'  , 'WCHANGELAND'   ,
+                                  'DHLAND'    , 'SURFACE'  , 'ECHANGELAND'   ,
                                   'SPLAND'    , 'SURFACE'  , 'SPSHLAND'  ,
                                   'SPLH'      , 'SURFACE'  , 'SPLHLAND'  ,
                                   'SPWATR'    , 'SURFACE'  , 'SPEVLAND'  ,
@@ -989,8 +991,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
   tavg1_2d_lfo_Nx-.end_time:       >>>IOETIME<<< ,
   tavg1_2d_lfo_Nx-.fields:        'SLRSF'   , 'SOLAR'    , 'SWGDN'    ,
                                   'LWS'     , 'IRRAD'    , 'LWGAB'    ,
-                                  'PCU'     , 'SURFACE'  , 'PRECCU'   ,
-                                  'PLS'     , 'SURFACE'  , 'PRECLS'   ,
+                                  'PCU'     , 'SURFACE'  , 'PRECRAINCU'   ,
+                                  'PLS'     , 'SURFACE'  , 'PRECRAINLS'   ,
                                   'SNO'     , 'SURFACE'  , 'PRECSNO'  ,
                                   'DFPAR'   , 'SOLAR'    , 'PARDF'    ,
                                   'DRPAR'   , 'SOLAR'    , 'PARDR'    ,
@@ -1994,11 +1996,11 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
   tavg1_2d_lfo_Nx+-.ref_time:    >>>IOBBKGT<<< ,
   tavg1_2d_lfo_Nx+-.end_date:    >>>IOEBKGD<<< ,
   tavg1_2d_lfo_Nx+-.end_time:    >>>IOEBKGT<<< ,
-  tavg1_2d_lfo_Nx.fields:      'SLRSF'   , 'SOLAR'    , 'SWGDN'    ,
+  tavg1_2d_lfo_Nx+-.fields:    'SLRSF'   , 'SOLAR'    , 'SWGDN'    ,
                                'SWLAND'  , 'SURFACE'  ,
                                'LWS'     , 'IRRAD'    , 'LWGAB'    ,
-                               'PCU'     , 'SURFACE'  , 'PRECCU'   ,
-                               'PLS'     , 'SURFACE'  , 'PRECLS'   ,
+                               'PCU'     , 'SURFACE'  , 'PRECRAINCU'   ,
+                               'PLS'     , 'SURFACE'  , 'PRECRAINLS'   ,
                                'SNO'     , 'SURFACE'  , 'PRECSNO'  ,
                                'DFPAR'   , 'SOLAR'    , 'PARDF'    ,
                                'DRPAR'   , 'SOLAR'    , 'PARDR'    ,
@@ -2219,6 +2221,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
                                   'THAT'           , 'SURFACE'     , 'TSH'       ,
                                   'QHAT'           , 'SURFACE'     , 'QSH'       ,
                                   'FRACI'          , 'SURFACE'     , 'FRSEAICE'  ,
+                                  'RUNOFF'         , 'SURFACE'     , 'RUNOFFTOT' ,
                                   'AN_PRCP'        , 'MOIST'       , 'PRECANV'   ,
                                   'CN_PRCP'        , 'MOIST'       , 'PRECCON'   ,
                                   'LS_PRCP'        , 'MOIST'       , 'PRECLSC'   ,
@@ -2249,11 +2252,12 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
                                   'WCPR'      , 'SURFACE'  , 'PRMC'      ,
                                   'WCRZ'      , 'SURFACE'  , 'RZMC'      ,
                                   'WCSF'      , 'SURFACE'  , 'SFMC'      ,
-                                  'TPSNOW'    , 'SURFACE'  ,
-                                  'TPUNST'    , 'SURFACE'  , 'TUNST'     ,
-                                  'TPSAT'     , 'SURFACE'  , 'TSAT'      ,
-                                  'TPWLT'     , 'SURFACE'  , 'TWLT'      ,
-                                  'TPSURF'    , 'SURFACE'  , 'TSURF'     ,
+                                  'CAPAC'     , 'SURFACE'  , 'INTRWATR'  ,
+                                  'TPSNOW'    , 'SURFACE'  , 'TPSNOWLAND',
+                                  'TPUNST'    , 'SURFACE'  , 'TUNSTLAND' ,
+                                  'TPSAT'     , 'SURFACE'  , 'TSATLAND'  ,
+                                  'TPWLT'     , 'SURFACE'  , 'TWLTLAND'  ,
+                                  'TPSURF'    , 'SURFACE'  , 'TSURFLAND' ,
                                   'TSOIL1'    , 'SURFACE'  ,
                                   'TSOIL2'    , 'SURFACE'  ,
                                   'TSOIL3'    , 'SURFACE'  ,
@@ -2262,20 +2266,20 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
                                   'TSOIL6'    , 'SURFACE'  ,
                                   'SNOLAND'   , 'SURFACE'  , 'PRECSNOLAND'   ,
                                   'PRLAND'    , 'SURFACE'  , 'PRECTOTLAND'   ,
-                                  'TSLAND'    , 'SURFACE'  , 'SNOMAS'    ,
-                                  'SNOWDP'    , 'SURFACE'  , 'SNODP'     ,
+                                  'TSLAND'    , 'SURFACE'  , 'SNOMASLAND'    ,
+                                  'SNOWDP'    , 'SURFACE'  , 'SNODPLAND'     ,
                                   'EVPSOI'    , 'SURFACE'  , 'LHLANDSOIL',
                                   'EVPVEG'    , 'SURFACE'  , 'LHLANDTRNS',
                                   'EVPINT'    , 'SURFACE'  , 'LHLANDINTR',
                                   'EVPICE'    , 'SURFACE'  , 'LHLANDSBLN',
-                                  'RUNSURF'   , 'SURFACE'  , 'RUNOFF'    ,
-                                  'BASEFLOW'  , 'SURFACE'  ,
+                                  'RUNSURF'   , 'SURFACE'  , 'RUNSURFLAND'   ,
+                                  'BASEFLOW'  , 'SURFACE'  , 'BASEFLOWLAND'  ,
                                   'SMLAND'    , 'SURFACE'  ,
-                                  'QINFIL'    , 'SURFACE'  ,
-                                  'FRUST'     , 'SURFACE'  , 'FRUNST'    ,
-                                  'FRSAT'     , 'SURFACE'  ,
-                                  'ASNOW'     , 'SURFACE'  , 'FRSNO'     ,
-                                  'FRWLT'     , 'SURFACE'  ,
+                                  'QINFIL'    , 'SURFACE'  , 'QINFILLAND',
+                                  'FRUST'     , 'SURFACE'  , 'FRLANDUNST',
+                                  'FRSAT'     , 'SURFACE'  , 'FRLANDSAT' , 
+                                  'ASNOW'     , 'SURFACE'  , 'FRLANDSNO' ,
+                                  'FRWLT'     , 'SURFACE'  , 'FRLANDWLT' ,
                                   'DFPARLAND' , 'SURFACE'  , 'PARDFLAND' ,
                                   'DRPARLAND' , 'SURFACE'  , 'PARDRLAND' ,
                                   'SHLAND'    , 'SURFACE'  ,
@@ -2286,8 +2290,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
                                   'GHLAND'    , 'SURFACE'  ,
                                   'TWLAND'    , 'SURFACE'  ,
                                   'TELAND'    , 'SURFACE'  ,
-                                  'DWLAND'    , 'SURFACE'  , 'WCHANGE'   ,
-                                  'DHLAND'    , 'SURFACE'  , 'ECHANGE'   ,
+                                  'DWLAND'    , 'SURFACE'  , 'WCHANGELAND'   ,
+                                  'DHLAND'    , 'SURFACE'  , 'ECHANGELAND'   ,
                                   'SPLAND'    , 'SURFACE'  , 'SPSHLAND'  ,
                                   'SPLH'      , 'SURFACE'  , 'SPLHLAND'  ,
                                   'SPWATR'    , 'SURFACE'  , 'SPEVLAND'  ,