diff --git a/Examples/MAX32690/Bluetooth/BLE_FreeRTOS/freertos_tickless.c b/Examples/MAX32690/Bluetooth/BLE_FreeRTOS/freertos_tickless.c
index 9b282eade9..53b76ff2c0 100644
--- a/Examples/MAX32690/Bluetooth/BLE_FreeRTOS/freertos_tickless.c
+++ b/Examples/MAX32690/Bluetooth/BLE_FreeRTOS/freertos_tickless.c
@@ -160,7 +160,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     /* Determine if we need to snapshot the PalBb clock */
     if (schTimerActive) {
         /* Snapshot the current WUT value with the PalBb clock */
-        MXC_WUT_Store(MXC_WUT0);
+        MXC_WUT_StoreCount(MXC_WUT0);
         preCapture = MXC_WUT_GetCount(MXC_WUT0);
         schUsec = PalTimerGetExpTime();
 
@@ -176,7 +176,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
         }
     } else {
         /* Snapshot the current WUT value */
-        MXC_WUT_Edge(MXC_WUT0);
+        MXC_WUT_WaitForEdge(MXC_WUT0);
         preCapture = MXC_WUT_GetCount(MXC_WUT0);
         bleSleepTicks = 0;
         schUsec = 0;
@@ -237,7 +237,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     }
 
     /* Recalculate dsWutTicks for the FreeRTOS tick counter update */
-    MXC_WUT_Edge(MXC_WUT0);
+    MXC_WUT_WaitForEdge(MXC_WUT0);
     postCapture = MXC_WUT_GetCount(MXC_WUT0);
     dsWutTicks = postCapture - preCapture;
 
diff --git a/Examples/MAX32690/Bluetooth/RF_Test/freertos_tickless.c b/Examples/MAX32690/Bluetooth/RF_Test/freertos_tickless.c
index 4d9949f0af..d910bc4972 100644
--- a/Examples/MAX32690/Bluetooth/RF_Test/freertos_tickless.c
+++ b/Examples/MAX32690/Bluetooth/RF_Test/freertos_tickless.c
@@ -160,7 +160,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     /* Determine if we need to snapshot the PalBb clock */
     if (schTimerActive) {
         /* Snapshot the current WUT value with the PalBb clock */
-        MXC_WUT_Store(MXC_WUT0);
+        MXC_WUT_StoreCount(MXC_WUT0);
         preCapture = MXC_WUT_GetCount(MXC_WUT0);
         schUsec = PalTimerGetExpTime();
 
@@ -176,7 +176,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
         }
     } else {
         /* Snapshot the current WUT value */
-        MXC_WUT_Edge(MXC_WUT0);
+        MXC_WUT_WaitForEdge(MXC_WUT0);
         preCapture = MXC_WUT_GetCount(MXC_WUT0);
         bleSleepTicks = 0;
         schUsec = 0;
@@ -238,7 +238,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     }
 
     /* Recalculate dsWutTicks for the FreeRTOS tick counter update */
-    MXC_WUT_Edge(MXC_WUT0);
+    MXC_WUT_WaitForEdge(MXC_WUT0);
     postCapture = MXC_WUT_GetCount(MXC_WUT0);
     dsWutTicks = postCapture - preCapture;
 
diff --git a/Examples/MAX32690/FreeRTOSDemo/freertos_tickless.c b/Examples/MAX32690/FreeRTOSDemo/freertos_tickless.c
index f1a6d70bab..328b50a6a1 100644
--- a/Examples/MAX32690/FreeRTOSDemo/freertos_tickless.c
+++ b/Examples/MAX32690/FreeRTOSDemo/freertos_tickless.c
@@ -134,10 +134,10 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     MXC_GPIO_OutSet(uart_rts.port, uart_rts.mask);
 
     /* Snapshot the current WUT value */
-    MXC_WUT_Edge(MXC_WUT0);
+    MXC_WUT_WaitForEdge(MXC_WUT0);
     pre_capture = MXC_WUT_GetCount(MXC_WUT0);
     MXC_WUT_SetCompare(MXC_WUT0, pre_capture + wut_ticks);
-    MXC_WUT_Edge(MXC_WUT0);
+    MXC_WUT_WaitForEdge(MXC_WUT0);
 
     LED_Off(1);
 
