diff --git a/external/esmf_time_f90/ESMF_Alarm.F90 b/external/esmf_time_f90/ESMF_Alarm.F90
index 1a5f0f4d33..f25a2cc4f1 100644
--- a/external/esmf_time_f90/ESMF_Alarm.F90
+++ b/external/esmf_time_f90/ESMF_Alarm.F90
@@ -2,7 +2,7 @@
 !==============================================================================
 !
 !     ESMF Alarm Module
-      module ESMF_AlarmMod
+      module WRF_ESMF_AlarmMod
 !
 !==============================================================================
 !
@@ -16,7 +16,7 @@ module ESMF_AlarmMod
 !===============================================================================
 !BOPI
 !
-! !MODULE: ESMF_AlarmMod
+! !MODULE: WRF_ESMF_AlarmMod
 !
 ! !DESCRIPTION:
 ! Part of Time Manager F90 API wrapper of C++ implemenation
@@ -29,12 +29,12 @@ module ESMF_AlarmMod
 !------------------------------------------------------------------------------
 ! !USES:
       ! inherit from ESMF base class
-      use ESMF_BaseMod
+      use WRF_ESMF_BaseMod
 
       ! associated derived types
-      use ESMF_TimeIntervalMod, only : ESMF_TimeInterval, &
-                                       ESMF_TimeIntervalAbsValue
-      use ESMF_TimeMod,         only : ESMF_Time
+      use WRF_ESMF_TimeIntervalMod, only : ESMF_TimeInterval, &
+                                           ESMF_TimeIntervalAbsValue
+      use WRF_ESMF_TimeMod,         only : ESMF_Time
 
       implicit none
 
@@ -952,4 +952,4 @@ end subroutine ESMF_AlarmPrint
 
 !------------------------------------------------------------------------------
 
-      end module ESMF_AlarmMod
+      end module WRF_ESMF_AlarmMod
diff --git a/external/esmf_time_f90/ESMF_AlarmClock.F90 b/external/esmf_time_f90/ESMF_AlarmClock.F90
index 2a8cc4cb55..7658dd470b 100644
--- a/external/esmf_time_f90/ESMF_AlarmClock.F90
+++ b/external/esmf_time_f90/ESMF_AlarmClock.F90
@@ -2,7 +2,7 @@
 !==============================================================================
 !
 !     ESMF Alarm-Clock Module
-      module ESMF_AlarmClockMod
+      module WRF_ESMF_AlarmClockMod
 !
 !==============================================================================
 !
@@ -15,10 +15,10 @@ module ESMF_AlarmClockMod
 !===============================================================================
 !BOPI
 !
-! !MODULE: ESMF_AlarmClockMod
+! !MODULE: WRF_ESMF_AlarmClockMod
 !
 ! !DESCRIPTION:
-! Separate module that uses both ESMF_AlarmMod and ESMF_ClockMod.  
+! Separate module that uses both WRF_ESMF_AlarmMod and WRF_ESMF_ClockMod.  
 ! Separation is needed to avoid cyclic dependence.  
 !
 ! Defines F90 wrapper entry points for corresponding
@@ -29,12 +29,12 @@ module ESMF_AlarmClockMod
 !------------------------------------------------------------------------------
 ! !USES:
       ! inherit ESMF_Alarm and ESMF_Clock
-      use ESMF_AlarmMod, only : ESMF_Alarm, ESMF_AlarmSet
-      use ESMF_ClockMod, only : ESMF_Clock, ESMF_ClockAddAlarm
+      use WRF_ESMF_AlarmMod, only : ESMF_Alarm, ESMF_AlarmSet
+      use WRF_ESMF_ClockMod, only : ESMF_Clock, ESMF_ClockAddAlarm
 
       ! associated derived types
-      use ESMF_TimeIntervalMod, only : ESMF_TimeInterval
-      use ESMF_TimeMod,         only : ESMF_Time
+      use WRF_ESMF_TimeIntervalMod, only : ESMF_TimeInterval
+      use WRF_ESMF_TimeMod,         only : ESMF_Time
 
       implicit none
 
@@ -85,4 +85,4 @@ END FUNCTION ESMF_AlarmCreate
 
 !------------------------------------------------------------------------------
 
-      end module ESMF_AlarmClockMod
+      end module WRF_ESMF_AlarmClockMod
diff --git a/external/esmf_time_f90/ESMF_Base.F90 b/external/esmf_time_f90/ESMF_Base.F90
index f6ea4e753b..421e5c61ea 100644
--- a/external/esmf_time_f90/ESMF_Base.F90
+++ b/external/esmf_time_f90/ESMF_Base.F90
@@ -8,10 +8,10 @@
 !------------------------------------------------------------------------------
 ! module definition
 
-      module ESMF_BaseMod
+      module WRF_ESMF_BaseMod
  
 !BOP
-! !MODULE: ESMF_BaseMod - Base class for all ESMF classes
+! !MODULE: WRF_ESMF_BaseMod - Base class for all ESMF classes
 !
 ! !DESCRIPTION:
 !
