diff --git a/.github/lexicon.txt b/.github/lexicon.txt
index d84c8aab1a..c23d181a21 100644
--- a/.github/lexicon.txt
+++ b/.github/lexicon.txt
@@ -1478,6 +1478,7 @@ xeventgroup
 xeventgroupwaitbits
 xexpected
 xexpectedmessagetype
+xexpiredstate
 xflags
 xfound
 xfreebufferslist
diff --git a/source/FreeRTOS_IP.c b/source/FreeRTOS_IP.c
index f84b01daf7..31711cc928 100644
--- a/source/FreeRTOS_IP.c
+++ b/source/FreeRTOS_IP.c
@@ -429,7 +429,7 @@ static void prvProcessIPEventsAndTimers( void )
 
                 /* Simply mark the TCP timer as expired so it gets processed
                  * the next time prvCheckNetworkTimers() is called. */
-                vIPSetTCPTimerEnableState( pdTRUE );
+                vIPSetTCPTimerExpiredState( pdTRUE );
             #endif /* ipconfigUSE_TCP */
             break;
 
@@ -1100,7 +1100,7 @@ BaseType_t xSendEventStructToIPTask( const IPStackEvent_t * pxEvent,
                     /* TCP timer events are sent to wake the timer task when
                      * xTCPTimer has expired, but there is no point sending them if the
                      * IP task is already awake processing other message. */
-                    vIPSetTCPTimerEnableState( pdTRUE );
+                    vIPSetTCPTimerExpiredState( pdTRUE );
 
                     if( uxQueueMessagesWaiting( xNetworkEventQueue ) != 0U )
                     {
diff --git a/source/FreeRTOS_IP_Timers.c b/source/FreeRTOS_IP_Timers.c
index f71d944d62..2e2e16b925 100644
--- a/source/FreeRTOS_IP_Timers.c
+++ b/source/FreeRTOS_IP_Timers.c
@@ -382,17 +382,19 @@ static BaseType_t prvIPTimerCheck( IPTimer_t * pxTimer )
 /**
  * @brief Enable/disable the TCP timer.
  *
- * @param[in] xEnableState: pdTRUE - enable timer; pdFALSE - disable timer.
+ * @param[in] xExpiredState: pdTRUE - set as expired; pdFALSE - set as non-expired.
  */
-    void vIPSetTCPTimerEnableState( BaseType_t xEnableState )
+    void vIPSetTCPTimerExpiredState( BaseType_t xExpiredState )
     {
-        if( xEnableState != pdFALSE )
+        xTCPTimer.bActive = pdTRUE_UNSIGNED;
+
+        if( xExpiredState != pdFALSE )
         {
-            xTCPTimer.bActive = pdTRUE_UNSIGNED;
+            xTCPTimer.bExpired = pdTRUE_UNSIGNED;
         }
         else
         {
-            xTCPTimer.bActive = pdFALSE_UNSIGNED;
+            xTCPTimer.bExpired = pdFALSE_UNSIGNED;
         }
     }
 /*-----------------------------------------------------------*/
diff --git a/source/include/FreeRTOS_IP_Timers.h b/source/include/FreeRTOS_IP_Timers.h
index bc545bce34..5c1c6d1564 100644
--- a/source/include/FreeRTOS_IP_Timers.h
+++ b/source/include/FreeRTOS_IP_Timers.h
@@ -73,7 +73,7 @@
 
     void vIPTimerStartARPResolution( TickType_t xTime );
 
-    void vIPSetTCPTimerEnableState( BaseType_t xEnableState );
+    void vIPSetTCPTimerExpiredState( BaseType_t xExpiredState );
 
     void vIPSetARPTimerEnableState( BaseType_t xEnableState );
 
diff --git a/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c b/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c
index fb02c73ae1..43e73317d3 100644
--- a/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c
+++ b/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c
@@ -945,7 +945,7 @@ void test_prvProcessIPEventsAndTimers_eTCPTimerEvent( void )
     xQueueReceive_ExpectAnyArgsAndReturn( pdTRUE );
     xQueueReceive_ReturnMemThruPtr_pvBuffer( &xReceivedEvent, sizeof( xReceivedEvent ) );
 
-    vIPSetTCPTimerEnableState_Expect( pdTRUE );
+    vIPSetTCPTimerExpiredState_Expect( pdTRUE );
 
     prvProcessIPEventsAndTimers();
 }
@@ -1371,7 +1371,7 @@ void test_xSendEventStructToIPTask_IPTaskInit_eTCPTimerEvent( void )
     xIPTaskInitialised = pdTRUE;
     xEvent.eEventType = eTCPTimerEvent;
 
-    vIPSetTCPTimerEnableState_Expect( pdTRUE );
+    vIPSetTCPTimerExpiredState_Expect( pdTRUE );
 
     uxQueueMessagesWaiting_ExpectAndReturn( xNetworkEventQueue, 0 );
 
@@ -1393,7 +1393,7 @@ void test_xSendEventStructToIPTask_IPTaskInit_eTCPTimerEvent1( void )
     xIPTaskInitialised = pdTRUE;
     xEvent.eEventType = eTCPTimerEvent;
 
-    vIPSetTCPTimerEnableState_Expect( pdTRUE );
+    vIPSetTCPTimerExpiredState_Expect( pdTRUE );
 
     uxQueueMessagesWaiting_ExpectAndReturn( xNetworkEventQueue, 0 );
 
@@ -1415,7 +1415,7 @@ void test_xSendEventStructToIPTask_IPTaskInit_eTCPTimerEvent2( void )
     xIPTaskInitialised = pdTRUE;
     xEvent.eEventType = eTCPTimerEvent;
 
-    vIPSetTCPTimerEnableState_Expect( pdTRUE );
+    vIPSetTCPTimerExpiredState_Expect( pdTRUE );
 
     uxQueueMessagesWaiting_ExpectAndReturn( xNetworkEventQueue, 1 );
 
diff --git a/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c b/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c
index b5e64f90be..948093707e 100644
--- a/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c
+++ b/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c
@@ -531,22 +531,22 @@ void test_prvIPTimerCheck_TimerNotExpired1( void )
     TEST_ASSERT_EQUAL( pdFALSE, xTimer.bExpired );
 }
 
-void test_vIPSetTCPTimerEnableState_False( void )
+void test_vIPSetTCPTimerExpiredState_False( void )
 {
-    BaseType_t xEnableState = pdFALSE;
+    BaseType_t xExpiredState = pdFALSE;
 
-    vIPSetTCPTimerEnableState( xEnableState );
+    vIPSetTCPTimerExpiredState( xExpiredState );
 
-    TEST_ASSERT_EQUAL( xEnableState, xTCPTimer.bActive );
+    TEST_ASSERT_EQUAL( xExpiredState, xTCPTimer.bExpired );
 }
 
-void test_vIPSetTCPTimerEnableState_True( void )
+void test_vIPSetTCPTimerExpiredState_True( void )
 {
-    BaseType_t xEnableState = pdTRUE;
+    BaseType_t xExpiredState = pdTRUE;
 
-    vIPSetTCPTimerEnableState( xEnableState );
+    vIPSetTCPTimerExpiredState( xExpiredState );
 
-    TEST_ASSERT_EQUAL( xEnableState, xTCPTimer.bActive );
+    TEST_ASSERT_EQUAL( xExpiredState, xTCPTimer.bExpired );
 }
 
 void test_vIPSetARPTimerEnableState_False( void )