diff --git a/Libraries/Cordio/platform/targets/maxim/max32690/sources/pal_rtc.c b/Libraries/Cordio/platform/targets/maxim/max32690/sources/pal_rtc.c
index 71aa76f77e..34f0c97ac5 100644
--- a/Libraries/Cordio/platform/targets/maxim/max32690/sources/pal_rtc.c
+++ b/Libraries/Cordio/platform/targets/maxim/max32690/sources/pal_rtc.c
@@ -69,14 +69,14 @@ static struct {
 void WUT0_IRQHandler(void)
 {
   PalLedOn(PAL_LED_ID_CPU_ACTIVE);
-  MXC_WUT_Handler(MXC_WUT0);
+  MXC_WUT_Handler(PAL_WUT);
 
 }
 #else
 void WUT1_IRQHandler(void)
 {
   PalLedOn(PAL_LED_ID_CPU_ACTIVE);
-  MXC_WUT_Handler(MXC_WUT0);
+  MXC_WUT_Handler(PAL_WUT);
 
 }
 #endif
@@ -102,7 +102,7 @@ PalRtcState_t PalRtcGetState(void)
 /*************************************************************************************************/
 void PalRtcCompareSet(uint8_t channelId, uint32_t value)
 {
-  MXC_WUT_SetCompare(MXC_WUT0, value);
+  MXC_WUT_SetCompare(PAL_WUT, value);
 }
 
 /*************************************************************************************************/
@@ -117,15 +117,15 @@ void PalRtcInit(void)
   cfg.mode = MXC_WUT_MODE_COMPARE;
   cfg.cmp_cnt = PAL_MAX_RTC_COUNTER_VAL;
 
-  MXC_WUT_Init(MXC_WUT0, MXC_WUT_PRES_1);
-  MXC_WUT_Config(MXC_WUT0, &cfg);
+  MXC_WUT_Init(PAL_WUT, MXC_WUT_PRES_1);
+  MXC_WUT_Config(PAL_WUT, &cfg);
   MXC_LP_EnableWUTAlarmWakeup();
 
   NVIC_ClearPendingIRQ(PAL_WUT_IRQn);
   NVIC_EnableIRQ(PAL_WUT_IRQn);
 
   /* Enable WUT */
-  MXC_WUT_Enable(MXC_WUT0);
+  MXC_WUT_Enable(PAL_WUT);
 
   palRtcCb.state = PAL_RTC_STATE_READY;
 }
@@ -142,7 +142,7 @@ void PalRtcInit(void)
 /*************************************************************************************************/
 uint32_t PalRtcCounterGet(void)
 {
-  uint32_t count = MXC_WUT_GetCount(MXC_WUT0);
+  uint32_t count = MXC_WUT_GetCount(PAL_WUT);
 
   return count;
 }
@@ -168,6 +168,6 @@ void PalRtcEnableCompareIrq(uint8_t channelId)
 /*************************************************************************************************/
 void PalRtcDisableCompareIrq(uint8_t channelId)
 {
-  MXC_WUT_ClearFlags(MXC_WUT0);
+  MXC_WUT_ClearFlags(PAL_WUT);
   NVIC_DisableIRQ(PAL_WUT_IRQn);
 }
diff --git a/Libraries/PeriphDrivers/Include/MAX32655/wut.h b/Libraries/PeriphDrivers/Include/MAX32655/wut.h
index 54bfd99277..f083715e07 100644
--- a/Libraries/PeriphDrivers/Include/MAX32655/wut.h
+++ b/Libraries/PeriphDrivers/Include/MAX32655/wut.h
@@ -172,7 +172,15 @@ void MXC_WUT_ClearFlags(mxc_wut_regs_t *wut);
  * @param   wut  Pointer to Wakeup Timer instance to get interrupt staus from.
  * @return  Returns the interrupt status. 1 if interrupt has occurred.
  */
-uint32_t MXC_WUT_IntStatus(mxc_wut_regs_t *wut);
+__attribute__((deprecated("Use MXC_WUT_GetFlags instead.  See wut.h for more details."))) uint32_t
+MXC_WUT_IntStatus(mxc_wut_regs_t *wut);
+
+/**
+ * @brief   Get the timer interrupt status.
+ * @param   wut  Pointer to Wakeup Timer instance to get interrupt staus from.
+ * @return  Returns the interrupt status. 1 if interrupt has occurred.
+ */
+uint32_t MXC_WUT_GetFlags(mxc_wut_regs_t *wut);
 
 /**
  * @brief   Set the timer compare count.
@@ -216,13 +224,27 @@ int MXC_WUT_GetTime(mxc_wut_regs_t *wut, uint32_t ticks, uint32_t *time, mxc_wut
  * @brief   Wait for an edge of the WUT count register.
  * @param   wut  Pointer to Wakeup Timer instance to wait on.
  */