@@ -1081,4 +1081,4 @@ end subroutine ESMF_DataTypeString
 !  overridden by higher level more specialized functions.
 !-------------------------------------------------------------------------
 
-      end module ESMF_BaseMod
+      end module WRF_ESMF_BaseMod
diff --git a/external/esmf_time_f90/ESMF_BaseTime.F90 b/external/esmf_time_f90/ESMF_BaseTime.F90
index 853fcde21d..79bfc2d6b0 100644
--- a/external/esmf_time_f90/ESMF_BaseTime.F90
+++ b/external/esmf_time_f90/ESMF_BaseTime.F90
@@ -2,7 +2,7 @@
 !==============================================================================
 !
 !     ESMF BaseTime Module
-      module ESMF_BaseTimeMod
+      module WRF_ESMF_BaseTimeMod
 !
 !==============================================================================
 !
@@ -16,7 +16,7 @@ module ESMF_BaseTimeMod
 !
 !===============================================================================
 !BOPI
-! !MODULE: ESMF_BaseTimeMod - Base ESMF time definition 
+! !MODULE: WRF_ESMF_BaseTimeMod - Base ESMF time definition 
 !
 ! !DESCRIPTION:
 ! Part of Time Manager F90 API wrapper of C++ implemenation
@@ -28,7 +28,7 @@ module ESMF_BaseTimeMod
 !
 !------------------------------------------------------------------------------
 ! !USES:
-      use ESMF_BaseMod    ! ESMF Base class
+      use WRF_ESMF_BaseMod    ! ESMF Base class
       implicit none
 !
 !------------------------------------------------------------------------------
@@ -307,4 +307,4 @@ FUNCTION ESMF_BaseTimeGE( basetime1, basetime2 )
       END FUNCTION ESMF_BaseTimeGE
 
 
-      end module ESMF_BaseTimeMod
+      end module WRF_ESMF_BaseTimeMod
diff --git a/external/esmf_time_f90/ESMF_Calendar.F90 b/external/esmf_time_f90/ESMF_Calendar.F90
index 115c008481..0ee619d2a5 100644
--- a/external/esmf_time_f90/ESMF_Calendar.F90
+++ b/external/esmf_time_f90/ESMF_Calendar.F90
@@ -2,7 +2,7 @@
 !==============================================================================
 !
 !     ESMF Calendar Module
-      module ESMF_CalendarMod
+      module WRF_ESMF_CalendarMod
 !
 !==============================================================================
 !
@@ -15,7 +15,7 @@ module ESMF_CalendarMod
 
 !==============================================================================
 !BOPI
-! !MODULE: ESMF_CalendarMod
+! !MODULE: WRF_ESMF_CalendarMod
 !
 ! !DESCRIPTION:
 ! Part of Time Manager F90 API wrapper of C++ implemenation
@@ -28,10 +28,10 @@ module ESMF_CalendarMod
 !------------------------------------------------------------------------------
 ! !USES:
       ! inherit from ESMF base class
-      use ESMF_BaseMod
+      use WRF_ESMF_BaseMod
 
       ! inherit from base time class
-      use ESMF_BaseTimeMod
+      use WRF_ESMF_BaseTimeMod
 
       implicit none
 !
@@ -273,4 +273,4 @@ function ESMF_CalendarInitialized(calendar)
 
      end function ESMF_CalendarInitialized
 
-      end module ESMF_CalendarMod
+      end module WRF_ESMF_CalendarMod
diff --git a/external/esmf_time_f90/ESMF_Clock.F90 b/external/esmf_time_f90/ESMF_Clock.F90
index d9c58390a3..25a2859f69 100644
--- a/external/esmf_time_f90/ESMF_Clock.F90
+++ b/external/esmf_time_f90/ESMF_Clock.F90
@@ -2,7 +2,7 @@
 !==============================================================================
 !
 !     ESMF Clock Module
-      module ESMF_ClockMod
+      module WRF_ESMF_ClockMod
 !     
 !==============================================================================
 !     
@@ -14,7 +14,7 @@ module ESMF_ClockMod
 
 !==============================================================================
 !BOPI
-! !MODULE: ESMF_ClockMod
+! !MODULE: WRF_ESMF_ClockMod
 !     
 ! !DESCRIPTION:
 ! Part of Time Manager F90 API wrapper of C++ implemenation
@@ -27,13 +27,13 @@ module ESMF_ClockMod
 !------------------------------------------------------------------------------
 ! !USES:
       ! inherit from ESMF base class
-      use ESMF_BaseMod
+      use WRF_ESMF_BaseMod
 
       ! associated derived types
-      use ESMF_TimeIntervalMod   ! , only : ESMF_TimeInterval, &
+      use WRF_ESMF_TimeIntervalMod   ! , only : ESMF_TimeInterval, &
                                  !          ESMF_TimeIntervalIsPositive
-      use ESMF_TimeMod           ! , only : ESMF_Time
-      use ESMF_AlarmMod,        only : ESMF_Alarm
+      use WRF_ESMF_TimeMod           ! , only : ESMF_Time
+      use WRF_ESMF_AlarmMod,        only : ESMF_Alarm
 
       implicit none
 !
