diff --git a/connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h b/connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h
index a31021f2e2..068c06be5c 100644
--- a/connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h
+++ b/connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h
@@ -111,7 +111,7 @@ public:
     const char *get_mac_address() override;
 
     /** @copydoc NetworkInterface::set_mac_address */
-    nsapi_error_t set_mac_address(uint8_t *mac_addr, size_t addr_len) override;
+    nsapi_error_t set_mac_address(uint8_t *mac_addr, nsapi_size_t addr_len) override;
 
     /** Register callback for status reporting
      *
diff --git a/connectivity/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp b/connectivity/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp
index f192a97df4..390a9ba2f6 100644
--- a/connectivity/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp
+++ b/connectivity/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp
@@ -218,7 +218,7 @@ const char *InterfaceNanostack::get_mac_address()
     return NULL;
 }
 
-nsapi_error_t InterfaceNanostack::set_mac_address(uint8_t *mac_addr, size_t addr_len)
+nsapi_error_t InterfaceNanostack::set_mac_address(uint8_t *mac_addr, nsapi_size_t addr_len)
 {
     return _interface->set_mac_address(mac_addr, addr_len);
 }
diff --git a/connectivity/netsocket/include/netsocket/EMACInterface.h b/connectivity/netsocket/include/netsocket/EMACInterface.h
index 54d3ffcf34..d9b8f5657e 100644
--- a/connectivity/netsocket/include/netsocket/EMACInterface.h
+++ b/connectivity/netsocket/include/netsocket/EMACInterface.h
@@ -87,7 +87,7 @@ public:
     const char *get_mac_address() override;
 
     /** @copydoc NetworkInterface::set_mac_address */
-    nsapi_error_t set_mac_address(uint8_t *mac_addr, size_t addr_len);
+    nsapi_error_t set_mac_address(uint8_t *mac_addr, nsapi_size_t addr_len);
 
     /** @copydoc NetworkInterface::get_ip_address */
     nsapi_error_t get_ip_address(SocketAddress *address) override;
diff --git a/connectivity/netsocket/include/netsocket/NetworkInterface.h b/connectivity/netsocket/include/netsocket/NetworkInterface.h
index 5bada8c5ce..b632f8c2ba 100644
--- a/connectivity/netsocket/include/netsocket/NetworkInterface.h
+++ b/connectivity/netsocket/include/netsocket/NetworkInterface.h
@@ -117,7 +117,7 @@ public:
      *  @retval         NSAPI_ERROR_PARAMETER if address is not valid
      *  @retval         NSAPI_ERROR_BUSY if address can't be set.
      */
-    virtual nsapi_error_t set_mac_address(uint8_t *mac_addr, size_t addr_len);
+    virtual nsapi_error_t set_mac_address(uint8_t *mac_addr, nsapi_size_t addr_len);
 
     /** Get the local IP address
      *
diff --git a/connectivity/netsocket/source/EMACInterface.cpp b/connectivity/netsocket/source/EMACInterface.cpp
index dbafa0a7ae..7e9426c517 100644
--- a/connectivity/netsocket/source/EMACInterface.cpp
+++ b/connectivity/netsocket/source/EMACInterface.cpp
@@ -87,7 +87,7 @@ const char *EMACInterface::get_mac_address()
     return nullptr;
 }
 
-nsapi_error_t EMACInterface::set_mac_address(uint8_t *mac_addr, size_t addr_len)
+nsapi_error_t EMACInterface::set_mac_address(uint8_t *mac_addr, nsapi_size_t addr_len)
 {
     if (!mac_addr || addr_len != NSAPI_MAC_BYTES) {
         return NSAPI_ERROR_PARAMETER;
diff --git a/connectivity/netsocket/source/NetworkInterface.cpp b/connectivity/netsocket/source/NetworkInterface.cpp
index 0e17919d8f..3dcd4b33fe 100644
--- a/connectivity/netsocket/source/NetworkInterface.cpp
+++ b/connectivity/netsocket/source/NetworkInterface.cpp
@@ -33,7 +33,7 @@ const char *NetworkInterface::get_mac_address()
     return 0;
 }
 
-nsapi_error_t NetworkInterface::set_mac_address(uint8_t *mac_addr, size_t addr_len)
+nsapi_error_t NetworkInterface::set_mac_address(uint8_t *mac_addr, nsapi_size_t addr_len)
 {
     return NSAPI_ERROR_UNSUPPORTED;
 }