diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90
index d36a86721..8374d0f1b 100644
--- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90
+++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90
@@ -21,7 +21,7 @@ module GFS_surface_composites_pre
 !! \htmlinclude GFS_surface_composites_pre_run.html
 !!
    subroutine GFS_surface_composites_pre_run (im, lkm, frac_grid, iopt_lake, iopt_lake_clm,                               &
-                                 flag_cice, cplflx, cplice, cplwav2atm, lsm, lsm_ruc,                                     &
+                                 flag_cice, cplflx, cplice, cplwav2atm, lsm, ilsm_ruc,                                    &
                                  landfrac, lakefrac, lakedepth, oceanfrac, frland,                                        &
                                  dry, icy, lake, use_lake_model, wet, hice, cice, zorlo, zorll, zorli,                    &
                                  snowd,            snowd_lnd, snowd_ice, tprcp, tprcp_wat,                                &
@@ -34,7 +34,7 @@ subroutine GFS_surface_composites_pre_run (im, lkm, frac_grid, iopt_lake, iopt_l
       implicit none
 
       ! Interface variables
-      integer,                             intent(in   ) :: im, lkm, kdt, lsm, lsm_ruc, iopt_lake, iopt_lake_clm
+      integer,                             intent(in   ) :: im, lkm, kdt, lsm, ilsm_ruc, iopt_lake, iopt_lake_clm
       logical,                             intent(in   ) :: cplflx, cplice, cplwav2atm, frac_grid
       logical, dimension(:),              intent(inout)  :: flag_cice
       logical,              dimension(:), intent(inout)  :: dry, icy, lake, wet
@@ -226,7 +226,7 @@ subroutine GFS_surface_composites_pre_run (im, lkm, frac_grid, iopt_lake, iopt_l
         endif
         if (dry(i)) then                   ! Land
           uustar_lnd(i) = uustar(i)
-           if(lsm /= lsm_ruc) weasd_lnd(i) = weasd(i)
+           if(lsm /= ilsm_ruc) weasd_lnd(i) = weasd(i)
            tsurf_lnd(i) = tsfcl(i)
         ! DH*
         else
@@ -240,7 +240,7 @@ subroutine GFS_surface_composites_pre_run (im, lkm, frac_grid, iopt_lake, iopt_l
         endif
         if (icy(i)) then                   ! Ice
           is_clm = lkm>0 .and. iopt_lake==iopt_lake_clm .and. use_lake_model(i)>0
-          if(lsm /= lsm_ruc .and. .not.is_clm) then
+          if(lsm /= ilsm_ruc .and. .not.is_clm) then
             weasd_ice(i) = weasd(i)
           endif
            tsurf_ice(i) = tisfc(i)
@@ -276,7 +276,7 @@ subroutine GFS_surface_composites_pre_run (im, lkm, frac_grid, iopt_lake, iopt_l
             endif
           endif
         enddo
-      elseif(lsm /= lsm_ruc) then ! do not do snow initialization  with RUC lsm
+      elseif(lsm /= ilsm_ruc) then ! do not do snow initialization  with RUC lsm
         do i=1,im
           if (icy(i)) then
             if (kdt == 1 .or. (.not. cplflx .or. lakefrac(i) > zero)) then
diff --git a/physics/SFC_Layer/UFS/sfc_diag.f b/physics/SFC_Layer/UFS/sfc_diag.f
index 66ec95c50..f57fd6435 100644
--- a/physics/SFC_Layer/UFS/sfc_diag.f
+++ b/physics/SFC_Layer/UFS/sfc_diag.f
@@ -11,7 +11,7 @@ module sfc_diag
 !!
 !>  @{
       subroutine sfc_diag_run (im,xlat_d,xlon_d,                        &
-     &                    lsm,lsm_ruc,grav,cp,eps,epsm1,con_rocp,       &
+     &                    lsm,ilsm_ruc,grav,cp,eps,epsm1,con_rocp,      &
      &                    con_karman,                                   &
      &                    shflx,cdq,wind,                               &
      &                    usfco,vsfco,icplocn2atm,                      &
@@ -27,7 +27,7 @@ subroutine sfc_diag_run (im,xlat_d,xlon_d,                        &
       use physcons, only : con_t0c
       implicit none
 !
-      integer, intent(in) :: im, lsm, lsm_ruc, iopt_lake, iopt_lake_clm
+      integer, intent(in) :: im, lsm, ilsm_ruc, iopt_lake, iopt_lake_clm
       logical, intent(in) :: use_lake2m
       integer, intent(in) :: icplocn2atm
       logical, intent(in) :: thsfc_loc  ! Flag for reference pot. temp.
@@ -105,7 +105,7 @@ subroutine sfc_diag_run (im,xlat_d,xlon_d,                        &
         fhi     = fh2(i) / fh(i)
         wrk     = 1.0 - fhi
 
-        if(lsm /= lsm_ruc) then
+        if(lsm /= ilsm_ruc) then
         !-- original method
           if(have_2m) then
              ! already have 2m T & Q from lake