diff --git a/src/Infrastructure/Field/interface/ESMF_Field_C.F90 b/src/Infrastructure/Field/interface/ESMF_Field_C.F90
index f634d2fe0f..2d750394ed 100644
--- a/src/Infrastructure/Field/interface/ESMF_Field_C.F90
+++ b/src/Infrastructure/Field/interface/ESMF_Field_C.F90
@@ -735,9 +735,9 @@ subroutine f_esmf_fieldcollectgarbage(field, rc)
     implicit none
 
     type(ESMF_Field)      :: field
-    integer, intent(out)  :: rc     
+    integer, intent(out)  :: rc
   
-    integer :: localrc              
+    integer :: localrc
   
     ! initialize return code; assume routine not implemented
     localrc = ESMF_RC_NOT_IMPL
@@ -751,15 +751,15 @@ subroutine f_esmf_fieldcollectgarbage(field, rc)
       if (ESMF_LogFoundError(localrc, &
         ESMF_ERR_PASSTHRU, &
         ESMF_CONTEXT, rcToReturn=rc)) return
-      ! deallocate actual FieldType allocation      
+      ! deallocate actual FieldType allocation
       !print *, "deallocate(field%ftypep)"
       deallocate(field%ftypep, stat=localrc)
-      if (ESMF_LogFoundAllocError(localrc, msg="Deallocating Field", &
+      if (ESMF_LogFoundDeallocError(localrc, msg="Deallocating Field", &
         ESMF_CONTEXT, rcToReturn=rc)) return
     endif
     nullify(field%ftypep)
 
-    ! return successfully  
+    ! return successfully
     rc = ESMF_SUCCESS
 
   end subroutine f_esmf_fieldcollectgarbage
diff --git a/src/Infrastructure/FieldBundle/interface/ESMF_FieldBundle_C.F90 b/src/Infrastructure/FieldBundle/interface/ESMF_FieldBundle_C.F90
index 366f16861c..6cbba80a56 100644
--- a/src/Infrastructure/FieldBundle/interface/ESMF_FieldBundle_C.F90
+++ b/src/Infrastructure/FieldBundle/interface/ESMF_FieldBundle_C.F90
@@ -94,9 +94,9 @@ subroutine f_esmf_fbundlecollectgarbage(fb, rc)
         ESMF_ERR_PASSTHRU, &
         ESMF_CONTEXT, &
         rcToReturn=rc)) return
-      ! deallocate actual FieldBundleType allocation      
+      ! deallocate actual FieldBundleType allocation
       deallocate(fb%this, stat=localrc)
-      if (ESMF_LogFoundAllocError(localrc, msg="Deallocating FieldBundle", &
+      if (ESMF_LogFoundDeallocError(localrc, msg="Deallocating FieldBundle", &
         ESMF_CONTEXT, &
         rcToReturn=rc)) return
     endif
diff --git a/src/Infrastructure/LocStream/interface/ESMF_LocStream_C.F90 b/src/Infrastructure/LocStream/interface/ESMF_LocStream_C.F90
index 892eeedfe4..e3e3210550 100644
--- a/src/Infrastructure/LocStream/interface/ESMF_LocStream_C.F90
+++ b/src/Infrastructure/LocStream/interface/ESMF_LocStream_C.F90
@@ -211,15 +211,15 @@ subroutine f_esmf_locstreamcollectgarbage(locstream, rc)
       ESMF_ERR_PASSTHRU, &
       ESMF_CONTEXT, rcToReturn=rc)) return
 
-    ! deallocate actual LocStreamType allocation      
+    ! deallocate actual LocStreamType allocation
     if (associated(locstream%lstypep)) then
       deallocate(locstream%lstypep, stat=localrc)
-      if (ESMF_LogFoundAllocError(localrc, msg="Deallocating LocStream", &
+      if (ESMF_LogFoundDeallocError(localrc, msg="Deallocating LocStream", &
         ESMF_CONTEXT, rcToReturn=rc)) return
     endif
     nullify(locstream%lstypep)
 
-    ! return successfully  
+    ! return successfully
     rc = ESMF_SUCCESS
 
   end subroutine f_esmf_locstreamcollectgarbage
diff --git a/src/Superstructure/Component/interface/ESMF_Comp_C.F90 b/src/Superstructure/Component/interface/ESMF_Comp_C.F90
index 8bfbdfc9ae..e18736d1b3 100644
--- a/src/Superstructure/Component/interface/ESMF_Comp_C.F90
+++ b/src/Superstructure/Component/interface/ESMF_Comp_C.F90
@@ -511,15 +511,15 @@ recursive subroutine f_esmf_compcollectgarbage2(comp, rc)
     ESMF_ERR_PASSTHRU, &
     ESMF_CONTEXT, rcToReturn=rc)) return
 
-  ! deallocate actual CompClass allocation      
+  ! deallocate actual CompClass allocation
   if (associated(comp%compp)) then
     deallocate(comp%compp, stat=localrc)
-    if (ESMF_LogFoundAllocError(localrc, msg="Deallocating Comp", &
+    if (ESMF_LogFoundDeallocError(localrc, msg="Deallocating Comp", &
       ESMF_CONTEXT, rcToReturn=rc)) return
   endif
   nullify(comp%compp)
 
-  ! return successfully  
+  ! return successfully
   rc = ESMF_SUCCESS
 
 end subroutine f_esmf_compcollectgarbage2
diff --git a/src/Superstructure/State/interface/ESMF_State_C.F90 b/src/Superstructure/State/interface/ESMF_State_C.F90
index 88f3f7eae9..e60c6c3e3d 100644
--- a/src/Superstructure/State/interface/ESMF_State_C.F90
+++ b/src/Superstructure/State/interface/ESMF_State_C.F90
@@ -476,16 +476,16 @@ subroutine f_esmf_statecollectgarbage(state, rc)
         ESMF_ERR_PASSTHRU, &
         ESMF_CONTEXT, &
         rcToReturn=rc)) return
-      ! deallocate actual StateClass allocation      
+      ! deallocate actual StateClass allocation
       deallocate(state%statep, stat=localrc)
       localrc = merge (ESMF_SUCCESS, ESMF_RC_MEM_DEALLOCATE, localrc == 0)
-      if (ESMF_LogFoundAllocError(localrc, msg="Deallocating State", &
+      if (ESMF_LogFoundDeallocError(localrc, msg="Deallocating State", &
         ESMF_CONTEXT, &
         rcToReturn=rc)) return
     endif
     nullify(state%statep)
 
-    ! return successfully  
+    ! return successfully
     rc = ESMF_SUCCESS
 
   end subroutine f_esmf_statecollectgarbage