diff --git a/docs/source/ufs_utils.rst b/docs/source/ufs_utils.rst
index d563f0a6b..314c179b9 100644
--- a/docs/source/ufs_utils.rst
+++ b/docs/source/ufs_utils.rst
@@ -539,14 +539,14 @@ The surface climatological data is located here `./fix/fix_sfc_climo <https://no
              * N Hemis 30 sec - soil_type.statsgo.nh.30s.nc
              * Global 30 sec - soil_type.statsgo.30s.nc
       * Categorical BNU soil type
-             * Global 30-second - soil_type.bnu.v2.30s.nc
+             * Global 30-second - soil_type.bnu.v3.30s.nc
       * Categorical IGBP vegetation type
              * MODIS-based global 0.05-degree - vegetation_type.modis.igbp.0.05.nc
              * MODIS-based global 0.03-degree - vegetation_type.modis.igbp.0.03.nc
              * MODIS-based CONUS 30 sec - vegetation_type.modis.igbp.conus.30s.nc
              * MODIS-based N Hemis 30 sec - vegetation_type.modis.igbp.nh.30s.nc
              * MODIS-based global 30 sec - vegetation_type.modis.igbp.30s.nc
-             * NESDIS VIIRS-based global 30-second - vegetation_type.viirs.v2.igbp.30s.nc
+             * NESDIS VIIRS-based global 30-second - vegetation_type.viirs.v3.igbp.30s.nc
       * Global 0.144-degree monthly vegetation greenness in percent - vegetation_greenness.0.144.nc
 
 The files that define the model grid. All NetCDF.
diff --git a/driver_scripts/driver_grid.hera.sh b/driver_scripts/driver_grid.hera.sh
index e1fd149d3..63d1b872e 100755
--- a/driver_scripts/driver_grid.hera.sh
+++ b/driver_scripts/driver_grid.hera.sh
@@ -86,9 +86,9 @@ export vegsoilt_frac='.false.' # When .false., output dominant soil and
                                # the dominant category. A Fortran logical,
                                # so include the dots.
 
-export veg_type_src="viirs.v2.igbp.30s" #  Vegetation type data.
+export veg_type_src="viirs.v3.igbp.30s" #  Vegetation type data.
                                 # For viirs-based vegetation type data, set to:
-                                # 1) "viirs.v2.igbp.30s" for global 30s data
+                                # 1) "viirs.v3.igbp.30s" for global 30s data
                                 # For the modis-based data, set to:
                                 # 1) "modis.igbp.0.05" for global 0.05-deg data
                                 # 2) "modis.igbp.0.03" for global 0.03-deg data
@@ -96,7 +96,7 @@ export veg_type_src="viirs.v2.igbp.30s" #  Vegetation type data.
                                 # 4) "modis.igbp.nh.30s" for N Hemis 30s data
                                 # 5) "modis.igbp.30s" for global 30s data
 
-export soil_type_src="bnu.v2.30s" #  Soil type data. 
+export soil_type_src="bnu.v3.30s" #  Soil type data. 
                                 # For STATSGO data
                                 # 1) "statsgo.0.05" for global 0.05-deg data
                                 # 2) "statsgo.0.03" for global 0.03-deg data
@@ -104,7 +104,7 @@ export soil_type_src="bnu.v2.30s" #  Soil type data.
                                 # 4) "statsgo.nh.30s" for NH 30s data
                                 # 5) "statsgo.30s" for global 30s data
                                 # For Beijing Norm. Univ. data
-                                # 1) "bnu.v2.30s" for global 30s data.
+                                # 1) "bnu.v3.30s" for global 30s data.
 
 if [ $gtype = uniform ]; then
   export res=96
diff --git a/driver_scripts/driver_grid.jet.sh b/driver_scripts/driver_grid.jet.sh
index 44ddb8ac7..fe2d28dc5 100755
--- a/driver_scripts/driver_grid.jet.sh
+++ b/driver_scripts/driver_grid.jet.sh
@@ -84,9 +84,9 @@ export vegsoilt_frac='.false.'  # When true, outputs percent of each
                                # outputs the dominant category. A
                                # Fortran logical, so include the dots.
 
-export veg_type_src="viirs.v2.igbp.30s" #  Vegetation type data.
+export veg_type_src="viirs.v3.igbp.30s" #  Vegetation type data.
                                 # For viirs-based vegetation type data, set to:
-                                # 1) "viirs.v2.igbp.30s" for global 30s data
+                                # 1) "viirs.v3.igbp.30s" for global 30s data
                                 # For the modis-based data, set to:
                                 # 1) "modis.igbp.0.05" for global 0.05-deg data
                                 # 2) "modis.igbp.0.03" for global 0.03-deg data
@@ -94,9 +94,9 @@ export veg_type_src="viirs.v2.igbp.30s" #  Vegetation type data.
                                 # 4) "modis.igbp.nh.30s" for N Hemis 30s data
                                 # 5) "modis.igbp.30s" for global 30s data
 
-export soil_type_src="bnu.v2.30s" # Soil type data.
+export soil_type_src="bnu.v3.30s" # Soil type data.
                                 # For Beijing Normal Univ. data, set to:
-                                # 1) "bnu.v2.30s" for global 30s data.
+                                # 1) "bnu.v3.30s" for global 30s data.
                                 # For STATSGO soil type data, set to:
                                 # 1) "statsgo.0.05" for global 0.05-deg data
                                 # 2) "statsgo.0.03" for global 0.03-deg data
diff --git a/driver_scripts/driver_grid.orion.sh b/driver_scripts/driver_grid.orion.sh
index 10729da08..e0ac9fc4e 100755
--- a/driver_scripts/driver_grid.orion.sh
+++ b/driver_scripts/driver_grid.orion.sh
@@ -83,9 +83,9 @@ export vegsoilt_frac='.false.'  # When true, outputs percent of each
                                # outputs the dominant category. A
                                # Fortran logical, so include the dots.
 
-export veg_type_src="viirs.v2.igbp.30s" #  Vegetation type data.
+export veg_type_src="viirs.v3.igbp.30s" #  Vegetation type data.
                                 # For viirs-based vegetation type data, set to:
-                                # 1) "viirs.v2.igbp.30s" for global 30s data
+                                # 1) "viirs.v3.igbp.30s" for global 30s data
                                 # For the modis-based data, set to:
                                 # 1) "modis.igbp.0.05" for global 0.05-deg data
                                 # 2) "modis.igbp.0.03" for global 0.03-deg data
@@ -93,9 +93,9 @@ export veg_type_src="viirs.v2.igbp.30s" #  Vegetation type data.
                                 # 4) "modis.igbp.nh.30s" for N Hemis 30s data
                                 # 5) "modis.igbp.30s" for global 30s data
 
-export soil_type_src="bnu.v2.30s" #  Soil type data.
+export soil_type_src="bnu.v3.30s" #  Soil type data.
                                 # For Beijing Normal Univ. data, set to:
-                                # 1) "bnu.v2.30s" for global 30s data.
+                                # 1) "bnu.v3.30s" for global 30s data.
                                 # For STATSGO soil type data, set to:
                                 # 1) "statsgo.0.05" for global 0.05-deg data
                                 # 2) "statsgo.0.03" for global 0.03-deg data
diff --git a/driver_scripts/driver_grid.wcoss2.sh b/driver_scripts/driver_grid.wcoss2.sh
index 2acf52652..cbb5ef188 100755
--- a/driver_scripts/driver_grid.wcoss2.sh
+++ b/driver_scripts/driver_grid.wcoss2.sh
@@ -82,9 +82,9 @@ export vegsoilt_frac='.false.'  # When true, outputs percent of each
                                # outputs the dominant category. A
                                # Fortran logical, so include the dots.
 
-export veg_type_src="viirs.v2.igbp.30s" #  Vegetation type data.
+export veg_type_src="viirs.v3.igbp.30s" #  Vegetation type data.
                                 # For viirs-based vegetation type data, set to:
-                                # 1) "viirs.v2.igbp.30s" for global 30s data
+                                # 1) "viirs.v3.igbp.30s" for global 30s data
                                 # For the modis-based data, set to:
                                 # 1) "modis.igbp.0.05" for global 0.05-deg data
                                 # 2) "modis.igbp.0.03" for global 0.03-deg data
@@ -92,9 +92,9 @@ export veg_type_src="viirs.v2.igbp.30s" #  Vegetation type data.
                                 # 4) "modis.igbp.nh.30s" for N Hemis 30s data
                                 # 5) "modis.igbp.30s" for global 30s data
 
-export soil_type_src="bnu.v2.30s"  # Soil type data
+export soil_type_src="bnu.v3.30s"  # Soil type data
                                 # For Beijing Normal Univ. data, set to:
-                                # 1) "bnu.v2.30s" for global 30s data.
+                                # 1) "bnu.v3.30s" for global 30s data.
                                 # For STATSGO soil type data, set to:
                                 # 1) "statsgo.0.05" for global 0.05-deg data
                                 # 2) "statsgo.0.03" for global 0.03-deg data
diff --git a/reg_tests/grid_gen/c96.viirs.bnu.sh b/reg_tests/grid_gen/c96.viirs.bnu.sh
index 3e24e3509..ac170c61f 100755
--- a/reg_tests/grid_gen/c96.viirs.bnu.sh
+++ b/reg_tests/grid_gen/c96.viirs.bnu.sh
@@ -14,8 +14,8 @@ export out_dir=${WORK_DIR}/c96.viirs.bnu
 
 export res=96
 export gtype=uniform
-export veg_type_src="viirs.v2.igbp.30s"
-export soil_type_src="bnu.v2.30s"
+export veg_type_src="viirs.v3.igbp.30s"
+export soil_type_src="bnu.v3.30s"
 
 NCCMP=${NCCMP:-$(which nccmp)}
 
diff --git a/util/sfc_climo_gen/sfc_gen.sh b/util/sfc_climo_gen/sfc_gen.sh
index 9988c9096..cdde11640 100755
--- a/util/sfc_climo_gen/sfc_gen.sh
+++ b/util/sfc_climo_gen/sfc_gen.sh
@@ -39,7 +39,7 @@
 #
 # veg_type_src - Input vegetation type data. Choices are:
 #                  For viirs-based vegetation type data, set to:
-#                  - "viirs.v2.igbp.30s" for global 30s data
+#                  - "viirs.v3.igbp.30s" for global 30s data
 #                  For the modis-based vegetation data, set to:
 #                  - "modis.igbp.0.05" for global 0.05-deg data
 #                  - "modis.igbp.0.03" for global 0.03-deg data
@@ -49,7 +49,7 @@
 #
 # soil_type_src - Input soil type data. Choices are:
 #                   For Beijing Norm. Univ. soil type data
-#                   - "bnu.v2.30s" for global 30s data
+#                   - "bnu.v3.30s" for global 30s data
 #                   For STATSGO soil type data
 #                   - "statsgo.0.05" for global 0.05-deg data
 #                   - "statsgo.0.03" for global 0.03-deg data
@@ -71,9 +71,9 @@ export res=768.mx025
 #export GRIDTYPE=regional
 #FIX_REG=/lfs/h2/emc/stmp/$LOGNAME/fix.reg
 
-export veg_type_src="viirs.v2.igbp.30s"
+export veg_type_src="viirs.v3.igbp.30s"
 
-export soil_type_src="bnu.v2.30s"
+export soil_type_src="bnu.v3.30s"
 
 export WORK_DIR=/scratch1/NCEPDEV/stmp2/$LOGNAME/work.sfc
 export SAVE_DIR=/scratch1/NCEPDEV/stmp2/$LOGNAME/sfc.C${res}