diff --git a/src/fates b/src/fates
index 825579d0b4..b4367834ab 160000
--- a/src/fates
+++ b/src/fates
@@ -1 +1 @@
-Subproject commit 825579d0b406fe99344591b5ed8356e5c7aeebec
+Subproject commit b4367834abf505eb4e5f53af9bc7e4b83af4685c
diff --git a/src/main/histFileMod.F90 b/src/main/histFileMod.F90
index 69dcbe3b8e..4d1f514cb0 100644
--- a/src/main/histFileMod.F90
+++ b/src/main/histFileMod.F90
@@ -28,7 +28,7 @@ module histFileMod
   use FatesInterfaceTypesMod , only : nlevheight
   use FatesInterfaceTypesMod , only : nlevdamage
   use FatesConstantsMod      , only : n_landuse_cats
-  use FatesFuelClassesMod    , only : nfsc
+  use FatesFuelClassesMod    , only : num_fuel_classes
   use FatesLitterMod         , only : ncwd
   use PRTGenericMod          , only : num_elements_fates  => num_elements
   use FatesInterfaceTypesMod , only : numpft_fates => numpft
@@ -2504,7 +2504,7 @@ subroutine htape_create (t, histrest)
        call ncd_defdim(lnfid, 'fates_levpft', numpft_fates, dimid)
        call ncd_defdim(lnfid, 'fates_levage', nlevage, dimid)
        call ncd_defdim(lnfid, 'fates_levheight', nlevheight, dimid)
-       call ncd_defdim(lnfid, 'fates_levfuel', nfsc, dimid)
+       call ncd_defdim(lnfid, 'fates_levfuel', num_fuel_classes, dimid)
        call ncd_defdim(lnfid, 'fates_levcwdsc', ncwd, dimid)
        call ncd_defdim(lnfid, 'fates_levscpf', nlevsclass*numpft_fates, dimid)
        call ncd_defdim(lnfid, 'fates_levcapf', nlevcoage*numpft_fates, dimid)
@@ -2519,7 +2519,7 @@ subroutine htape_create (t, histrest)
        call ncd_defdim(lnfid, 'fates_levelpft', num_elements_fates * numpft_fates, dimid)
        call ncd_defdim(lnfid, 'fates_levelcwd', num_elements_fates * ncwd, dimid)
        call ncd_defdim(lnfid, 'fates_levelage', num_elements_fates * nlevage, dimid)
-       call ncd_defdim(lnfid, 'fates_levagefuel', nlevage * nfsc, dimid)
+       call ncd_defdim(lnfid, 'fates_levagefuel', nlevage * num_fuel_classes, dimid)
        call ncd_defdim(lnfid, 'fates_levclscpf', nclmax*nlevsclass*numpft_fates, dimid)
        call ncd_defdim(lnfid, 'fates_levlanduse', n_landuse_cats, dimid)
        call ncd_defdim(lnfid, 'fates_levlulu', n_landuse_cats * n_landuse_cats, dimid)
@@ -5595,7 +5595,7 @@ subroutine hist_addfld2d (fname, type2d, units, avgflag, long_name, type1d_out,
     case ('fates_levheight')
        num2d = nlevheight
     case ('fates_levfuel')
-       num2d = nfsc
+       num2d = num_fuel_classes
     case ('fates_levcwdsc')
        num2d = ncwd
     case ('fates_levscpf')
@@ -5635,7 +5635,7 @@ subroutine hist_addfld2d (fname, type2d, units, avgflag, long_name, type1d_out,
     case ('fates_levelage')
        num2d = num_elements_fates*nlevage
     case ('fates_levagefuel')
-       num2d = nlevage*nfsc
+       num2d = nlevage*num_fuel_classes
     case('fates_levclscpf')
        num2d = nclmax * nclmax * numpft_fates
     case ('fates_levlanduse')
diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90
index 10fabeed23..269189d1b7 100644
--- a/src/utils/clmfates_interfaceMod.F90
+++ b/src/utils/clmfates_interfaceMod.F90
@@ -3622,7 +3622,7 @@ subroutine hlm_bounds_to_fates_bounds(hlm, fates)
    use FatesInterfaceTypesMod, only : nlevsclass, nlevage, nlevcoage
    use FatesInterfaceTypesMod, only : nlevheight
    use FatesInterfaceTypesMod, only : nlevdamage
-   use FatesFuelClassesMod,    only : nfsc
+   use FatesFuelClassesMod,    only : num_fuel_classes
    use FatesLitterMod,         only : ncwd
    use EDParamsMod,            only : nlevleaf, nclmax
    use FatesInterfaceTypesMod, only : numpft_fates => numpft
@@ -3674,7 +3674,7 @@ subroutine hlm_bounds_to_fates_bounds(hlm, fates)
    fates%sizeagepft_class_end   = nlevsclass * nlevage * numpft_fates
 
    fates%fuel_begin = 1
-   fates%fuel_end = nfsc
+   fates%fuel_end = num_fuel_classes
 
    fates%cwdsc_begin = 1
    fates%cwdsc_end = ncwd
@@ -3701,7 +3701,7 @@ subroutine hlm_bounds_to_fates_bounds(hlm, fates)
    fates%elage_end   = num_elements * nlevage
 
    fates%agefuel_begin = 1
-   fates%agefuel_end   = nlevage * nfsc
+   fates%agefuel_end   = nlevage * num_fuel_classes
 
    fates%cdpf_begin = 1
    fates%cdpf_end = nlevdamage * numpft_fates * nlevsclass