-void MXC_WUT_Edge(mxc_wut_regs_t *wut);
+__attribute__((deprecated("Use MXC_WUT_WaitForEdge instead.  See wut.h for more details."))) void
+MXC_WUT_Edge(mxc_wut_regs_t *wut);
+
+/**
+ * @brief   Wait for an edge of the WUT count register.
+ * @param   wut  Pointer to Wakeup Timer instance to wait on.
+ */
+void MXC_WUT_WaitForEdge(mxc_wut_regs_t *wut);
+
+/**
+ * @brief   Store the count and snapshot values.
+ * @param   wut  Pointer to Wakeup Timer instance to store count and snapshot values for.
+ */
+__attribute__((deprecated("Use MXC_WUT_StoreCount instead.  See wut.h for more details."))) void
+MXC_WUT_Store(mxc_wut_regs_t *wut);
 
 /**
  * @brief   Store the count and snapshot values.
  * @param   wut  Pointer to Wakeup Timer instance to store count and snapshot values for.
  */
-void MXC_WUT_Store(mxc_wut_regs_t *wut);
+void MXC_WUT_StoreCount(mxc_wut_regs_t *wut);
 
 /**
  * @brief   Restore the DBB clock with the stored count and snapshot values.
diff --git a/Libraries/PeriphDrivers/Include/MAX32657/wut.h b/Libraries/PeriphDrivers/Include/MAX32657/wut.h
index def1573aac..18ee8f6dfb 100644
--- a/Libraries/PeriphDrivers/Include/MAX32657/wut.h
+++ b/Libraries/PeriphDrivers/Include/MAX32657/wut.h
@@ -170,7 +170,15 @@ void MXC_WUT_ClearFlags(mxc_wut_regs_t *wut);
  * @param   wut  Pointer to Wakeup Timer instance to get interrupt staus from.
  * @return  Returns the interrupt status. 1 if interrupt has occurred.
  */
-uint32_t MXC_WUT_IntStatus(mxc_wut_regs_t *wut);
+__attribute__((deprecated("Use MXC_WUT_GetFlags instead.  See wut.h for more details."))) uint32_t
+MXC_WUT_IntStatus(mxc_wut_regs_t *wut);
+
+/**
+ * @brief   Get the timer interrupt status.
+ * @param   wut  Pointer to Wakeup Timer instance to get interrupt staus from.
+ * @return  Returns the interrupt status. 1 if interrupt has occurred.
+ */
+uint32_t MXC_WUT_GetFlags(mxc_wut_regs_t *wut);
 
 /**
  * @brief   Set the timer compare count.
@@ -214,13 +222,27 @@ int MXC_WUT_GetTime(mxc_wut_regs_t *wut, uint32_t ticks, uint32_t *time, mxc_wut
  * @brief   Wait for an edge of the WUT count register.
  * @param   wut  Pointer to Wakeup Timer instance to wait on.
  */
-void MXC_WUT_Edge(mxc_wut_regs_t *wut);
+__attribute__((deprecated("Use MXC_WUT_WaitForEdge instead.  See wut.h for more details."))) void
+MXC_WUT_Edge(mxc_wut_regs_t *wut);
+
+/**
+ * @brief   Wait for an edge of the WUT count register.
+ * @param   wut  Pointer to Wakeup Timer instance to wait on.
+ */
+void MXC_WUT_WaitForEdge(mxc_wut_regs_t *wut);
+
+/**
+ * @brief   Store the count and snapshot values.
+ * @param   wut  Pointer to Wakeup Timer instance to store count and snapshot values for.
+ */
+__attribute__((deprecated("Use MXC_WUT_StoreCount instead.  See wut.h for more details."))) void
+MXC_WUT_Store(mxc_wut_regs_t *wut);
 
 /**
  * @brief   Store the count and snapshot values.
  * @param   wut  Pointer to Wakeup Timer instance to store count and snapshot values for.
  */
-void MXC_WUT_Store(mxc_wut_regs_t *wut);
+void MXC_WUT_StoreCount(mxc_wut_regs_t *wut);
 
 /**
  * @brief   Restore the DBB clock with the stored count and snapshot values.
diff --git a/Libraries/PeriphDrivers/Include/MAX32665/wut.h b/Libraries/PeriphDrivers/Include/MAX32665/wut.h
index 5a50b27e10..a606ca4e2b 100644
--- a/Libraries/PeriphDrivers/Include/MAX32665/wut.h
+++ b/Libraries/PeriphDrivers/Include/MAX32665/wut.h
@@ -170,7 +170,14 @@ void MXC_WUT_ClearFlags(void);
  * @brief   Get the timer interrupt status.
  * @return  Returns the interrupt status. 1 if interrupt has occurred.
  */
