diff --git a/src/platform/Darwin/DnssdHostNameRegistrar.cpp b/src/platform/Darwin/DnssdHostNameRegistrar.cpp
index 7ae1c82b85828c..3847a024ea4623 100644
--- a/src/platform/Darwin/DnssdHostNameRegistrar.cpp
+++ b/src/platform/Darwin/DnssdHostNameRegistrar.cpp
@@ -154,7 +154,7 @@ void LogDetails(InetInterfacesVector inetInterfaces, Inet6InterfacesVector inet6
 
     for (auto interfaceId : interfaceIds)
     {
-        char interfaceName[IFNAMSIZ] = {};
+        char interfaceName[chip::Inet::InterfaceId::kMaxIfNameLength] = {};
         if_indextoname(interfaceId, interfaceName);
         ChipLogProgress(Discovery, "\t%s (%u)", interfaceName, interfaceId);
         LogDetails(interfaceId, inetInterfaces, inet6Interfaces);
diff --git a/src/platform/Darwin/NetworkCommissioningDriver.h b/src/platform/Darwin/NetworkCommissioningDriver.h
index bc8da71831400b..ff87d6cf6fa02c 100644
--- a/src/platform/Darwin/NetworkCommissioningDriver.h
+++ b/src/platform/Darwin/NetworkCommissioningDriver.h
@@ -48,9 +48,9 @@ class DarwinNetworkIterator : public NetworkIterator
     void Release() override { delete this; }
 
 protected:
-    size_t mInterfaceCount        = 0;
-    char mInterfaceName[IFNAMSIZ] = {};
-    bool mInterfaceStatus         = false;
+    size_t mInterfaceCount                                         = 0;
+    char mInterfaceName[chip::Inet::InterfaceId::kMaxIfNameLength] = {};
+    bool mInterfaceStatus                                          = false;
 };
 
 class DarwinEthernetNetworkIterator final : public DarwinNetworkIterator
diff --git a/src/platform/Darwin/WiFi/ConnectivityManagerImplWiFi.mm b/src/platform/Darwin/WiFi/ConnectivityManagerImplWiFi.mm
index 6f95e93550d01f..46e0e7a3521373 100644
--- a/src/platform/Darwin/WiFi/ConnectivityManagerImplWiFi.mm
+++ b/src/platform/Darwin/WiFi/ConnectivityManagerImplWiFi.mm
@@ -79,7 +79,7 @@
         bool status = false;
 
         if (_GetWiFiStationMode() == kWiFiStationMode_Enabled) {
-            char interfaceName[IFNAMSIZ];
+            char interfaceName[chip::Inet::InterfaceId::kMaxIfNameLength];
             VerifyOrReturnError(CHIP_NO_ERROR == GetWiFiInterfaceName(interfaceName, sizeof(interfaceName)), false);
             VerifyOrReturnError(CHIP_NO_ERROR == GetInterfaceStatus(interfaceName, &status), false);
         }
diff --git a/src/platform/Linux/ConfigurationManagerImpl.cpp b/src/platform/Linux/ConfigurationManagerImpl.cpp
index 92e2c1e290b7bc..977216192de95f 100644
--- a/src/platform/Linux/ConfigurationManagerImpl.cpp
+++ b/src/platform/Linux/ConfigurationManagerImpl.cpp
@@ -143,13 +143,13 @@ CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
     {
         if ((addr->ifa_addr) && (addr->ifa_addr->sa_family == AF_PACKET))
         {
-            if (strncmp(addr->ifa_name, CHIP_DEVICE_CONFIG_WIFI_STATION_IF_NAME, IFNAMSIZ) == 0)
+            if (strncmp(addr->ifa_name, CHIP_DEVICE_CONFIG_WIFI_STATION_IF_NAME, chip::Inet::InterfaceId::kMaxIfNameLength) == 0)
             {
                 mac = (struct sockaddr_ll *) addr->ifa_addr;
                 break;
             }
 
-            if (strncmp(addr->ifa_name, "lo", IFNAMSIZ) != 0 && !mac)
+            if (strncmp(addr->ifa_name, "lo", chip::Inet::InterfaceId::kMaxIfNameLength) != 0 && !mac)
             {
                 mac = (struct sockaddr_ll *) addr->ifa_addr;
             }
diff --git a/src/platform/Linux/ConnectivityManagerImpl.cpp b/src/platform/Linux/ConnectivityManagerImpl.cpp
index 5cf484ede31bf5..79caa83c1d754d 100644
--- a/src/platform/Linux/ConnectivityManagerImpl.cpp
+++ b/src/platform/Linux/ConnectivityManagerImpl.cpp
@@ -110,7 +110,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
     mpConnectCallback = nullptr;
     mpScanCallback    = nullptr;
 
-    if (ConnectivityUtils::GetEthInterfaceName(mEthIfName, IFNAMSIZ) == CHIP_NO_ERROR)
+    if (ConnectivityUtils::GetEthInterfaceName(mEthIfName, chip::Inet::InterfaceId::kMaxIfNameLength) == CHIP_NO_ERROR)
     {
         ChipLogProgress(DeviceLayer, "Got Ethernet interface: %s", mEthIfName);
     }
@@ -131,7 +131,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
 #endif
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
-    if (ConnectivityUtils::GetWiFiInterfaceName(sWiFiIfName, IFNAMSIZ) == CHIP_NO_ERROR)
+    if (ConnectivityUtils::GetWiFiInterfaceName(sWiFiIfName, chip::Inet::InterfaceId::kMaxIfNameLength) == CHIP_NO_ERROR)
     {
         ChipLogProgress(DeviceLayer, "Got WiFi interface: %s", sWiFiIfName);
     }
diff --git a/src/platform/Linux/ConnectivityManagerImpl.h b/src/platform/Linux/ConnectivityManagerImpl.h
index deb014a00e1610..69883861e885e4 100644
--- a/src/platform/Linux/ConnectivityManagerImpl.h
+++ b/src/platform/Linux/ConnectivityManagerImpl.h
@@ -289,7 +289,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
 
     // ===== Private members reserved for use by this class only.
 
-    char mEthIfName[IFNAMSIZ];
+    char mEthIfName[chip::Inet::InterfaceId::kMaxIfNameLength];
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WPA
     ConnectivityManager::WiFiStationMode mWiFiStationMode;
@@ -301,7 +301,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
 #endif
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
-    char sWiFiIfName[IFNAMSIZ];
+    char sWiFiIfName[chip::Inet::InterfaceId::kMaxIfNameLength];
 #endif
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WPA
diff --git a/src/platform/Linux/PlatformManagerImpl.cpp b/src/platform/Linux/PlatformManagerImpl.cpp
index ce33209e7429ac..53e07a80b40aff 100644
--- a/src/platform/Linux/PlatformManagerImpl.cpp
+++ b/src/platform/Linux/PlatformManagerImpl.cpp
@@ -100,7 +100,7 @@ gboolean WiFiIPChangeListener(GIOChannel * ch, GIOCondition /* condition */, voi
                 {
                     if (routeInfo->rta_type == IFA_LOCAL)
                     {
-                        char name[IFNAMSIZ];
+                        char name[chip::Inet::InterfaceId::kMaxIfNameLength];
                         if (if_indextoname(addressMessage->ifa_index, name) == nullptr)
                         {
                             ChipLogError(DeviceLayer, "Error %d when getting the interface name at index: %d", errno,
diff --git a/src/platform/NuttX/ConfigurationManagerImpl.cpp b/src/platform/NuttX/ConfigurationManagerImpl.cpp
index e451832433f2c2..7b88fd6206d033 100644
--- a/src/platform/NuttX/ConfigurationManagerImpl.cpp
+++ b/src/platform/NuttX/ConfigurationManagerImpl.cpp
@@ -143,13 +143,13 @@ CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
     {
         if ((addr->ifa_addr) && (addr->ifa_addr->sa_family == AF_PACKET))
         {
-            if (strncmp(addr->ifa_name, CHIP_DEVICE_CONFIG_WIFI_STATION_IF_NAME, IFNAMSIZ) == 0)
+            if (strncmp(addr->ifa_name, CHIP_DEVICE_CONFIG_WIFI_STATION_IF_NAME, chip::Inet::InterfaceId::kMaxIfNameLength) == 0)
             {
                 mac = (struct sockaddr_ll *) addr->ifa_addr;
                 break;
             }
 
-            if (strncmp(addr->ifa_name, "lo", IFNAMSIZ) != 0 && !mac)
+            if (strncmp(addr->ifa_name, "lo", chip::Inet::InterfaceId::kMaxIfNameLength) != 0 && !mac)
             {
                 mac = (struct sockaddr_ll *) addr->ifa_addr;
             }
diff --git a/src/platform/NuttX/ConnectivityManagerImpl.cpp b/src/platform/NuttX/ConnectivityManagerImpl.cpp
index ea4ca105bbcb45..347d14bf2cf14b 100644
--- a/src/platform/NuttX/ConnectivityManagerImpl.cpp
+++ b/src/platform/NuttX/ConnectivityManagerImpl.cpp
@@ -107,7 +107,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
     mpConnectCallback = nullptr;
     mpScanCallback    = nullptr;
 
-    if (ConnectivityUtils::GetEthInterfaceName(mEthIfName, IFNAMSIZ) == CHIP_NO_ERROR)
+    if (ConnectivityUtils::GetEthInterfaceName(mEthIfName, chip::Inet::InterfaceId::kMaxIfNameLength) == CHIP_NO_ERROR)
     {
         ChipLogProgress(DeviceLayer, "Got Ethernet interface: %s", mEthIfName);
     }
@@ -128,7 +128,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
 #endif
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
-    if (ConnectivityUtils::GetWiFiInterfaceName(sWiFiIfName, IFNAMSIZ) == CHIP_NO_ERROR)
+    if (ConnectivityUtils::GetWiFiInterfaceName(sWiFiIfName, chip::Inet::InterfaceId::kMaxIfNameLength) == CHIP_NO_ERROR)
     {
         ChipLogProgress(DeviceLayer, "Got WiFi interface: %s", sWiFiIfName);
     }
diff --git a/src/platform/NuttX/ConnectivityManagerImpl.h b/src/platform/NuttX/ConnectivityManagerImpl.h
index 0d96adcac6e6d8..45f09a9d715852 100644
--- a/src/platform/NuttX/ConnectivityManagerImpl.h
+++ b/src/platform/NuttX/ConnectivityManagerImpl.h
@@ -248,7 +248,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
 
     // ===== Private members reserved for use by this class only.
 
-    char mEthIfName[IFNAMSIZ];
+    char mEthIfName[chip::Inet::InterfaceId::kMaxIfNameLength];
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WPA
     ConnectivityManager::WiFiStationMode mWiFiStationMode;
@@ -260,7 +260,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
 #endif
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
-    char sWiFiIfName[IFNAMSIZ];
+    char sWiFiIfName[chip::Inet::InterfaceId::kMaxIfNameLength];
 #endif
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WPA
diff --git a/src/platform/NuttX/PlatformManagerImpl.cpp b/src/platform/NuttX/PlatformManagerImpl.cpp
index a44f0846e6522f..d7a448f2fd9364 100644
--- a/src/platform/NuttX/PlatformManagerImpl.cpp
+++ b/src/platform/NuttX/PlatformManagerImpl.cpp
@@ -99,7 +99,7 @@ gboolean WiFiIPChangeListener(GIOChannel * ch, GIOCondition /* condition */, voi
                 {
                     if (routeInfo->rta_type == IFA_LOCAL)
                     {
-                        char name[IFNAMSIZ];
+                        char name[chip::Inet::InterfaceId::kMaxIfNameLength];
                         if (if_indextoname(addressMessage->ifa_index, name) == nullptr)
                         {
                             ChipLogError(DeviceLayer, "Error %d when getting the interface name at index: %d", errno,
diff --git a/src/platform/Tizen/ConnectivityManagerImpl.cpp b/src/platform/Tizen/ConnectivityManagerImpl.cpp
index 063765687b4071..dddec408f0ffe5 100644
--- a/src/platform/Tizen/ConnectivityManagerImpl.cpp
+++ b/src/platform/Tizen/ConnectivityManagerImpl.cpp
@@ -72,7 +72,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
-    if (ConnectivityUtils::GetEthInterfaceName(mEthIfName, IFNAMSIZ) == CHIP_NO_ERROR)
+    if (ConnectivityUtils::GetEthInterfaceName(mEthIfName, chip::Inet::InterfaceId::kMaxIfNameLength) == CHIP_NO_ERROR)
     {
         ChipLogProgress(DeviceLayer, "Got Ethernet interface: %s", mEthIfName);
     }
@@ -92,7 +92,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
 
     Internal::WiFiMgr().Init();
 
-    if (ConnectivityUtils::GetWiFiInterfaceName(sWiFiIfName, IFNAMSIZ) == CHIP_NO_ERROR)
+    if (ConnectivityUtils::GetWiFiInterfaceName(sWiFiIfName, chip::Inet::InterfaceId::kMaxIfNameLength) == CHIP_NO_ERROR)
     {
         ChipLogProgress(DeviceLayer, "Got WiFi interface: %s", sWiFiIfName);
     }
diff --git a/src/platform/Tizen/ConnectivityManagerImpl.h b/src/platform/Tizen/ConnectivityManagerImpl.h
index 4d982acac2bf97..b14b5380737737 100644
--- a/src/platform/Tizen/ConnectivityManagerImpl.h
+++ b/src/platform/Tizen/ConnectivityManagerImpl.h
@@ -134,7 +134,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
 
     // ===== Private members reserved for use by this class only.
 
-    char mEthIfName[IFNAMSIZ];
+    char mEthIfName[chip::Inet::InterfaceId::kMaxIfNameLength];
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
     ConnectivityManager::WiFiStationMode mWiFiStationMode;
@@ -143,7 +143,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
     System::Clock::Timestamp mLastAPDemandTime;
     System::Clock::Timeout mWiFiStationReconnectInterval;
     System::Clock::Timeout mWiFiAPIdleTimeout;
-    static char sWiFiIfName[IFNAMSIZ];
+    static char sWiFiIfName[chip::Inet::InterfaceId::kMaxIfNameLength];
 #endif
 };
 
diff --git a/src/platform/webos/ConfigurationManagerImpl.cpp b/src/platform/webos/ConfigurationManagerImpl.cpp
index 710840fe5aca29..5eda886b1c1336 100644
--- a/src/platform/webos/ConfigurationManagerImpl.cpp
+++ b/src/platform/webos/ConfigurationManagerImpl.cpp
@@ -133,7 +133,8 @@ CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
     VerifyOrExit(getifaddrs(&addresses) == 0, error = CHIP_ERROR_INTERNAL);
     for (auto addr = addresses; addr != nullptr; addr = addr->ifa_next)
     {
-        if ((addr->ifa_addr) && (addr->ifa_addr->sa_family == AF_PACKET) && strncmp(addr->ifa_name, "lo", IFNAMSIZ) != 0)
+        if ((addr->ifa_addr) && (addr->ifa_addr->sa_family == AF_PACKET) &&
+            strncmp(addr->ifa_name, "lo", chip::Inet::InterfaceId::kMaxIfNameLength) != 0)
         {
             struct sockaddr_ll * mac = (struct sockaddr_ll *) addr->ifa_addr;
             memcpy(buf, mac->sll_addr, mac->sll_halen);
diff --git a/src/platform/webos/ConnectivityManagerImpl.cpp b/src/platform/webos/ConnectivityManagerImpl.cpp
index e8640e11b1c747..f664d94b9153b1 100644
--- a/src/platform/webos/ConnectivityManagerImpl.cpp
+++ b/src/platform/webos/ConnectivityManagerImpl.cpp
@@ -93,7 +93,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
     mpConnectCallback = nullptr;
     mpScanCallback    = nullptr;
 
-    if (ConnectivityUtils::GetEthInterfaceName(mEthIfName, IFNAMSIZ) == CHIP_NO_ERROR)
+    if (ConnectivityUtils::GetEthInterfaceName(mEthIfName, chip::Inet::InterfaceId::kMaxIfNameLength) == CHIP_NO_ERROR)
     {
         ChipLogProgress(DeviceLayer, "Got Ethernet interface: %s", mEthIfName);
     }
@@ -114,7 +114,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
 #endif
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
-    if (ConnectivityUtils::GetWiFiInterfaceName(sWiFiIfName, IFNAMSIZ) == CHIP_NO_ERROR)
+    if (ConnectivityUtils::GetWiFiInterfaceName(sWiFiIfName, chip::Inet::InterfaceId::kMaxIfNameLength) == CHIP_NO_ERROR)
     {
         ChipLogProgress(DeviceLayer, "Got WiFi interface: %s", sWiFiIfName);
     }
diff --git a/src/platform/webos/ConnectivityManagerImpl.h b/src/platform/webos/ConnectivityManagerImpl.h
index 220afd706c253a..80e7c0cdf689fb 100644
--- a/src/platform/webos/ConnectivityManagerImpl.h
+++ b/src/platform/webos/ConnectivityManagerImpl.h
@@ -231,7 +231,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
 
     // ===== Private members reserved for use by this class only.
 
-    char mEthIfName[IFNAMSIZ];
+    char mEthIfName[chip::Inet::InterfaceId::kMaxIfNameLength];
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WPA
     ConnectivityManager::WiFiStationMode mWiFiStationMode;
@@ -243,7 +243,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
 #endif
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
-    static char sWiFiIfName[IFNAMSIZ];
+    static char sWiFiIfName[chip::Inet::InterfaceId::kMaxIfNameLength];
 #endif
 
     static NetworkCommissioning::WiFiDriver::ScanCallback * mpScanCallback;
diff --git a/src/platform/webos/PlatformManagerImpl.cpp b/src/platform/webos/PlatformManagerImpl.cpp
index 55995248caa5f0..b3a6984ad6d40d 100644
--- a/src/platform/webos/PlatformManagerImpl.cpp
+++ b/src/platform/webos/PlatformManagerImpl.cpp
@@ -103,7 +103,7 @@ void PlatformManagerImpl::WiFiIPChangeListener()
                 {
                     if (routeInfo->rta_type == IFA_LOCAL)
                     {
-                        char name[IFNAMSIZ];
+                        char name[chip::Inet::InterfaceId::kMaxIfNameLength];
                         if (if_indextoname(addressMessage->ifa_index, name) == nullptr)
                         {
                             ChipLogError(DeviceLayer, "Error %d when getting the interface name at index: %d", errno,