diff --git a/docs/doxygen/config.doxyfile b/docs/doxygen/config.doxyfile
index cda89fdc34..2b25910ef6 100644
--- a/docs/doxygen/config.doxyfile
+++ b/docs/doxygen/config.doxyfile
@@ -934,18 +934,18 @@ INPUT                  = ./ \
                         ./source/FreeRTOS_Sockets.c \
                         ./source/FreeRTOS_Stream_Buffer.c \
                         ./source/FreeRTOS_TCP_IP.c \
-                        ./source/FreeRTOS_TCP_IP_IPV4.c \
-                        ./source/FreeRTOS_TCP_IP_IPV6.c \
+                        ./source/FreeRTOS_TCP_IP_IPv4.c \
+                        ./source/FreeRTOS_TCP_IP_IPv6.c \
                         ./source/FreeRTOS_TCP_Reception.c \
                         ./source/FreeRTOS_TCP_State_Handling.c \
-                        ./source/FreeRTOS_TCP_State_Handling_IPV4.c       \
-                        ./source/FreeRTOS_TCP_State_Handling_IPV6.c \
+                        ./source/FreeRTOS_TCP_State_Handling_IPv4.c       \
+                        ./source/FreeRTOS_TCP_State_Handling_IPv6.c \
                         ./source/FreeRTOS_TCP_Transmission.c \
-                        ./source/FreeRTOS_TCP_Transmission_IPV4.c \
-                        ./source/FreeRTOS_TCP_Transmission_IPV6.c \
+                        ./source/FreeRTOS_TCP_Transmission_IPv4.c \
+                        ./source/FreeRTOS_TCP_Transmission_IPv6.c \
                         ./source/FreeRTOS_TCP_Utils.c \