-uint32_t MXC_WUT_IntStatus(void);
+__attribute__((deprecated("Use MXC_WUT_GetFlags instead.  See wut.h for more details."))) uint32_t
+MXC_WUT_IntStatus(void);
+
+/**
+ * @brief   Get the timer interrupt status.
+ * @return  Returns the interrupt status. 1 if interrupt has occurred.
+ */
+uint32_t MXC_WUT_GetFlags(void);
 
 /**
  * @brief   Set the timer compare count.
@@ -209,12 +216,24 @@ int MXC_WUT_GetTime(uint32_t ticks, uint32_t *time, mxc_wut_unit_t *units);
 /**
  * @brief   Wait for an edge of the WUT count register.
  */
-void MXC_WUT_Edge(void);
+__attribute__((deprecated("Use MXC_WUT_WaitForEdge instead.  See wut.h for more details."))) void
+MXC_WUT_Edge(void);
+
+/**
+ * @brief   Wait for an edge of the WUT count register.
+ */
+void MXC_WUT_WaitForEdge(void);
+
+/**
+ * @brief   Store the count and snapshot values.
+ */
+__attribute__((deprecated("Use MXC_WUT_StoreCount instead.  See wut.h for more details."))) void
+MXC_WUT_Store(void);
 
 /**
  * @brief   Store the count and snapshot values.
  */
-void MXC_WUT_Store(void);
+void MXC_WUT_StoreCount(void);
 
 /**
  * @brief   Restore the DBB clock with the stored count and snapshot values.
diff --git a/Libraries/PeriphDrivers/Include/MAX32680/wut.h b/Libraries/PeriphDrivers/Include/MAX32680/wut.h
index dbf4dfaade..b6cb26b180 100644
--- a/Libraries/PeriphDrivers/Include/MAX32680/wut.h
+++ b/Libraries/PeriphDrivers/Include/MAX32680/wut.h
@@ -172,7 +172,15 @@ void MXC_WUT_ClearFlags(mxc_wut_regs_t *wut);
  * @param      wut        Pointer to Wakeup Timer instance to get interrupt status from.
  * @return  Returns the interrupt status. 1 if interrupt has occurred.
  */
-uint32_t MXC_WUT_IntStatus(mxc_wut_regs_t *wut);
+__attribute__((deprecated("Use MXC_WUT_GetFlags instead.  See wut.h for more details."))) uint32_t
+MXC_WUT_IntStatus(mxc_wut_regs_t *wut);
+
+/**
+ * @brief   Get the timer interrupt status.
+ * @param      wut        Pointer to Wakeup Timer instance to get interrupt status from.
+ * @return  Returns the interrupt status. 1 if interrupt has occurred.
+ */
+uint32_t MXC_WUT_GetFlags(mxc_wut_regs_t *wut);
 
 /**
  * @brief   Set the timer compare count.
@@ -216,13 +224,27 @@ int MXC_WUT_GetTime(mxc_wut_regs_t *wut, uint32_t ticks, uint32_t *time, mxc_wut
  * @brief   Wait for an edge of the WUT count register.
  * @param   wut        Pointer to Wakeup Timer instance to wait on.
  */
-void MXC_WUT_Edge(mxc_wut_regs_t *wut);
+__attribute__((deprecated("Use MXC_WUT_WaitForEdge instead.  See wut.h for more details."))) void
+MXC_WUT_Edge(mxc_wut_regs_t *wut);
+
+/**
+ * @brief   Wait for an edge of the WUT count register.
+ * @param   wut        Pointer to Wakeup Timer instance to wait on.
+ */
+void MXC_WUT_WaitForEdge(mxc_wut_regs_t *wut);
+
+/**
+ * @brief   Store the count and snapshot values.
+ * @param   wut        Pointer to Wakeup Timer instance to store count and snapshot values for.
+ */
+__attribute__((deprecated("Use MXC_WUT_StoreCount instead.  See wut.h for more details."))) void
+MXC_WUT_Store(mxc_wut_regs_t *wut);
 
 /**
  * @brief   Store the count and snapshot values.
  * @param   wut        Pointer to Wakeup Timer instance to store count and snapshot values for.
  */