@@ -98,7 +98,7 @@ module ESMF_ClockMod
 !      public ESMF_ClockGetPrevTime
 !      public ESMF_ClockGetCurrSimTime
 !      public ESMF_ClockGetPrevSimTime
-! This must be public for ESMF_AlarmClockMod...  
+! This must be public for WRF_ESMF_AlarmClockMod...  
       public ESMF_ClockAddAlarm
       public ESMF_ClockGetAlarmList
 !      public ESMF_ClockGetNumAlarms
@@ -887,7 +887,7 @@ end subroutine ESMF_ClockSyncToWallClock
       subroutine ESMF_ClockAdvance(clock, RingingAlarmList, &
                                    NumRingingAlarms, rc)
 
-use esmf_timemod
+use WRF_ESMF_TimeMod
 
 ! !ARGUMENTS:
       type(ESMF_Clock), intent(inout) :: clock
@@ -1339,4 +1339,4 @@ end subroutine ESMF_ClockPrint
 
 !------------------------------------------------------------------------------
 
-      end module ESMF_ClockMod
+      end module WRF_ESMF_ClockMod
diff --git a/external/esmf_time_f90/ESMF_Mod.F90 b/external/esmf_time_f90/ESMF_Mod.F90
index 8c4c260cfc..c0c832f674 100644
--- a/external/esmf_time_f90/ESMF_Mod.F90
+++ b/external/esmf_time_f90/ESMF_Mod.F90
@@ -1,16 +1,16 @@
 ! TBH:  This version is for use with the ESMF library embedded in the WRF 
 ! TBH:  distribution.  
 MODULE ESMF_Mod
-   USE esmf_alarmmod
-   USE esmf_basemod
-   USE esmf_basetimemod
-   USE esmf_calendarmod
-   USE esmf_clockmod
+   USE WRF_ESMF_AlarmMod
+   USE WRF_ESMF_BaseMod
+   USE WRF_ESMF_BaseTimeMod
+   USE WRF_ESMF_CalendarMod
+   USE WRF_ESMF_ClockMod
    USE esmf_fractionmod
-   USE esmf_timeintervalmod
-   USE esmf_timemod
-   USE esmf_alarmclockmod
-   USE esmf_stubs   ! add new dummy interfaces and typedefs here as needed
+   USE WRF_ESMF_TimeIntervalMod
+   USE WRF_ESMF_TimeMod
+   USE WRF_ESMF_AlarmClockMod
+   USE WRF_ESMF_Stubs   ! add new dummy interfaces and typedefs here as needed
 #include <ESMF_TimeMgr.inc>
    INTEGER, PARAMETER :: ESMF_MAX_ALARMS=MAX_ALARMS
 !
diff --git a/external/esmf_time_f90/ESMF_Stubs.F90 b/external/esmf_time_f90/ESMF_Stubs.F90
index 21f074a18c..73687ea65d 100644
--- a/external/esmf_time_f90/ESMF_Stubs.F90
+++ b/external/esmf_time_f90/ESMF_Stubs.F90
@@ -2,7 +2,7 @@
 ! mimicking newer ESMF interface features without necessarily implementing 
 ! them.  
 
-MODULE ESMF_Stubs
+MODULE WRF_ESMF_Stubs
 
    IMPLICIT NONE
 
@@ -49,8 +49,8 @@ MODULE ESMF_Stubs
 
 ! NOOP
    SUBROUTINE ESMF_Initialize( vm, defaultcalkind, rc )
-      USE esmf_basemod
-      USE esmf_calendarmod
+      USE WRF_ESMF_BaseMod
+      USE WRF_ESMF_CalendarMod
       TYPE(ESMF_VM),           INTENT(IN   ), OPTIONAL :: vm
       TYPE(ESMF_CalendarType), INTENT(IN   ), OPTIONAL :: defaultcalkind
       INTEGER,                 INTENT(  OUT), OPTIONAL :: rc
@@ -90,7 +90,7 @@ END FUNCTION ESMF_IsInitialized
 
 ! NOOP
    SUBROUTINE ESMF_Finalize( rc )
-      USE esmf_basemod
+      USE WRF_ESMF_BaseMod
       INTEGER, INTENT(  OUT), OPTIONAL :: rc
 #if (defined SPMD) || (defined COUP_CSM)
 #include <mpif.h>
@@ -115,7 +115,7 @@ END SUBROUTINE ESMF_Finalize
 
 ! NOOP
    SUBROUTINE ESMF_LogWrite( msg, MsgType, line, file, method, log, rc )
-      USE esmf_basemod
+      USE WRF_ESMF_BaseMod
       CHARACTER(LEN=*), INTENT(IN) :: msg
       TYPE(ESMF_MsgType), INTENT(IN) :: msgtype
       INTEGER, INTENT(IN), OPTIONAL :: line
@@ -127,6 +127,6 @@ SUBROUTINE ESMF_LogWrite( msg, MsgType, line, file, method, log, rc )
    END SUBROUTINE ESMF_LogWrite
 
 
