diff --git a/include/event_groups.h b/include/event_groups.h
index 949ddd9143f..677a6ee54fe 100644
--- a/include/event_groups.h
+++ b/include/event_groups.h
@@ -84,8 +84,8 @@ typedef struct EventGroupDef_t   * EventGroupHandle_t;
 
 /*
  * The type that holds event bits always matches TickType_t - therefore the
- * number of bits it holds is set by configUSE_16_BIT_TICKS (16 bits if set to 1,
- * 32 bits if set to 0.
+ * number of bits it holds is set by configTICK_BIT_WIDTH (16 bits if set to 0,
+ * 32 bits if set to 1, 64 bits if set to 2.
  *
  * \defgroup EventBits_t EventBits_t
  * \ingroup EventGroup
@@ -112,11 +112,12 @@ typedef TickType_t               EventBits_t;
  *
  * Although event groups are not related to ticks, for internal implementation
  * reasons the number of bits available for use in an event group is dependent
- * on the configUSE_16_BIT_TICKS setting in FreeRTOSConfig.h.  If
- * configUSE_16_BIT_TICKS is 1 then each event group contains 8 usable bits (bit
- * 0 to bit 7).  If configUSE_16_BIT_TICKS is set to 0 then each event group has
- * 24 usable bits (bit 0 to bit 23).  The EventBits_t type is used to store
- * event bits within an event group.
+ * on the configTICK_BIT_WIDTH setting in FreeRTOSConfig.h.  If
+ * configTICK_BIT_WIDTH is 0 then each event group contains 8 usable bits (bit
+ * 0 to bit 7).  If configTICK_BIT_WIDTH is set to 1 then each event group has
+ * 24 usable bits (bit 0 to bit 23).  If configTICK_BIT_WIDTH is set to 2 then
+ * each event group has 56 usable bits (bit 0 to bit 53). The EventBits_t type
+ * is used to store event bits within an event group.
  *
  * @return If the event group was created then a handle to the event group is
  * returned.  If there was insufficient FreeRTOS heap available to create the
@@ -168,11 +169,12 @@ typedef TickType_t               EventBits_t;
  *
  * Although event groups are not related to ticks, for internal implementation
  * reasons the number of bits available for use in an event group is dependent
- * on the configUSE_16_BIT_TICKS setting in FreeRTOSConfig.h.  If
- * configUSE_16_BIT_TICKS is 1 then each event group contains 8 usable bits (bit
- * 0 to bit 7).  If configUSE_16_BIT_TICKS is set to 0 then each event group has
- * 24 usable bits (bit 0 to bit 23).  The EventBits_t type is used to store
- * event bits within an event group.
+ * on the configTICK_BIT_WIDTH setting in FreeRTOSConfig.h.  If
+ * configTICK_BIT_WIDTH is 0 then each event group contains 8 usable bits (bit
+ * 0 to bit 7).  If configTICK_BIT_WIDTH is set to 1 then each event group has
+ * 24 usable bits (bit 0 to bit 23).  If configTICK_BIT_WIDTH is set to 2 then
+ * each event group has 56 usable bits (bit 0 to bit 53).  The EventBits_t type
+ * is used to store event bits within an event group.
  *
  * @param pxEventGroupBuffer pxEventGroupBuffer must point to a variable of type
  * StaticEventGroup_t, which will be then be used to hold the event group's data
diff --git a/portable/IAR/78K0R/portmacro.h b/portable/IAR/78K0R/portmacro.h
index 9d2067b0c10..04b2a244da3 100644
--- a/portable/IAR/78K0R/portmacro.h
+++ b/portable/IAR/78K0R/portmacro.h
@@ -57,7 +57,7 @@ typedef portSTACK_TYPE StackType_t;
 typedef short BaseType_t;
 typedef unsigned short UBaseType_t;
 
-#if (configUSE_16_BIT_TICKS==1)
+#if ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_16 )
     typedef unsigned int TickType_t;
     #define portMAX_DELAY ( TickType_t ) 0xffff
 #elif ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_32 )
diff --git a/portable/IAR/ARM_CM4F/portmacro.h b/portable/IAR/ARM_CM4F/portmacro.h
index e6c8726f5f8..b3ec952da8a 100644
--- a/portable/IAR/ARM_CM4F/portmacro.h
+++ b/portable/IAR/ARM_CM4F/portmacro.h
@@ -59,10 +59,10 @@
     typedef long             BaseType_t;
     typedef unsigned long    UBaseType_t;
 
-    #if ( configUSE_16_BIT_TICKS == 1 )
+    #if ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_16 )
         typedef uint16_t     TickType_t;
         #define portMAX_DELAY              ( TickType_t ) 0xffff
-    #else
+    #elif ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_32 )
         typedef uint32_t     TickType_t;
         #define portMAX_DELAY              ( TickType_t ) 0xffffffffUL
 
diff --git a/portable/IAR/V850ES/portmacro.h b/portable/IAR/V850ES/portmacro.h
index 1efba67b43e..41b7052c813 100644
--- a/portable/IAR/V850ES/portmacro.h
+++ b/portable/IAR/V850ES/portmacro.h
@@ -57,7 +57,7 @@ typedef long BaseType_t;
 typedef unsigned long UBaseType_t;
 
 
-#if (configUSE_16_BIT_TICKS==1)
+#if ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_16 )
     typedef uint16_t TickType_t;
     #define portMAX_DELAY ( TickType_t ) 0xffff
 #elif ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_32 )
diff --git a/portable/MikroC/ARM_CM4F/portmacro.h b/portable/MikroC/ARM_CM4F/portmacro.h
index 1fa3d796403..9ac3e900cf8 100644
--- a/portable/MikroC/ARM_CM4F/portmacro.h
+++ b/portable/MikroC/ARM_CM4F/portmacro.h
@@ -62,10 +62,10 @@
     typedef long             BaseType_t;
     typedef unsigned long    UBaseType_t;
 
-    #if ( configUSE_16_BIT_TICKS == 1 )
+    #if ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_16 )
         typedef uint16_t     TickType_t;
         #define portMAX_DELAY              ( TickType_t ) 0xffff
-    #else
+    #elif ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_32 )
         typedef uint32_t     TickType_t;
         #define portMAX_DELAY              ( TickType_t ) 0xffffffffUL
 
diff --git a/portable/RVDS/ARM_CM4F/portmacro.h b/portable/RVDS/ARM_CM4F/portmacro.h
index 1b3f93b0e97..7f6de909b56 100644
--- a/portable/RVDS/ARM_CM4F/portmacro.h
+++ b/portable/RVDS/ARM_CM4F/portmacro.h
@@ -59,10 +59,10 @@
     typedef long             BaseType_t;
     typedef unsigned long    UBaseType_t;
 
-    #if ( configUSE_16_BIT_TICKS == 1 )
+    #if ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_16 )
         typedef uint16_t     TickType_t;
         #define portMAX_DELAY              ( TickType_t ) 0xffff
-    #else
+    #elif ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_32 )
         typedef uint32_t     TickType_t;
         #define portMAX_DELAY              ( TickType_t ) 0xffffffffUL
 
diff --git a/portable/ThirdParty/GCC/RP2040/port.c b/portable/ThirdParty/GCC/RP2040/port.c
index e082be1cd18..af4ea206a97 100644
--- a/portable/ThirdParty/GCC/RP2040/port.c
+++ b/portable/ThirdParty/GCC/RP2040/port.c
@@ -713,7 +713,7 @@ __attribute__( ( weak ) ) void vPortSetupTimerInterrupt( void )
             /* reduce to range 0-24 */
             ulBit |= ulBit << 8u;
             ulBit >>= 8u;
-        #endif /* configUSE_16_BIT_TICKS */
+        #endif /* configTICK_BIT_WIDTH */
         return ( EventBits_t ) ulBit;
     }
 
@@ -723,7 +723,7 @@ __attribute__( ( weak ) ) void vPortSetupTimerInterrupt( void )
             return (EventBits_t) 0xffu;
         #elif ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_32 )
             return ( EventBits_t ) 0xffffffu;
-        #endif /* configUSE_16_BIT_TICKS */
+        #endif /* configTICK_BIT_WIDTH */
     }
 
     void vPortLockInternalSpinUnlockWithWait( struct lock_core * pxLock, uint32_t ulSave )