-void MXC_WUT_Store(mxc_wut_regs_t *wut);
+void MXC_WUT_StoreCount(mxc_wut_regs_t *wut);
 
 /**
  * @brief   Restore the DBB clock with the stored count and snapshot values.
diff --git a/Libraries/PeriphDrivers/Include/MAX32690/wut.h b/Libraries/PeriphDrivers/Include/MAX32690/wut.h
index 206639bf02..7207be0035 100644
--- a/Libraries/PeriphDrivers/Include/MAX32690/wut.h
+++ b/Libraries/PeriphDrivers/Include/MAX32690/wut.h
@@ -155,12 +155,6 @@ uint32_t MXC_WUT_GetCapture(mxc_wut_regs_t *wut);
  */
 uint32_t MXC_WUT_GetCount(mxc_wut_regs_t *wut);
 
-/**
- * @brief   Clear the timer interrupt.
- */
-__attribute__((deprecated("Use MXC_WUT_ClearFlags instead.  See wut.h for more details."))) void
-MXC_WUT_IntClear(void);
-
 /**
  * @brief   Clear the timer interrupt.
  */
@@ -170,7 +164,7 @@ void MXC_WUT_ClearFlags(mxc_wut_regs_t *wut);
  * @brief   Get the timer interrupt status.
  * @return  Returns the interrupt status. 1 if interrupt has occurred.
  */
-uint32_t MXC_WUT_IntStatus(mxc_wut_regs_t *wut);
+uint32_t MXC_WUT_GetFlags(mxc_wut_regs_t *wut);
 
 /**
  * @brief   Set the timer compare count.
@@ -209,12 +203,12 @@ int MXC_WUT_GetTime(mxc_wut_regs_t *wut, uint32_t ticks, uint32_t *time, mxc_wut
 /**
  * @brief   Wait for an edge of the WUT count register.
  */
-void MXC_WUT_Edge(mxc_wut_regs_t *wut);
+void MXC_WUT_WaitForEdge(mxc_wut_regs_t *wut);
 
 /**
  * @brief   Store the count and snapshot values.
  */
-void MXC_WUT_Store(mxc_wut_regs_t *wut);
+void MXC_WUT_StoreCount(mxc_wut_regs_t *wut);
 
 /**
  * @brief   Restore the DBB clock with the stored count and snapshot values.
diff --git a/Libraries/PeriphDrivers/Include/MAX78000/wut.h b/Libraries/PeriphDrivers/Include/MAX78000/wut.h
index ce978febc7..53cab45cd9 100644
--- a/Libraries/PeriphDrivers/Include/MAX78000/wut.h
+++ b/Libraries/PeriphDrivers/Include/MAX78000/wut.h
@@ -163,7 +163,14 @@ void MXC_WUT_ClearFlags(void);
  * @brief   Get the timer interrupt status.
  * @return  Returns the interrupt status. 1 if interrupt has occurred.
  */
-uint32_t MXC_WUT_IntStatus(void);
+__attribute__((deprecated("Use MXC_WUT_GetFlags instead.  See wut.h for more details."))) uint32_t
+MXC_WUT_IntStatus(void);
+
+/**
+ * @brief   Get the timer interrupt status.
+ * @return  Returns the interrupt status. 1 if interrupt has occurred.
+ */
+uint32_t MXC_WUT_GetFlags(void);
 
 /**
  * @brief   Set the timer compare count.
@@ -202,12 +209,24 @@ int MXC_WUT_GetTime(uint32_t ticks, uint32_t *time, mxc_wut_unit_t *units);
 /**
  * @brief   Wait for an edge of the WUT count register.
  */
-void MXC_WUT_Edge(void);
+__attribute__((deprecated("Use MXC_WUT_WaitForEdge instead.  See wut.h for more details."))) void
+MXC_WUT_Edge(void);
+
+/**
+ * @brief   Wait for an edge of the WUT count register.
+ */
+void MXC_WUT_WaitForEdge(void);
+
+/**
+ * @brief   Store the count and snapshot values.
+ */
+__attribute__((deprecated("Use MXC_WUT_StoreCount instead.  See wut.h for more details."))) void
+MXC_WUT_Store(void);
 
 /**
  * @brief   Store the count and snapshot values.
  */
-void MXC_WUT_Store(void);
+void MXC_WUT_StoreCount(void);
 
 /**
  * @brief   Restore the DBB clock with the stored count and snapshot values.
diff --git a/Libraries/PeriphDrivers/Include/MAX78002/wut.h b/Libraries/PeriphDrivers/Include/MAX78002/wut.h
index 723eb8bdc9..e1405d4573 100644
--- a/Libraries/PeriphDrivers/Include/MAX78002/wut.h
+++ b/Libraries/PeriphDrivers/Include/MAX78002/wut.h
@@ -162,7 +162,14 @@ void MXC_WUT_ClearFlags(void);
  * @brief   Get the timer interrupt status.
  * @return  Returns the interrupt status. 1 if interrupt has occurred.
  */