-END MODULE ESMF_Stubs
+END MODULE WRF_ESMF_Stubs
 
 
diff --git a/external/esmf_time_f90/ESMF_Time.F90 b/external/esmf_time_f90/ESMF_Time.F90
index 0daccd598f..809331a181 100644
--- a/external/esmf_time_f90/ESMF_Time.F90
+++ b/external/esmf_time_f90/ESMF_Time.F90
@@ -2,7 +2,7 @@
 !==============================================================================
 !
 !     ESMF Time Module
-      module ESMF_TimeMod
+      module WRF_ESMF_TimeMod
 !
 !==============================================================================
 !
@@ -14,7 +14,7 @@ module ESMF_TimeMod
 
 !==============================================================================
 !BOPI
-! !MODULE: ESMF_TimeMod
+! !MODULE: WRF_ESMF_TimeMod
 !
 ! !DESCRIPTION:
 ! Part of Time Manager F90 API wrapper of C++ implemenation
@@ -27,15 +27,15 @@ module ESMF_TimeMod
 !------------------------------------------------------------------------------
 ! !USES:
       ! inherit from ESMF base class
-      use ESMF_BaseMod
+      use WRF_ESMF_BaseMod
 
       ! inherit from base time class
-      use ESMF_BaseTimeMod
+      use WRF_ESMF_BaseTimeMod
 
       ! associated derived types
-      use ESMF_TimeIntervalMod
-      use ESMF_CalendarMod
-      use ESMF_Stubs
+      use WRF_ESMF_TimeIntervalMod
+      use WRF_ESMF_CalendarMod
+      use WRF_ESMF_Stubs
 
       implicit none
 !
@@ -1177,4 +1177,4 @@ subroutine ESMF_TimeCopy(timeout, timein)
 
       end subroutine ESMF_TimeCopy
 
-      end module ESMF_TimeMod
+      end module WRF_ESMF_TimeMod
diff --git a/external/esmf_time_f90/ESMF_TimeInterval.F90 b/external/esmf_time_f90/ESMF_TimeInterval.F90
index 061deb084c..238b327a1b 100644
--- a/external/esmf_time_f90/ESMF_TimeInterval.F90
+++ b/external/esmf_time_f90/ESMF_TimeInterval.F90
@@ -2,7 +2,7 @@
 !==============================================================================
 !
 !     ESMF TimeInterval Module
-      module ESMF_TimeIntervalMod
+      module WRF_ESMF_TimeIntervalMod
 !
 !==============================================================================
 !
@@ -15,7 +15,7 @@ module ESMF_TimeIntervalMod
 !
 !===============================================================================
 !BOPI
-! !MODULE: ESMF_TimeIntervalMod
+! !MODULE: WRF_ESMF_TimeIntervalMod
 !
 ! !DESCRIPTION:
 ! Part of Time Manager F90 API wrapper of C++ implemenation
@@ -28,14 +28,14 @@ module ESMF_TimeIntervalMod
 !------------------------------------------------------------------------------
 ! !USES:
       ! inherit from ESMF base class
-      use ESMF_BaseMod
+      use WRF_ESMF_BaseMod
 
       ! inherit from base time class
-      use ESMF_BaseTimeMod
+      use WRF_ESMF_BaseTimeMod
 
       ! associated derived types
       use ESMF_FractionMod, only : ESMF_Fraction
-      use ESMF_CalendarMod
+      use WRF_ESMF_CalendarMod
 
       implicit none
 !
@@ -1255,6 +1255,6 @@ function ESMF_TimeIntervalIsPositive(timeinterval)
                                                          zerotimeint )
       end function ESMF_TimeIntervalIsPositive
 
-      end module ESMF_TimeIntervalMod
+      end module WRF_ESMF_TimeIntervalMod
 
 
diff --git a/external/esmf_time_f90/Meat.F90 b/external/esmf_time_f90/Meat.F90
index a100229b2d..0cc58ba2a2 100644
--- a/external/esmf_time_f90/Meat.F90
+++ b/external/esmf_time_f90/Meat.F90
@@ -5,8 +5,8 @@
 ! YR and MM fields are ignored.  
 
 SUBROUTINE normalize_basetime( basetime )
-  USE esmf_basemod
-  USE esmf_basetimemod
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
   IMPLICIT NONE
   TYPE(ESMF_BaseTime), INTENT(INOUT) :: basetime
   !BPR BEGIN
@@ -78,9 +78,9 @@ END SUBROUTINE normalize_basetime
 ! A normalized time has time%basetime >= 0, time%basetime less than the current 
 ! year expressed as a timeInterval, and time%YR can take any value
 SUBROUTINE normalize_time( time )
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_timemod
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_TimeMod
   IMPLICIT NONE
   TYPE(ESMF_Time), INTENT(INOUT) :: time
   INTEGER(ESMF_KIND_I8) :: nsecondsinyear
@@ -129,8 +129,8 @@ END SUBROUTINE normalize_time
 
 
 SUBROUTINE normalize_timeint( timeInt )