-                        ./source/FreeRTOS_TCP_Utils_IPV4.c \
-                        ./source/FreeRTOS_TCP_Utils_IPV6.c \
+                        ./source/FreeRTOS_TCP_Utils_IPv4.c \
+                        ./source/FreeRTOS_TCP_Utils_IPv6.c \
                         ./source/FreeRTOS_TCP_WIN.c \
                         ./source/FreeRTOS_Tiny_TCP.c \
                         ./source/FreeRTOS_UDP_IP.c \
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 289aaea261..307da48ca9 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -70,18 +70,18 @@ target_sources( freertos_plus_tcp
       FreeRTOS_Sockets.c
       FreeRTOS_Stream_Buffer.c
       FreeRTOS_TCP_IP.c
-      FreeRTOS_TCP_IP_IPV4.c
-      FreeRTOS_TCP_IP_IPV6.c
+      FreeRTOS_TCP_IP_IPv4.c
+      FreeRTOS_TCP_IP_IPv6.c
       FreeRTOS_TCP_Reception.c
       FreeRTOS_TCP_State_Handling.c
-      FreeRTOS_TCP_State_Handling_IPV4.c
-      FreeRTOS_TCP_State_Handling_IPV6.c
+      FreeRTOS_TCP_State_Handling_IPv4.c
+      FreeRTOS_TCP_State_Handling_IPv6.c
       FreeRTOS_TCP_Transmission.c
-      FreeRTOS_TCP_Transmission_IPV4.c
-      FreeRTOS_TCP_Transmission_IPV6.c
+      FreeRTOS_TCP_Transmission_IPv4.c
+      FreeRTOS_TCP_Transmission_IPv6.c
       FreeRTOS_TCP_Utils.c
-      FreeRTOS_TCP_Utils_IPV4.c
-      FreeRTOS_TCP_Utils_IPV6.c
+      FreeRTOS_TCP_Utils_IPv4.c
+      FreeRTOS_TCP_Utils_IPv6.c
       FreeRTOS_TCP_WIN.c
       FreeRTOS_Tiny_TCP.c
       FreeRTOS_UDP_IP.c
diff --git a/source/FreeRTOS_TCP_IP_IPV4.c b/source/FreeRTOS_TCP_IP_IPv4.c
similarity index 99%
rename from source/FreeRTOS_TCP_IP_IPV4.c
rename to source/FreeRTOS_TCP_IP_IPv4.c
index c6c53fcfb5..ad39ecf687 100644
--- a/source/FreeRTOS_TCP_IP_IPV4.c
+++ b/source/FreeRTOS_TCP_IP_IPv4.c
@@ -26,7 +26,7 @@
  */
 
 /**
- * @file FreeRTOS_TCP_IP_IPV4.c
+ * @file FreeRTOS_TCP_IP_IPv4.c
  * @brief Module which handles the TCP connections for FreeRTOS+TCP.
  * It depends on  FreeRTOS_TCP_WIN.c, which handles the TCP windowing
  * schemes.
diff --git a/source/FreeRTOS_TCP_IP_IPV6.c b/source/FreeRTOS_TCP_IP_IPv6.c
similarity index 99%
rename from source/FreeRTOS_TCP_IP_IPV6.c
rename to source/FreeRTOS_TCP_IP_IPv6.c
index 95a3252179..1e0662fe14 100644
--- a/source/FreeRTOS_TCP_IP_IPV6.c
+++ b/source/FreeRTOS_TCP_IP_IPv6.c
@@ -26,7 +26,7 @@
  */
 
 /**
- * @file FreeRTOS_TCP_IP_IPV6.c
+ * @file FreeRTOS_TCP_IP_IPv6.c
  * @brief Module which handles the TCP connections for FreeRTOS+TCP.
  * It depends on  FreeRTOS_TCP_WIN.c, which handles the TCP windowing
  * schemes.
diff --git a/source/FreeRTOS_TCP_State_Handling_IPV4.c b/source/FreeRTOS_TCP_State_Handling_IPv4.c
similarity index 99%
rename from source/FreeRTOS_TCP_State_Handling_IPV4.c
rename to source/FreeRTOS_TCP_State_Handling_IPv4.c
index 6aa2bf2c5e..5bba5a7718 100644
--- a/source/FreeRTOS_TCP_State_Handling_IPV4.c
+++ b/source/FreeRTOS_TCP_State_Handling_IPv4.c
@@ -26,7 +26,7 @@
  */
 
 /**
- * @file FreeRTOS_TCP_State_Handling_IPV4.c
+ * @file FreeRTOS_TCP_State_Handling_IPv4.c
  * @brief Module which handles the TCP protocol state transition for FreeRTOS+TCP.
  *
  * Endianness: in this module all ports and IP addresses are stored in
diff --git a/source/FreeRTOS_TCP_State_Handling_IPV6.c b/source/FreeRTOS_TCP_State_Handling_IPv6.c
similarity index 99%
rename from source/FreeRTOS_TCP_State_Handling_IPV6.c
rename to source/FreeRTOS_TCP_State_Handling_IPv6.c
index bf508f05bd..87f25dccc4 100644
--- a/source/FreeRTOS_TCP_State_Handling_IPV6.c
+++ b/source/FreeRTOS_TCP_State_Handling_IPv6.c
@@ -26,7 +26,7 @@
  */
 
 /**
- * @file FreeRTOS_TCP_State_Handling_IPV6.c
+ * @file FreeRTOS_TCP_State_Handling_IPv6.c
  * @brief Module which handles the TCP protocol state transition for FreeRTOS+TCP.
  *
  * Endianness: in this module all ports and IP addresses are stored in
diff --git a/source/FreeRTOS_TCP_Transmission_IPV4.c b/source/FreeRTOS_TCP_Transmission_IPv4.c
similarity index 99%
rename from source/FreeRTOS_TCP_Transmission_IPV4.c
rename to source/FreeRTOS_TCP_Transmission_IPv4.c
index 002e8357f9..4a3877fbdd 100644
--- a/source/FreeRTOS_TCP_Transmission_IPV4.c
+++ b/source/FreeRTOS_TCP_Transmission_IPv4.c
@@ -26,7 +26,7 @@
  */
 
 /**
- * @file FreeRTOS_TCP_Transmission_IPV4.c
+ * @file FreeRTOS_TCP_Transmission_IPv4.c
  * @brief Module which prepares the packet to be sent through
  * a socket for FreeRTOS+TCP.
  * It depends on  FreeRTOS_TCP_WIN.c, which handles the TCP windowing
diff --git a/source/FreeRTOS_TCP_Transmission_IPV6.c b/source/FreeRTOS_TCP_Transmission_IPv6.c
similarity index 99%
rename from source/FreeRTOS_TCP_Transmission_IPV6.c
rename to source/FreeRTOS_TCP_Transmission_IPv6.c
index 0a3c610bfa..1f091a0151 100644
--- a/source/FreeRTOS_TCP_Transmission_IPV6.c
+++ b/source/FreeRTOS_TCP_Transmission_IPv6.c
@@ -26,7 +26,7 @@
  */
 
 /**
- * @file FreeRTOS_TCP_Transmission_IPV6.c
+ * @file FreeRTOS_TCP_Transmission_IPv6.c
  * @brief Module which prepares the packet to be sent through
  * a socket for FreeRTOS+TCP.
  * It depends on  FreeRTOS_TCP_WIN.c, which handles the TCP windowing
diff --git a/source/FreeRTOS_TCP_Utils_IPV4.c b/source/FreeRTOS_TCP_Utils_IPv4.c
similarity index 99%
rename from source/FreeRTOS_TCP_Utils_IPV4.c
rename to source/FreeRTOS_TCP_Utils_IPv4.c
index 38d677e473..b80c0a3660 100644
--- a/source/FreeRTOS_TCP_Utils_IPV4.c
+++ b/source/FreeRTOS_TCP_Utils_IPv4.c
@@ -26,7 +26,7 @@
  */
 
 /**
- * @file FreeRTOS_TCP_Utils_IPV4.c
+ * @file FreeRTOS_TCP_Utils_IPv4.c
  * @brief Module contains utility functions used by FreeRTOS+TCP module.
  *
  * Endianness: in this module all ports and IP addresses are stored in
diff --git a/source/FreeRTOS_TCP_Utils_IPV6.c b/source/FreeRTOS_TCP_Utils_IPv6.c
similarity index 99%
rename from source/FreeRTOS_TCP_Utils_IPV6.c
rename to source/FreeRTOS_TCP_Utils_IPv6.c
index 3db9a2e1ef..2c78b50561 100644
--- a/source/FreeRTOS_TCP_Utils_IPV6.c
+++ b/source/FreeRTOS_TCP_Utils_IPv6.c
@@ -26,7 +26,7 @@
  */
 
 /**
- * @file FreeRTOS_TCP_Utils_IPV6.c
+ * @file FreeRTOS_TCP_Utils_IPv6.c
  * @brief Module contains utility functions used by FreeRTOS+TCP module.
  *
  * Endianness: in this module all ports and IP addresses are stored in
diff --git a/test/cbmc/proofs/TCP/prvHandleListen/Makefile.json b/test/cbmc/proofs/TCP/prvHandleListen/Makefile.json
index e370f51e40..856e50c30c 100644
--- a/test/cbmc/proofs/TCP/prvHandleListen/Makefile.json
+++ b/test/cbmc/proofs/TCP/prvHandleListen/Makefile.json
@@ -10,7 +10,7 @@
     "$(ENTRY)_harness.goto",
     "$(FREERTOS_PLUS_TCP)/test/cbmc/stubs/cbmc.goto",
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_State_Handling.goto",
-    "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_State_Handling_IPV4.goto"
+    "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_State_Handling_IPv4.goto"
   ],
   "DEF":
   [
diff --git a/test/cbmc/proofs/TCP/prvHandleListen_IPv6/Makefile.json b/test/cbmc/proofs/TCP/prvHandleListen_IPv6/Makefile.json
index d3ad119a03..aa1ee4f706 100644
--- a/test/cbmc/proofs/TCP/prvHandleListen_IPv6/Makefile.json
+++ b/test/cbmc/proofs/TCP/prvHandleListen_IPv6/Makefile.json
@@ -12,7 +12,7 @@
     "$(ENTRY)_harness.goto",
     "$(FREERTOS_PLUS_TCP)/test/cbmc/stubs/cbmc.goto",
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_State_Handling.goto",
-    "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_State_Handling_IPV6.goto"
+    "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_State_Handling_IPv6.goto"
   ],
   "DEF":
   [
diff --git a/test/cbmc/proofs/TCP/prvTCPReturnPacket/Makefile.json b/test/cbmc/proofs/TCP/prvTCPReturnPacket/Makefile.json
index 77cf10de68..1b67f5a076 100644
--- a/test/cbmc/proofs/TCP/prvTCPReturnPacket/Makefile.json
+++ b/test/cbmc/proofs/TCP/prvTCPReturnPacket/Makefile.json
@@ -40,7 +40,7 @@
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_Stream_Buffer.goto",
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_IP.goto",
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_IP.goto",
-    "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_Transmission_IPV4.goto",
+    "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_Transmission_IPv4.goto",
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_Transmission.goto"
   ],
   "DEF":
diff --git a/test/cbmc/proofs/TCP/prvTCPReturnPacket_IPv6/Makefile.json b/test/cbmc/proofs/TCP/prvTCPReturnPacket_IPv6/Makefile.json
index 9d9475fa05..9b28c3b345 100644
--- a/test/cbmc/proofs/TCP/prvTCPReturnPacket_IPv6/Makefile.json
+++ b/test/cbmc/proofs/TCP/prvTCPReturnPacket_IPv6/Makefile.json
@@ -12,7 +12,7 @@
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_Stream_Buffer.goto",
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_IP.goto",
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_IP.goto",
-    "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_Transmission_IPV6.goto",
+    "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_Transmission_IPv6.goto",
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_Transmission.goto"
   ],
   "DEF":
diff --git a/test/cbmc/proofs/parsing/ProcessReceivedTCPPacket/Makefile.json b/test/cbmc/proofs/parsing/ProcessReceivedTCPPacket/Makefile.json
index 89025994ea..f2643c9b98 100644
--- a/test/cbmc/proofs/parsing/ProcessReceivedTCPPacket/Makefile.json
+++ b/test/cbmc/proofs/parsing/ProcessReceivedTCPPacket/Makefile.json
@@ -14,9 +14,9 @@
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_IP_Utils.goto",
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_IP_Timers.goto",
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_IP.goto",
-    "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_IP_IPV4.goto",
+    "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_IP_IPv4.goto",
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_Transmission.goto",
-    "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_Transmission_IPV4.goto",
+    "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_Transmission_IPv4.goto",
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_State_Handling.goto",
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_Utils.goto",
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_Reception.goto"
diff --git a/test/cbmc/proofs/parsing/ProcessReceivedTCPPacket_IPv6/Makefile.json b/test/cbmc/proofs/parsing/ProcessReceivedTCPPacket_IPv6/Makefile.json
index 16edfef228..53a28f7332 100644
--- a/test/cbmc/proofs/parsing/ProcessReceivedTCPPacket_IPv6/Makefile.json
+++ b/test/cbmc/proofs/parsing/ProcessReceivedTCPPacket_IPv6/Makefile.json
@@ -11,9 +11,9 @@
     "$(ENTRY)_harness.goto",
     "$(FREERTOS_PLUS_TCP)/test/cbmc/stubs/cbmc.goto",
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_IP.goto",
-    "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_IP_IPV6.goto",
+    "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_IP_IPv6.goto",
     "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_Transmission.goto",
-    "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_Transmission_IPV6.goto"
+    "$(FREERTOS_PLUS_TCP)/source/FreeRTOS_TCP_Transmission_IPv6.goto"
   ],
   "INSTFLAGS":
   [
diff --git a/test/unit-test/CMakeLists.txt b/test/unit-test/CMakeLists.txt
index b64ee924ae..a715d9f004 100644
--- a/test/unit-test/CMakeLists.txt
+++ b/test/unit-test/CMakeLists.txt
@@ -302,13 +302,13 @@ include( ${UNIT_TEST_DIR}/FreeRTOS_TCP_Reception/ut.cmake )
 include( ${UNIT_TEST_DIR}/FreeRTOS_TCP_IP/ut.cmake )
 include( ${UNIT_TEST_DIR}/FreeRTOS_TCP_IP_DiffConfig/ut.cmake )
 include( ${UNIT_TEST_DIR}/FreeRTOS_TCP_State_Handling/ut.cmake )
-include( ${UNIT_TEST_DIR}/FreeRTOS_TCP_State_Handling_IPV4/ut.cmake )
-include( ${UNIT_TEST_DIR}/FreeRTOS_TCP_State_Handling_IPV6/ut.cmake )
+include( ${UNIT_TEST_DIR}/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake )
+include( ${UNIT_TEST_DIR}/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake )
 include( ${UNIT_TEST_DIR}/FreeRTOS_TCP_Transmission/ut.cmake )
-include( ${UNIT_TEST_DIR}/FreeRTOS_TCP_Transmission_IPV6/ut.cmake )
+include( ${UNIT_TEST_DIR}/FreeRTOS_TCP_Transmission_IPv6/ut.cmake )
 include( ${UNIT_TEST_DIR}/FreeRTOS_TCP_Utils/ut.cmake )
-include( ${UNIT_TEST_DIR}/FreeRTOS_TCP_Utils_IPV6/ut.cmake )
-include( ${UNIT_TEST_DIR}/FreeRTOS_TCP_Utils_IPV6_ConfigLowTCPMSS/ut.cmake )
+include( ${UNIT_TEST_DIR}/FreeRTOS_TCP_Utils_IPv6/ut.cmake )
+include( ${UNIT_TEST_DIR}/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake )
 include( ${UNIT_TEST_DIR}/FreeRTOS_IPv6/ut.cmake )
 include( ${UNIT_TEST_DIR}/FreeRTOS_IPv6_ConfigDriverCheckChecksum/ut.cmake )
 include( ${UNIT_TEST_DIR}/FreeRTOS_Sockets_IPv6/ut.cmake )
@@ -348,14 +348,14 @@ add_custom_target( coverage
     FreeRTOS_Tiny_TCP_utest
     FreeRTOS_TCP_Reception_utest
     FreeRTOS_TCP_State_Handling_utest
-    FreeRTOS_TCP_State_Handling_IPV4_utest
-    FreeRTOS_TCP_State_Handling_IPV6_utest
+    FreeRTOS_TCP_State_Handling_IPv4_utest
+    FreeRTOS_TCP_State_Handling_IPv6_utest
     FreeRTOS_TCP_Transmission
-    FreeRTOS_TCP_Transmission_IPV6
+    FreeRTOS_TCP_Transmission_IPv6
     FreeRTOS_TCP_IP
     FreeRTOS_TCP_Utils
-    FreeRTOS_TCP_Utils_IPV6_utest
-    FreeRTOS_TCP_Utils_IPV6_ConfigLowTCPMSS_utest
+    FreeRTOS_TCP_Utils_IPv6_utest
+    FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS_utest
     FreeRTOS_Sockets_GenericAPI_utest
     FreeRTOS_Sockets_privates_utest
     FreeRTOS_Sockets_TCP_API_utest
diff --git a/test/unit-test/FreeRTOS_TCP_IP/ut.cmake b/test/unit-test/FreeRTOS_TCP_IP/ut.cmake
index 41c092143e..f0509f4a5e 100644
--- a/test/unit-test/FreeRTOS_TCP_IP/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_IP/ut.cmake
@@ -52,7 +52,7 @@ set(real_source_files "")
 # list the files you would like to test here
 list(APPEND real_source_files
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources/${project_name}.c
-            ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources/${project_name}_IPV4.c
+            ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources/${project_name}_IPv4.c
 	)
 
 set(real_include_directories "")
diff --git a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/ut.cmake b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/ut.cmake
index 25b0ace6d4..55de3dba00 100644
--- a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/ut.cmake
@@ -52,7 +52,7 @@ set(real_source_files "")
 # list the files you would like to test here
 list(APPEND real_source_files
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources/FreeRTOS_TCP_IP.c
-            ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources/FreeRTOS_TCP_IP_IPV4.c
+            ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources/FreeRTOS_TCP_IP_IPv4.c
             ${MODULE_ROOT_DIR}/test/unit-test/${project_name}/${project_name}_stubs.c
 	)
 
diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPV4/FreeRTOS_TCP_State_Handling_IPV4_utest.c b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/FreeRTOS_TCP_State_Handling_IPv4_utest.c
similarity index 99%
rename from test/unit-test/FreeRTOS_TCP_State_Handling_IPV4/FreeRTOS_TCP_State_Handling_IPV4_utest.c
rename to test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/FreeRTOS_TCP_State_Handling_IPv4_utest.c
index 5b320e3af1..acf161694a 100644
--- a/test/unit-test/FreeRTOS_TCP_State_Handling_IPV4/FreeRTOS_TCP_State_Handling_IPV4_utest.c
+++ b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/FreeRTOS_TCP_State_Handling_IPv4_utest.c
@@ -40,7 +40,7 @@
 #include "mock_FreeRTOS_TCP_Transmission.h"
 #include "mock_FreeRTOS_TCP_Utils.h"
 #include "mock_FreeRTOS_TCP_IP.h"
-#include "mock_TCP_State_Handling_IPV4_list_macros.h"
+#include "mock_TCP_State_Handling_IPv4_list_macros.h"
 
 #include "catch_assert.h"
 
diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPV4/TCP_State_Handling_IPV4_list_macros.h b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/TCP_State_Handling_IPv4_list_macros.h
similarity index 100%
rename from test/unit-test/FreeRTOS_TCP_State_Handling_IPV4/TCP_State_Handling_IPV4_list_macros.h
rename to test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/TCP_State_Handling_IPv4_list_macros.h
diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPV4/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake
similarity index 97%
rename from test/unit-test/FreeRTOS_TCP_State_Handling_IPV4/ut.cmake
rename to test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake
index a16fce23bf..4bb8a8f911 100644
--- a/test/unit-test/FreeRTOS_TCP_State_Handling_IPV4/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/ut.cmake
@@ -2,7 +2,7 @@
 include( ${MODULE_ROOT_DIR}/test/unit-test/TCPFilePaths.cmake )
 
 # ====================  Define your project name (edit) ========================
-set( project_name "FreeRTOS_TCP_State_Handling_IPV4" )
+set( project_name "FreeRTOS_TCP_State_Handling_IPv4" )
 message( STATUS "${project_name}" )
 
 # =====================  Create your mock here  (edit)  ========================
@@ -20,7 +20,7 @@ list(APPEND mock_list
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_TCP_Transmission.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_TCP_Utils.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_TCP_IP.h"
-            "${MODULE_ROOT_DIR}/test/unit-test/${project_name}/TCP_State_Handling_IPV4_list_macros.h"
+            "${MODULE_ROOT_DIR}/test/unit-test/${project_name}/TCP_State_Handling_IPv4_list_macros.h"
         )
 
 set(mock_include_list "")
diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPV6/FreeRTOS_TCP_State_Handling_IPV6_utest.c b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/FreeRTOS_TCP_State_Handling_IPv6_utest.c
similarity index 99%
rename from test/unit-test/FreeRTOS_TCP_State_Handling_IPV6/FreeRTOS_TCP_State_Handling_IPV6_utest.c
rename to test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/FreeRTOS_TCP_State_Handling_IPv6_utest.c
index 475dfff6c7..0c0897b309 100644
--- a/test/unit-test/FreeRTOS_TCP_State_Handling_IPV6/FreeRTOS_TCP_State_Handling_IPV6_utest.c
+++ b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/FreeRTOS_TCP_State_Handling_IPv6_utest.c
@@ -39,7 +39,7 @@
 #include "mock_FreeRTOS_Sockets.h"
 #include "mock_FreeRTOS_TCP_Transmission.h"
 #include "mock_FreeRTOS_TCP_Utils.h"
-#include "mock_TCP_State_Handling_IPV6_list_macros.h"
+#include "mock_TCP_State_Handling_IPv6_list_macros.h"
 
 #include "catch_assert.h"
 
diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPV6/TCP_State_Handling_IPV6_list_macros.h b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/TCP_State_Handling_IPv6_list_macros.h
similarity index 100%
rename from test/unit-test/FreeRTOS_TCP_State_Handling_IPV6/TCP_State_Handling_IPV6_list_macros.h
rename to test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/TCP_State_Handling_IPv6_list_macros.h
diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPV6/ut.cmake b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake
similarity index 97%
rename from test/unit-test/FreeRTOS_TCP_State_Handling_IPV6/ut.cmake
rename to test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake
index 0a4422bb36..ac1d362a25 100644
--- a/test/unit-test/FreeRTOS_TCP_State_Handling_IPV6/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/ut.cmake
@@ -2,7 +2,7 @@
 include( ${MODULE_ROOT_DIR}/test/unit-test/TCPFilePaths.cmake )
 
 # ====================  Define your project name (edit) ========================
-set( project_name "FreeRTOS_TCP_State_Handling_IPV6" )
+set( project_name "FreeRTOS_TCP_State_Handling_IPv6" )
 message( STATUS "${project_name}" )
 
 # =====================  Create your mock here  (edit)  ========================
@@ -19,7 +19,7 @@ list(APPEND mock_list
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_Sockets.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_TCP_Transmission.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_TCP_Utils.h"
-            "${MODULE_ROOT_DIR}/test/unit-test/${project_name}/TCP_State_Handling_IPV6_list_macros.h"
+            "${MODULE_ROOT_DIR}/test/unit-test/${project_name}/TCP_State_Handling_IPv6_list_macros.h"
         )
 
 set(mock_include_list "")
diff --git a/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake b/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake
index a1aa6285da..f8dd38385f 100644
--- a/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_Transmission/ut.cmake
@@ -59,7 +59,7 @@ set(real_source_files "")
 # list the files you would like to test here
 list(APPEND real_source_files
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources/${project_name}.c
-            ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources/${project_name}_IPV4.c
+            ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources/${project_name}_IPv4.c
 	)
 
 set(real_include_directories "")
diff --git a/test/unit-test/FreeRTOS_TCP_Transmission_IPV6/FreeRTOS_TCP_Transmission_IPV6_stubs.c b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/FreeRTOS_TCP_Transmission_IPv6_stubs.c
similarity index 100%
rename from test/unit-test/FreeRTOS_TCP_Transmission_IPV6/FreeRTOS_TCP_Transmission_IPV6_stubs.c
rename to test/unit-test/FreeRTOS_TCP_Transmission_IPv6/FreeRTOS_TCP_Transmission_IPv6_stubs.c
diff --git a/test/unit-test/FreeRTOS_TCP_Transmission_IPV6/FreeRTOS_TCP_Transmission_IPV6_utest.c b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/FreeRTOS_TCP_Transmission_IPv6_utest.c
similarity index 99%
rename from test/unit-test/FreeRTOS_TCP_Transmission_IPV6/FreeRTOS_TCP_Transmission_IPV6_utest.c
rename to test/unit-test/FreeRTOS_TCP_Transmission_IPv6/FreeRTOS_TCP_Transmission_IPv6_utest.c
index a762dd9488..a2d8f82a23 100644
--- a/test/unit-test/FreeRTOS_TCP_Transmission_IPV6/FreeRTOS_TCP_Transmission_IPV6_utest.c
+++ b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/FreeRTOS_TCP_Transmission_IPv6_utest.c
@@ -47,7 +47,7 @@
 #include "mock_FreeRTOS_ND.h"
 
 #include "FreeRTOS_TCP_Transmission.h"
-#include "FreeRTOS_TCP_Transmission_IPV6_stubs.c"
+#include "FreeRTOS_TCP_Transmission_IPv6_stubs.c"
 
 #include "catch_assert.h"
 
diff --git a/test/unit-test/FreeRTOS_TCP_Transmission_IPV6/ut.cmake b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake
similarity index 98%
rename from test/unit-test/FreeRTOS_TCP_Transmission_IPV6/ut.cmake
rename to test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake
index 44778036d3..5b45fa3477 100644
--- a/test/unit-test/FreeRTOS_TCP_Transmission_IPV6/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/ut.cmake
@@ -2,7 +2,7 @@
 include( ${MODULE_ROOT_DIR}/test/unit-test/TCPFilePaths.cmake )
 
 # ====================  Define your project name (edit) ========================
-set( project_name "FreeRTOS_TCP_Transmission_IPV6" )
+set( project_name "FreeRTOS_TCP_Transmission_IPv6" )
 message( STATUS "${project_name}" )
 
 # =====================  Create your mock here  (edit)  ========================
diff --git a/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake
index 34c9196384..2c49375829 100644
--- a/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_Utils/ut.cmake
@@ -40,7 +40,7 @@ set(real_source_files "")
 # list the files you would like to test here
 list(APPEND real_source_files
             ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources/${project_name}.c
-            ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources/${project_name}_IPV4.c
+            ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources/${project_name}_IPv4.c
 	)
 
 set(real_include_directories "")
diff --git a/test/unit-test/FreeRTOS_TCP_Utils_IPV6/FreeRTOS_TCP_Utils_IPV6_utest.c b/test/unit-test/FreeRTOS_TCP_Utils_IPv6/FreeRTOS_TCP_Utils_IPv6_utest.c
similarity index 100%
rename from test/unit-test/FreeRTOS_TCP_Utils_IPV6/FreeRTOS_TCP_Utils_IPV6_utest.c
rename to test/unit-test/FreeRTOS_TCP_Utils_IPv6/FreeRTOS_TCP_Utils_IPv6_utest.c
diff --git a/test/unit-test/FreeRTOS_TCP_Utils_IPV6/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake
similarity index 98%
rename from test/unit-test/FreeRTOS_TCP_Utils_IPV6/ut.cmake
rename to test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake
index b795aa40d0..21f73d4a1a 100644
--- a/test/unit-test/FreeRTOS_TCP_Utils_IPV6/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_Utils_IPv6/ut.cmake
@@ -2,7 +2,7 @@
 include( ${MODULE_ROOT_DIR}/test/unit-test/TCPFilePaths.cmake )
 
 # ====================  Define your project name (edit) ========================
-set( project_name "FreeRTOS_TCP_Utils_IPV6" )
+set( project_name "FreeRTOS_TCP_Utils_IPv6" )
 message( STATUS "${project_name}" )
 
 # =====================  Create your mock here  (edit)  ========================
diff --git a/test/unit-test/FreeRTOS_TCP_Utils_IPV6_ConfigLowTCPMSS/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/FreeRTOSIPConfig.h
similarity index 100%
rename from test/unit-test/FreeRTOS_TCP_Utils_IPV6_ConfigLowTCPMSS/FreeRTOSIPConfig.h
rename to test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/FreeRTOSIPConfig.h
diff --git a/test/unit-test/FreeRTOS_TCP_Utils_IPV6_ConfigLowTCPMSS/FreeRTOS_TCP_Utils_IPV6_ConfigLowTCPMSS_utest.c b/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS_utest.c
similarity index 100%
rename from test/unit-test/FreeRTOS_TCP_Utils_IPV6_ConfigLowTCPMSS/FreeRTOS_TCP_Utils_IPV6_ConfigLowTCPMSS_utest.c
rename to test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS_utest.c
diff --git a/test/unit-test/FreeRTOS_TCP_Utils_IPV6_ConfigLowTCPMSS/ut.cmake b/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake
similarity index 97%
rename from test/unit-test/FreeRTOS_TCP_Utils_IPV6_ConfigLowTCPMSS/ut.cmake
rename to test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake
index 90c9f01591..dcf2f17962 100644
--- a/test/unit-test/FreeRTOS_TCP_Utils_IPV6_ConfigLowTCPMSS/ut.cmake
+++ b/test/unit-test/FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS/ut.cmake
@@ -2,7 +2,7 @@
 include( ${MODULE_ROOT_DIR}/test/unit-test/TCPFilePaths.cmake )
 
 # ====================  Define your project name (edit) ========================
-set( project_name "FreeRTOS_TCP_Utils_IPV6_ConfigLowTCPMSS" )
+set( project_name "FreeRTOS_TCP_Utils_IPv6_ConfigLowTCPMSS" )
 message( STATUS "${project_name}" )
 
 # =====================  Create your mock here  (edit)  ========================
@@ -38,7 +38,7 @@ set(real_source_files "")
 
 # list the files you would like to test here
 list(APPEND real_source_files
-            ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources/FreeRTOS_TCP_Utils_IPV6.c
+            ${CMAKE_BINARY_DIR}/Annexed_TCP_Sources/FreeRTOS_TCP_Utils_IPv6.c
 	)
 
 set(real_include_directories "")
diff --git a/test/unit-test/TCPFilePaths.cmake b/test/unit-test/TCPFilePaths.cmake
index d32f467e9d..6b4500bd76 100644
--- a/test/unit-test/TCPFilePaths.cmake
+++ b/test/unit-test/TCPFilePaths.cmake
@@ -29,17 +29,17 @@ set( TCP_SOURCES
      "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_IPv6_Sockets.c"
      "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_Stream_Buffer.c"
      "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_IP.c"
-     "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_IP_IPV4.c"
+     "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_IP_IPv4.c"
      "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_Transmission.c"
-     "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_Transmission_IPV4.c"
-     "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_Transmission_IPV6.c"
+     "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_Transmission_IPv4.c"
+     "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_Transmission_IPv6.c"
      "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_Reception.c"
      "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_State_Handling.c"
-     "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_State_Handling_IPV4.c"
-     "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_State_Handling_IPV6.c"
+     "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_State_Handling_IPv4.c"
+     "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_State_Handling_IPv6.c"
      "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_Utils.c"
-     "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_Utils_IPV4.c"
-     "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_Utils_IPV6.c"
+     "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_Utils_IPv4.c"
+     "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_Utils_IPv6.c"
      "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_TCP_WIN.c"
      "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_Tiny_TCP.c"
      "${CMAKE_CURRENT_LIST_DIR}/../../source/FreeRTOS_UDP_IP.c"