-uint32_t MXC_WUT_IntStatus(void);
+__attribute__((deprecated("Use MXC_WUT_GetFlags instead.  See wut.h for more details."))) uint32_t
+MXC_WUT_IntStatus(void);
+
+/**
+ * @brief   Get the timer interrupt status.
+ * @return  Returns the interrupt status. 1 if interrupt has occurred.
+ */
+uint32_t MXC_WUT_GetFlags(void);
 
 /**
  * @brief   Set the timer compare count.
@@ -201,12 +208,24 @@ int MXC_WUT_GetTime(uint32_t ticks, uint32_t *time, mxc_wut_unit_t *units);
 /**
  * @brief   Wait for an edge of the WUT count register.
  */
-void MXC_WUT_Edge(void);
+__attribute__((deprecated("Use MXC_WUT_WaitForEdge instead.  See wut.h for more details."))) void
+MXC_WUT_Edge(void);
+
+/**
+ * @brief   Wait for an edge of the WUT count register.
+ */
+void MXC_WUT_WaitForEdge(void);
+
+/**
+ * @brief   Store the count and snapshot values.
+ */
+__attribute__((deprecated("Use MXC_WUT_StoreCount instead.  See wut.h for more details."))) void
+MXC_WUT_Store(void);
 
 /**
  * @brief   Store the count and snapshot values.
  */
-void MXC_WUT_Store(void);
+void MXC_WUT_StoreCount(void);
 
 /**
  * @brief   Restore the DBB clock with the stored count and snapshot values.
diff --git a/Libraries/PeriphDrivers/Source/WUT/wut_ai85.c b/Libraries/PeriphDrivers/Source/WUT/wut_ai85.c
index 96df92df29..8243c7de9d 100644
--- a/Libraries/PeriphDrivers/Source/WUT/wut_ai85.c
+++ b/Libraries/PeriphDrivers/Source/WUT/wut_ai85.c
@@ -110,6 +110,12 @@ uint32_t MXC_WUT_IntStatus(void)
     return MXC_WUT_RevA_IntStatus((mxc_wut_reva_regs_t *)MXC_WUT);
 }
 
+/* ************************************************************************* */
+uint32_t MXC_WUT_GetFlags(void)
+{
+    return MXC_WUT_RevA_IntStatus((mxc_wut_reva_regs_t *)MXC_WUT);
+}
+
 /* ************************************************************************* */
 void MXC_WUT_SetCompare(uint32_t cmp_cnt)
 {
@@ -141,12 +147,24 @@ void MXC_WUT_Edge(void)
     MXC_WUT_RevA_Edge((mxc_wut_reva_regs_t *)MXC_WUT);
 }
 
+/* ************************************************************************** */
+void MXC_WUT_WaitForEdge(void)
+{
+    MXC_WUT_RevA_Edge((mxc_wut_reva_regs_t *)MXC_WUT);
+}
+
 /* ************************************************************************** */
 void MXC_WUT_Store(void)
 {
     MXC_WUT_RevA_Store((mxc_wut_reva_regs_t *)MXC_WUT);
 }
 
+/* ************************************************************************** */
+void MXC_WUT_StoreCount(void)
+{
+    MXC_WUT_RevA_Store((mxc_wut_reva_regs_t *)MXC_WUT);
+}
+
 /* ************************************************************************** */
 void MXC_WUT_RestoreBBClock(uint32_t dbbFreq)
 {
diff --git a/Libraries/PeriphDrivers/Source/WUT/wut_ai87.c b/Libraries/PeriphDrivers/Source/WUT/wut_ai87.c
index 8a0b988486..458623ce17 100644
--- a/Libraries/PeriphDrivers/Source/WUT/wut_ai87.c
+++ b/Libraries/PeriphDrivers/Source/WUT/wut_ai87.c
@@ -100,6 +100,12 @@ uint32_t MXC_WUT_IntStatus(void)
     return MXC_WUT_RevA_IntStatus((mxc_wut_reva_regs_t *)MXC_WUT);
 }
 
+/* ************************************************************************* */
+uint32_t MXC_WUT_GetFlags(void)
+{
+    return MXC_WUT_RevA_IntStatus((mxc_wut_reva_regs_t *)MXC_WUT);
+}
+
 /* ************************************************************************* */
 void MXC_WUT_SetCompare(uint32_t cmp_cnt)
 {
@@ -131,12 +137,24 @@ void MXC_WUT_Edge(void)
     MXC_WUT_RevA_Edge((mxc_wut_reva_regs_t *)MXC_WUT);
 }
 