-  USE esmf_basetimemod
-  USE esmf_timeintervalmod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_TimeIntervalMod
   IMPLICIT NONE
   TYPE(ESMF_TimeInterval), INTENT(INOUT) :: timeInt
 
@@ -147,9 +147,9 @@ FUNCTION signnormtimeint ( timeInt )
   ! Compute the sign of a time interval.  
   ! YR and MM fields are *IGNORED*.  
   ! returns 1, 0, or -1 or exits if timeInt fields have inconsistent signs.
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_timeintervalmod
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_TimeIntervalMod
   IMPLICIT NONE
   TYPE(ESMF_TimeInterval), INTENT(IN) :: timeInt
   INTEGER :: signnormtimeint
@@ -183,7 +183,7 @@ END FUNCTION signnormtimeint
 
 ! Exits with error message if timeInt is not normalized.  
 SUBROUTINE timeintchecknormalized( timeInt, msgstr )
-  USE esmf_timeintervalmod
+  USE WRF_ESMF_TimeIntervalMod
   IMPLICIT NONE
   TYPE(ESMF_TimeInterval), INTENT(IN) :: timeInt
   CHARACTER(LEN=*), INTENT(IN) :: msgstr
@@ -245,7 +245,7 @@ END FUNCTION ndaysinyear
 
 FUNCTION nsecondsinyear ( year ) RESULT (numseconds)
   ! Compute the number of seconds in the given year
-  USE esmf_basemod
+  USE WRF_ESMF_BaseMod
   IMPLICIT NONE
   INTEGER, INTENT(IN) :: year
   INTEGER(ESMF_KIND_I8) :: numseconds
@@ -256,9 +256,9 @@ END FUNCTION nsecondsinyear
 
 
 SUBROUTINE initdaym 
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE ESMF_CalendarMod, only : months_per_year, mday, daym, mdaycum, monthbdys, &
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_CalendarMod, only : months_per_year, mday, daym, mdaycum, monthbdys, &
                                mdayleap, mdayleapcum, monthbdysleap, daymleap
   IMPLICIT NONE
   INTEGER i,j,m
@@ -301,7 +301,7 @@ END SUBROUTINE initdaym
 
 !$$$ useful, but not used at the moment...  
 SUBROUTINE compute_dayinyear(YR,MM,DD,dayinyear)
-  use ESMF_CalendarMod, only : mday
+  use WRF_ESMF_CalendarMod, only : mday
 IMPLICIT NONE
       INTEGER, INTENT(IN)  :: YR,MM,DD   ! DD is day of month
       INTEGER, INTENT(OUT) :: dayinyear
@@ -326,10 +326,10 @@ END SUBROUTINE compute_dayinyear
 
 
 SUBROUTINE timegetmonth( time, MM )
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_timemod
-  USE ESMF_CalendarMod, only : MONTHS_PER_YEAR, monthbdys, monthbdysleap
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_TimeMod
+  USE WRF_ESMF_CalendarMod, only : MONTHS_PER_YEAR, monthbdys, monthbdysleap
   IMPLICIT NONE
   TYPE(ESMF_Time), INTENT(IN) :: time
   INTEGER, INTENT(OUT) :: MM
@@ -365,10 +365,10 @@ END SUBROUTINE timegetmonth
 !$$$ may need to change dependencies in Makefile...  
 
 SUBROUTINE timegetdayofmonth( time, DD )
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_timemod
-  USE esmf_calendarmod, only : monthbdys, monthbdysleap
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_TimeMod
+  USE WRF_ESMF_CalendarMod, only : monthbdys, monthbdysleap
   IMPLICIT NONE
   TYPE(ESMF_Time), INTENT(IN) :: time
   INTEGER, INTENT(OUT) :: DD
@@ -395,10 +395,10 @@ END SUBROUTINE timegetdayofmonth
 ! 1 <= MM <= 12
 ! Time is NOT normalized.  
 SUBROUTINE timeaddmonths( time, MM, ierr )
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_timemod
-  USE esmf_calendarmod, only : MONTHS_PER_YEAR, monthbdys, monthbdysleap
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_TimeMod
+  USE WRF_ESMF_CalendarMod, only : MONTHS_PER_YEAR, monthbdys, monthbdysleap
   IMPLICIT NONE
   TYPE(ESMF_Time), INTENT(INOUT) :: time
   INTEGER, INTENT(IN) :: MM
@@ -426,10 +426,10 @@ END SUBROUTINE timeaddmonths
 ! Increment Time by number of seconds in the current month.  
 ! Time is NOT normalized.  
 SUBROUTINE timeincmonth( time )
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_timemod
-  USE esmf_calendarmod, only : mday, mdayleap
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_TimeMod
+  USE WRF_ESMF_CalendarMod, only : mday, mdayleap
   IMPLICIT NONE
   TYPE(ESMF_Time), INTENT(INOUT) :: time
   ! locals