+/* ************************************************************************** */
+void MXC_WUT_WaitForEdge(void)
+{
+    MXC_WUT_RevA_Edge((mxc_wut_reva_regs_t *)MXC_WUT);
+}
+
 /* ************************************************************************** */
 void MXC_WUT_Store(void)
 {
     MXC_WUT_RevA_Store((mxc_wut_reva_regs_t *)MXC_WUT);
 }
 
+/* ************************************************************************** */
+void MXC_WUT_StoreCount(void)
+{
+    MXC_WUT_RevA_Store((mxc_wut_reva_regs_t *)MXC_WUT);
+}
+
 /* ************************************************************************** */
 void MXC_WUT_RestoreBBClock(uint32_t dbbFreq)
 {
diff --git a/Libraries/PeriphDrivers/Source/WUT/wut_me14.c b/Libraries/PeriphDrivers/Source/WUT/wut_me14.c
index 9fae80a1ca..717cf3873c 100644
--- a/Libraries/PeriphDrivers/Source/WUT/wut_me14.c
+++ b/Libraries/PeriphDrivers/Source/WUT/wut_me14.c
@@ -117,6 +117,12 @@ uint32_t MXC_WUT_IntStatus(void)
     return MXC_WUT_RevA_IntStatus((mxc_wut_reva_regs_t *)MXC_WUT);
 }
 
+/* ************************************************************************* */
+uint32_t MXC_WUT_GetFlags(void)
+{
+    return MXC_WUT_RevA_IntStatus((mxc_wut_reva_regs_t *)MXC_WUT);
+}
+
 /* ************************************************************************* */
 void MXC_WUT_SetCompare(uint32_t cmp_cnt)
 {
@@ -148,12 +154,24 @@ void MXC_WUT_Edge(void)
     MXC_WUT_RevA_Edge((mxc_wut_reva_regs_t *)MXC_WUT);
 }
 
+/* ************************************************************************** */
+void MXC_WUT_WaitForEdge(void)
+{
+    MXC_WUT_RevA_Edge((mxc_wut_reva_regs_t *)MXC_WUT);
+}
+
 /* ************************************************************************** */
 void MXC_WUT_Store(void)
 {
     MXC_WUT_RevA_Store((mxc_wut_reva_regs_t *)MXC_WUT);
 }
 
+/* ************************************************************************** */
+void MXC_WUT_StoreCount(void)
+{
+    MXC_WUT_RevA_Store((mxc_wut_reva_regs_t *)MXC_WUT);
+}
+
 /* ************************************************************************** */
 void MXC_WUT_RestoreBBClock(uint32_t dbbFreq)
 {
diff --git a/Libraries/PeriphDrivers/Source/WUT/wut_me17.c b/Libraries/PeriphDrivers/Source/WUT/wut_me17.c
index f4c359b2eb..f7da6f83da 100644
--- a/Libraries/PeriphDrivers/Source/WUT/wut_me17.c
+++ b/Libraries/PeriphDrivers/Source/WUT/wut_me17.c
@@ -110,6 +110,12 @@ uint32_t MXC_WUT_IntStatus(mxc_wut_regs_t *wut)
     return MXC_WUT_RevA_IntStatus((mxc_wut_reva_regs_t *)wut);
 }
 
+/* ************************************************************************* */
+uint32_t MXC_WUT_GetFlags(mxc_wut_regs_t *wut)
+{
+    return MXC_WUT_RevA_IntStatus((mxc_wut_reva_regs_t *)wut);
+}
+
 /* ************************************************************************* */
 void MXC_WUT_SetCompare(mxc_wut_regs_t *wut, uint32_t cmp_cnt)
 {
@@ -141,12 +147,24 @@ void MXC_WUT_Edge(mxc_wut_regs_t *wut)
     MXC_WUT_RevA_Edge((mxc_wut_reva_regs_t *)wut);
 }
 
+/* ************************************************************************** */
+void MXC_WUT_WaitForEdge(mxc_wut_regs_t *wut)
+{
+    MXC_WUT_RevA_Edge((mxc_wut_reva_regs_t *)wut);
+}
+
 /* ************************************************************************** */
 void MXC_WUT_Store(mxc_wut_regs_t *wut)
 {
     MXC_WUT_RevA_Store((mxc_wut_reva_regs_t *)wut);
 }
 