@@ -454,10 +454,10 @@ END SUBROUTINE timeincmonth
 ! Decrement Time by number of seconds in the previous month.  
 ! Time is NOT normalized.  
 SUBROUTINE timedecmonth( time )
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_timemod
-  USE esmf_calendarmod, only : mday, months_per_year, mdayleap
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_TimeMod
+  USE WRF_ESMF_CalendarMod, only : mday, months_per_year, mdayleap
   IMPLICIT NONE
   TYPE(ESMF_Time), INTENT(INOUT) :: time
   ! locals
@@ -487,9 +487,9 @@ END SUBROUTINE timedecmonth
 
 ! spaceship operator for Times
 SUBROUTINE timecmp(time1, time2, retval )
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_timemod
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_TimeMod
   IMPLICIT NONE
   INTEGER, INTENT(OUT) :: retval
 !
@@ -507,9 +507,9 @@ END SUBROUTINE timecmp
 
 ! spaceship operator for TimeIntervals
 SUBROUTINE timeintcmp(timeint1, timeint2, retval )
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_timeintervalmod
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_TimeIntervalMod
   IMPLICIT NONE
   INTEGER, INTENT(OUT) :: retval
 !
@@ -528,7 +528,7 @@ END SUBROUTINE timeintcmp
 
 ! spaceship operator for seconds + Sn/Sd
 SUBROUTINE seccmp(S1, Sn1, Sd1, S2, Sn2, Sd2, retval )
-  USE esmf_basemod
+  USE WRF_ESMF_BaseMod
   IMPLICIT NONE
   INTEGER, INTENT(OUT) :: retval
 !
@@ -557,14 +557,14 @@ END SUBROUTINE seccmp
 
 
 SUBROUTINE c_esmc_basetimeeq (time1, time2, outflag)
-  USE esmf_alarmmod
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_calendarmod
-  USE esmf_clockmod
+  USE WRF_ESMF_AlarmMod
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_CalendarMod
+  USE WRF_ESMF_ClockMod
   USE esmf_fractionmod
-  USE esmf_timeintervalmod
-  USE esmf_timemod
+  USE WRF_ESMF_TimeIntervalMod
+  USE WRF_ESMF_TimeMod
 IMPLICIT NONE
       logical, intent(OUT) :: outflag
       type(ESMF_Time), intent(in) :: time1
@@ -574,14 +574,14 @@ SUBROUTINE c_esmc_basetimeeq (time1, time2, outflag)
       outflag = (res .EQ. 0)
 END SUBROUTINE c_esmc_basetimeeq
 SUBROUTINE c_esmc_basetimege(time1, time2, outflag)
-  USE esmf_alarmmod
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_calendarmod
-  USE esmf_clockmod
+  USE WRF_ESMF_AlarmMod
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_CalendarMod
+  USE WRF_ESMF_ClockMod
   USE esmf_fractionmod
-  USE esmf_timeintervalmod
-  USE esmf_timemod
+  USE WRF_ESMF_TimeIntervalMod
+  USE WRF_ESMF_TimeMod
       logical, intent(OUT) :: outflag
       type(ESMF_Time), intent(in) :: time1
       type(ESMF_Time), intent(in) :: time2
@@ -590,14 +590,14 @@ SUBROUTINE c_esmc_basetimege(time1, time2, outflag)
       outflag = (res .EQ. 1 .OR. res .EQ. 0)
 END SUBROUTINE c_esmc_basetimege
 SUBROUTINE c_esmc_basetimegt(time1, time2, outflag)
-  USE esmf_alarmmod
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_calendarmod
-  USE esmf_clockmod
+  USE WRF_ESMF_AlarmMod
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_CalendarMod
+  USE WRF_ESMF_ClockMod
   USE esmf_fractionmod
-  USE esmf_timeintervalmod
-  USE esmf_timemod
+  USE WRF_ESMF_TimeIntervalMod
+  USE WRF_ESMF_TimeMod
 IMPLICIT NONE
       logical, intent(OUT) :: outflag
       type(ESMF_Time), intent(in) :: time1
@@ -607,14 +607,14 @@ SUBROUTINE c_esmc_basetimegt(time1, time2, outflag)
       outflag = (res .EQ. 1)
 END SUBROUTINE c_esmc_basetimegt
 SUBROUTINE c_esmc_basetimele(time1, time2, outflag)
-  USE esmf_alarmmod
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_calendarmod
-  USE esmf_clockmod
+  USE WRF_ESMF_AlarmMod
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_CalendarMod
+  USE WRF_ESMF_ClockMod
   USE esmf_fractionmod
-  USE esmf_timeintervalmod
-  USE esmf_timemod
+  USE WRF_ESMF_TimeIntervalMod
+  USE WRF_ESMF_TimeMod
 IMPLICIT NONE
       logical, intent(OUT) :: outflag
       type(ESMF_Time), intent(in) :: time1
@@ -624,14 +624,14 @@ SUBROUTINE c_esmc_basetimele(time1, time2, outflag)
       outflag = (res .EQ. -1 .OR. res .EQ. 0)
 END SUBROUTINE c_esmc_basetimele
 SUBROUTINE c_esmc_basetimelt(time1, time2, outflag)
-  USE esmf_alarmmod
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_calendarmod
-  USE esmf_clockmod
+  USE WRF_ESMF_AlarmMod
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_CalendarMod
+  USE WRF_ESMF_ClockMod
   USE esmf_fractionmod
-  USE esmf_timeintervalmod
-  USE esmf_timemod
+  USE WRF_ESMF_TimeIntervalMod
+  USE WRF_ESMF_TimeMod
 IMPLICIT NONE
       logical, intent(OUT) :: outflag
       type(ESMF_Time), intent(in) :: time1
@@ -641,14 +641,14 @@ SUBROUTINE c_esmc_basetimelt(time1, time2, outflag)
       outflag = (res .EQ. -1)
 END SUBROUTINE c_esmc_basetimelt
 SUBROUTINE c_esmc_basetimene(time1, time2, outflag)
-  USE esmf_alarmmod
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_calendarmod
-  USE esmf_clockmod
+  USE WRF_ESMF_AlarmMod
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_CalendarMod
+  USE WRF_ESMF_ClockMod
   USE esmf_fractionmod
-  USE esmf_timeintervalmod
-  USE esmf_timemod
+  USE WRF_ESMF_TimeIntervalMod
+  USE WRF_ESMF_TimeMod
 IMPLICIT NONE
       logical, intent(OUT) :: outflag
       type(ESMF_Time), intent(in) :: time1
@@ -659,7 +659,7 @@ SUBROUTINE c_esmc_basetimene(time1, time2, outflag)
 END SUBROUTINE c_esmc_basetimene
 
 SUBROUTINE c_esmc_basetimeinteq(timeint1, timeint2, outflag)
-  USE esmf_timeintervalmod
+  USE WRF_ESMF_TimeIntervalMod
   IMPLICIT NONE
   LOGICAL, INTENT(OUT) :: outflag
   TYPE(ESMF_TimeInterval), INTENT(IN) :: timeint1
@@ -669,7 +669,7 @@ SUBROUTINE c_esmc_basetimeinteq(timeint1, timeint2, outflag)
   outflag = (res .EQ. 0)
 END SUBROUTINE c_esmc_basetimeinteq
 SUBROUTINE c_esmc_basetimeintne(timeint1, timeint2, outflag)
-  USE esmf_timeintervalmod
+  USE WRF_ESMF_TimeIntervalMod
   IMPLICIT NONE
   LOGICAL, INTENT(OUT) :: outflag
   TYPE(ESMF_TimeInterval), INTENT(IN) :: timeint1
@@ -679,7 +679,7 @@ SUBROUTINE c_esmc_basetimeintne(timeint1, timeint2, outflag)
   outflag = (res .NE. 0)
 END SUBROUTINE c_esmc_basetimeintne
 SUBROUTINE c_esmc_basetimeintlt(timeint1, timeint2, outflag)
-  USE esmf_timeintervalmod
+  USE WRF_ESMF_TimeIntervalMod
   IMPLICIT NONE
   LOGICAL, INTENT(OUT) :: outflag
   TYPE(ESMF_TimeInterval), INTENT(IN) :: timeint1
@@ -689,7 +689,7 @@ SUBROUTINE c_esmc_basetimeintlt(timeint1, timeint2, outflag)
   outflag = (res .LT. 0)
 END SUBROUTINE c_esmc_basetimeintlt
 SUBROUTINE c_esmc_basetimeintgt(timeint1, timeint2, outflag)
-  USE esmf_timeintervalmod
+  USE WRF_ESMF_TimeIntervalMod
   IMPLICIT NONE
   LOGICAL, INTENT(OUT) :: outflag
   TYPE(ESMF_TimeInterval), INTENT(IN) :: timeint1
@@ -699,7 +699,7 @@ SUBROUTINE c_esmc_basetimeintgt(timeint1, timeint2, outflag)
   outflag = (res .GT. 0)
 END SUBROUTINE c_esmc_basetimeintgt
 SUBROUTINE c_esmc_basetimeintle(timeint1, timeint2, outflag)
-  USE esmf_timeintervalmod
+  USE WRF_ESMF_TimeIntervalMod
   IMPLICIT NONE
   LOGICAL, INTENT(OUT) :: outflag
   TYPE(ESMF_TimeInterval), INTENT(IN) :: timeint1
@@ -709,7 +709,7 @@ SUBROUTINE c_esmc_basetimeintle(timeint1, timeint2, outflag)
   outflag = (res .LE. 0)
 END SUBROUTINE c_esmc_basetimeintle
 SUBROUTINE c_esmc_basetimeintge(timeint1, timeint2, outflag)
-  USE esmf_timeintervalmod
+  USE WRF_ESMF_TimeIntervalMod
   IMPLICIT NONE
   LOGICAL, INTENT(OUT) :: outflag
   TYPE(ESMF_TimeInterval), INTENT(IN) :: timeint1
@@ -720,7 +720,7 @@ SUBROUTINE c_esmc_basetimeintge(timeint1, timeint2, outflag)
 END SUBROUTINE c_esmc_basetimeintge
 
 SUBROUTINE compute_lcd( e1, e2, lcd )