+/* ************************************************************************** */
+void MXC_WUT_StoreCount(mxc_wut_regs_t *wut)
+{
+    MXC_WUT_RevA_Store((mxc_wut_reva_regs_t *)wut);
+}
+
 /* ************************************************************************** */
 void MXC_WUT_RestoreBBClock(mxc_wut_regs_t *wut, uint32_t dbbFreq)
 {
diff --git a/Libraries/PeriphDrivers/Source/WUT/wut_me18.c b/Libraries/PeriphDrivers/Source/WUT/wut_me18.c
index 17970025c1..fb0d32e191 100644
--- a/Libraries/PeriphDrivers/Source/WUT/wut_me18.c
+++ b/Libraries/PeriphDrivers/Source/WUT/wut_me18.c
@@ -99,12 +99,6 @@ uint32_t MXC_WUT_GetCount(mxc_wut_regs_t *wut)
     return MXC_WUT_RevA_GetCount((mxc_wut_reva_regs_t *)wut);
 }
 
-/* ************************************************************************* */
-void MXC_WUT_IntClear(void)
-{
-    MXC_WUT_RevA_IntClear((mxc_wut_reva_regs_t *)MXC_WUT);
-}
-
 /* ************************************************************************* */
 void MXC_WUT_ClearFlags(mxc_wut_regs_t *wut)
 {
@@ -112,7 +106,7 @@ void MXC_WUT_ClearFlags(mxc_wut_regs_t *wut)
 }
 
 /* ************************************************************************* */
-uint32_t MXC_WUT_IntStatus(mxc_wut_regs_t *wut)
+uint32_t MXC_WUT_GetFlags(mxc_wut_regs_t *wut)
 {
     return MXC_WUT_RevA_IntStatus((mxc_wut_reva_regs_t *)wut);
 }
@@ -144,13 +138,13 @@ int MXC_WUT_GetTime(mxc_wut_regs_t *wut, uint32_t ticks, uint32_t *time, mxc_wut
 }
 
 /* ************************************************************************** */
-void MXC_WUT_Edge(mxc_wut_regs_t *wut)
+void MXC_WUT_WaitForEdge(mxc_wut_regs_t *wut)
 {
     MXC_WUT_RevA_Edge((mxc_wut_reva_regs_t *)wut);
 }
 
 /* ************************************************************************** */
-void MXC_WUT_Store(mxc_wut_regs_t *wut)
+void MXC_WUT_StoreCount(mxc_wut_regs_t *wut)
 {
     MXC_WUT_RevA_Store((mxc_wut_reva_regs_t *)wut);
 }
diff --git a/Libraries/PeriphDrivers/Source/WUT/wut_me30.c b/Libraries/PeriphDrivers/Source/WUT/wut_me30.c
index 52f281360e..bffcb509d6 100644
--- a/Libraries/PeriphDrivers/Source/WUT/wut_me30.c
+++ b/Libraries/PeriphDrivers/Source/WUT/wut_me30.c
@@ -108,6 +108,12 @@ uint32_t MXC_WUT_IntStatus(mxc_wut_regs_t *wut)
     return MXC_WUT_RevA_IntStatus((mxc_wut_reva_regs_t *)wut);
 }
 
+/* ************************************************************************* */
+uint32_t MXC_WUT_GetFlags(mxc_wut_regs_t *wut)
+{
+    return MXC_WUT_RevA_IntStatus((mxc_wut_reva_regs_t *)wut);
+}
+
 /* ************************************************************************* */
 void MXC_WUT_SetCompare(mxc_wut_regs_t *wut, uint32_t cmp_cnt)
 {
@@ -139,12 +145,24 @@ void MXC_WUT_Edge(mxc_wut_regs_t *wut)
     MXC_WUT_RevA_Edge((mxc_wut_reva_regs_t *)wut);
 }
 
+/* ************************************************************************** */
+void MXC_WUT_WaitForEdge(mxc_wut_regs_t *wut)
+{
+    MXC_WUT_RevA_Edge((mxc_wut_reva_regs_t *)wut);
+}
+
 /* ************************************************************************** */
 void MXC_WUT_Store(mxc_wut_regs_t *wut)
 {
     MXC_WUT_RevA_Store((mxc_wut_reva_regs_t *)wut);
 }
 
+/* ************************************************************************** */
+void MXC_WUT_StoreCount(mxc_wut_regs_t *wut)
+{
+    MXC_WUT_RevA_Store((mxc_wut_reva_regs_t *)wut);
+}
+
 /* ************************************************************************** */
 void MXC_WUT_RestoreBBClock(mxc_wut_regs_t *wut, uint32_t dbbFreq)
 {