-  USE esmf_basemod
+  USE WRF_ESMF_BaseMod
       IMPLICIT NONE
       INTEGER(ESMF_KIND_I8), INTENT(IN) :: e1, e2
       INTEGER(ESMF_KIND_I8), INTENT(OUT) :: lcd
@@ -745,7 +745,7 @@ SUBROUTINE compute_lcd( e1, e2, lcd )
 END SUBROUTINE compute_lcd
 
 SUBROUTINE simplify( ni, di, no, do ) 
-  USE esmf_basemod
+  USE WRF_ESMF_BaseMod
     IMPLICIT NONE
     INTEGER(ESMF_KIND_I8), INTENT(IN)  :: ni, di
     INTEGER(ESMF_KIND_I8), INTENT(OUT) :: no, do
@@ -786,7 +786,7 @@ END SUBROUTINE simplify
 !BPR BEGIN
 ! Same as simplify above, but allows user to choose the number of primes to check
 SUBROUTINE simplify_numprimes( ni, di, no, do, num_primes_to_check )
-  USE esmf_basemod
+  USE WRF_ESMF_BaseMod
     IMPLICIT NONE
     INTEGER(ESMF_KIND_I8), INTENT(IN)  :: ni, di
     INTEGER(ESMF_KIND_I8), INTENT(OUT) :: no, do
@@ -839,10 +839,10 @@ END SUBROUTINE simplify_numprimes
 
 !$$$ this should be named "c_esmc_timesum" or something less misleading
 SUBROUTINE c_esmc_basetimesum( time1, timeinterval, timeOut )
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_timeintervalmod
-  USE esmf_timemod
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_TimeIntervalMod
+  USE WRF_ESMF_TimeMod
   IMPLICIT NONE
   TYPE(ESMF_Time), INTENT(IN) :: time1
   TYPE(ESMF_TimeInterval), INTENT(IN) :: timeinterval
@@ -872,10 +872,10 @@ END SUBROUTINE c_esmc_basetimesum
 
 !$$$ this should be named "c_esmc_timedec" or something less misleading
 SUBROUTINE c_esmc_basetimedec( time1, timeinterval, timeOut )
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_timeintervalmod
-  USE esmf_timemod
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_TimeIntervalMod
+  USE WRF_ESMF_TimeMod
   IMPLICIT NONE
   TYPE(ESMF_Time), INTENT(IN) :: time1
   TYPE(ESMF_TimeInterval), INTENT(IN) :: timeinterval
@@ -899,10 +899,10 @@ END SUBROUTINE c_esmc_basetimedec
 
 !$$$ this should be named "c_esmc_timediff" or something less misleading
 SUBROUTINE c_esmc_basetimediff( time1, time2, timeIntOut )
-  USE esmf_basemod
-  USE esmf_basetimemod
-  USE esmf_timeintervalmod
-  USE esmf_timemod
+  USE WRF_ESMF_BaseMod
+  USE WRF_ESMF_BaseTimeMod
+  USE WRF_ESMF_TimeIntervalMod
+  USE WRF_ESMF_TimeMod
   IMPLICIT NONE
   TYPE(ESMF_Time), INTENT(IN) :: time1
   TYPE(ESMF_Time), INTENT(IN) :: time2
@@ -935,7 +935,7 @@ END SUBROUTINE c_esmc_basetimediff
 ! denominator is zero, return empty string.
 ! INTEGER*8 interface.  
 SUBROUTINE fraction_to_stringi8( numerator, denominator, frac_str )
-  USE ESMF_basemod
+  USE WRF_ESMF_BaseMod
   IMPLICIT NONE
   INTEGER(ESMF_KIND_I8), INTENT(IN) :: numerator
   INTEGER(ESMF_KIND_I8), INTENT(IN) :: denominator
@@ -961,7 +961,7 @@ END SUBROUTINE fraction_to_stringi8
 ! denominator is zero, return empty string.
 ! INTEGER interface.  
 SUBROUTINE fraction_to_string( numerator, denominator, frac_str )
-  USE ESMF_basemod
+  USE WRF_ESMF_BaseMod
   IMPLICIT NONE
   INTEGER, INTENT(IN) :: numerator
   INTEGER, INTENT(IN) :: denominator
@@ -975,8 +975,8 @@ END SUBROUTINE fraction_to_string
 
 
 SUBROUTINE print_a_time( time )
-   use ESMF_basemod
-   use ESMF_Timemod
+   use WRF_ESMF_BaseMod
+   use WRF_ESMF_TimeMod
    IMPLICIT NONE
    type(ESMF_Time) time
    character*128 :: s
@@ -987,8 +987,8 @@ SUBROUTINE print_a_time( time )
 END SUBROUTINE print_a_time
 
 SUBROUTINE print_a_timeinterval( time )
-   use ESMF_basemod
-   use ESMF_TimeIntervalmod
+   use WRF_ESMF_BaseMod
+   use WRF_ESMF_TimeIntervalMod
    IMPLICIT NONE
    type(ESMF_TimeInterval) time
    character*128 :: s