diff --git a/TESTS/netsocket/tcp/main.cpp b/TESTS/netsocket/tcp/main.cpp
index b49e9a9689..7185b57787 100644
--- a/TESTS/netsocket/tcp/main.cpp
+++ b/TESTS/netsocket/tcp/main.cpp
@@ -37,7 +37,7 @@ namespace {
 Timer tc_bucket; // Timer to limit a test cases run time
 }
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 mbed_stats_socket_t tcp_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];
 #endif
 
@@ -126,7 +126,7 @@ int split2half_rmng_tcp_test_time()
     return (tcp_global::TESTS_TIMEOUT - tc_bucket.read()) / 2;
 }
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 int fetch_stats()
 {
     return SocketStats::mbed_stats_socket_get_each(&tcp_stats[0], MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT);
diff --git a/TESTS/netsocket/tcp/tcp_tests.h b/TESTS/netsocket/tcp/tcp_tests.h
index bfa32306f1..0855a3fa40 100644
--- a/TESTS/netsocket/tcp/tcp_tests.h
+++ b/TESTS/netsocket/tcp/tcp_tests.h
@@ -25,7 +25,7 @@ void fill_tx_buffer_ascii(char *buff, size_t len);
 nsapi_error_t tcpsocket_connect_to_echo_srv(TCPSocket &sock);
 nsapi_error_t tcpsocket_connect_to_discard_srv(TCPSocket &sock);
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 extern mbed_stats_socket_t tcp_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];
 int fetch_stats(void);
 #endif
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_address.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_address.cpp
index 93aa82ce06..5dcc8b03bc 100644
--- a/TESTS/netsocket/tcp/tcpsocket_bind_address.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_bind_address.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void TCPSOCKET_BIND_ADDRESS()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  tcp_stats[j].state);
@@ -49,7 +49,7 @@ void TCPSOCKET_BIND_ADDRESS()
 
     delete sock;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, tcp_stats[j].state);
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp
index 933926ede4..f02bd4d981 100644
--- a/TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void TCPSOCKET_BIND_ADDRESS_INVALID()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  tcp_stats[j].state);
@@ -55,7 +55,7 @@ void TCPSOCKET_BIND_ADDRESS_INVALID()
 
     delete sock;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, tcp_stats[j].state);
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp
index d5a43cb3c5..5621bb073b 100644
--- a/TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void TCPSOCKET_BIND_ADDRESS_NULL()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  tcp_stats[j].state);
@@ -48,7 +48,7 @@ void TCPSOCKET_BIND_ADDRESS_NULL()
 
     delete sock;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, tcp_stats[j].state);
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp
index 29fdaa3372..96b343254d 100644
--- a/TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void TCPSOCKET_BIND_ADDRESS_PORT()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  tcp_stats[j].state);
@@ -48,7 +48,7 @@ void TCPSOCKET_BIND_ADDRESS_PORT()
 
     delete sock;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, tcp_stats[j].state);
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_port.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_port.cpp
index f7601be695..f459528e0a 100644
--- a/TESTS/netsocket/tcp/tcpsocket_bind_port.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_bind_port.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void TCPSOCKET_BIND_PORT()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  tcp_stats[j].state);
@@ -48,7 +48,7 @@ void TCPSOCKET_BIND_PORT()
 
     delete sock;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, tcp_stats[j].state);
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp
index dd4326cccd..2dfd615242 100644
--- a/TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void TCPSOCKET_BIND_PORT_FAIL()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  tcp_stats[j].state);
@@ -58,7 +58,7 @@ void TCPSOCKET_BIND_PORT_FAIL()
     delete sock;
     delete sock2;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, tcp_stats[j].state);
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp
index 6b992dd4b3..df777441ce 100644
--- a/TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void TCPSOCKET_BIND_UNOPENED()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  tcp_stats[j].state);
@@ -47,7 +47,7 @@ void TCPSOCKET_BIND_UNOPENED()
 
     delete sock;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, tcp_stats[j].state);
diff --git a/TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp b/TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp
index 6a388b5ca6..3671d1fcf1 100644
--- a/TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void TCPSOCKET_BIND_WRONG_TYPE()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  tcp_stats[j].state);
@@ -57,7 +57,7 @@ void TCPSOCKET_BIND_WRONG_TYPE()
 
     delete sock;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, tcp_stats[j].state);
diff --git a/TESTS/netsocket/tcp/tcpsocket_echotest.cpp b/TESTS/netsocket/tcp/tcpsocket_echotest.cpp
index 1d9c2e1ac8..8d9fee09aa 100644
--- a/TESTS/netsocket/tcp/tcpsocket_echotest.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_echotest.cpp
@@ -125,7 +125,7 @@ void tcpsocket_echotest_nonblock_receive()
 
 void TCPSOCKET_ECHOTEST_NONBLOCK()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int j = 0;
     int count = fetch_stats();
     for (; j < count; j++) {
@@ -179,7 +179,7 @@ void TCPSOCKET_ECHOTEST_NONBLOCK()
             }
             bytes2send -= sent;
         }
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
         count = fetch_stats();
         for (j = 0; j < count; j++) {
             if ((tcp_stats[j].state == SOCK_OPEN) && (tcp_stats[j].proto == NSAPI_TCP)) {
diff --git a/TESTS/netsocket/tcp/tcpsocket_open_close_repeat.cpp b/TESTS/netsocket/tcp/tcpsocket_open_close_repeat.cpp
index 4bb303dc34..88a4b2791f 100644
--- a/TESTS/netsocket/tcp/tcpsocket_open_close_repeat.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_open_close_repeat.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void TCPSOCKET_OPEN_CLOSE_REPEAT()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  tcp_stats[j].state);
@@ -42,7 +42,7 @@ void TCPSOCKET_OPEN_CLOSE_REPEAT()
         TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->close());
     }
     delete sock;
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, tcp_stats[j].state);
diff --git a/TESTS/netsocket/tcp/tcpsocket_open_destruct.cpp b/TESTS/netsocket/tcp/tcpsocket_open_destruct.cpp
index edd129529a..9545e85cb5 100644
--- a/TESTS/netsocket/tcp/tcpsocket_open_destruct.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_open_destruct.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void TCPSOCKET_OPEN_DESTRUCT()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  tcp_stats[j].state);
@@ -41,7 +41,7 @@ void TCPSOCKET_OPEN_DESTRUCT()
         TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
         delete sock;
     }
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, tcp_stats[j].state);
diff --git a/TESTS/netsocket/tcp/tcpsocket_open_limit.cpp b/TESTS/netsocket/tcp/tcpsocket_open_limit.cpp
index 4ebe4bdf8f..69087dea64 100644
--- a/TESTS/netsocket/tcp/tcpsocket_open_limit.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_open_limit.cpp
@@ -70,7 +70,7 @@ void TCPSOCKET_OPEN_LIMIT()
             break;
         }
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
         int count = fetch_stats();
         int open_count = 0;
         for (int j = 0; j < count; j++) {
diff --git a/TESTS/netsocket/tcp/tcpsocket_open_twice.cpp b/TESTS/netsocket/tcp/tcpsocket_open_twice.cpp
index 278a290e28..3673d4fbb0 100644
--- a/TESTS/netsocket/tcp/tcpsocket_open_twice.cpp
+++ b/TESTS/netsocket/tcp/tcpsocket_open_twice.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void TCPSOCKET_OPEN_TWICE()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  tcp_stats[j].state);
@@ -41,7 +41,7 @@ void TCPSOCKET_OPEN_TWICE()
     TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, sock->open(NetworkInterface::get_default_instance()));
 
     delete sock;
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, tcp_stats[j].state);
diff --git a/TESTS/netsocket/tls/main.cpp b/TESTS/netsocket/tls/main.cpp
index 9822d1b34b..ff66affd58 100644
--- a/TESTS/netsocket/tls/main.cpp
+++ b/TESTS/netsocket/tls/main.cpp
@@ -39,7 +39,7 @@ namespace {
 Timer tc_bucket; // Timer to limit a test cases run time
 }
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 mbed_stats_socket_t tls_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];
 #endif
 
@@ -154,7 +154,7 @@ int split2half_rmng_tls_test_time()
     return (tls_global::TESTS_TIMEOUT - tc_bucket.read()) / 2;
 }
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 int fetch_stats()
 {
     return SocketStats::mbed_stats_socket_get_each(&tls_stats[0], MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT);
diff --git a/TESTS/netsocket/tls/tls_tests.h b/TESTS/netsocket/tls/tls_tests.h
index 0c5f68e39b..de77e137b9 100644
--- a/TESTS/netsocket/tls/tls_tests.h
+++ b/TESTS/netsocket/tls/tls_tests.h
@@ -28,7 +28,7 @@ void fill_tx_buffer_ascii(char *buff, size_t len);
 nsapi_error_t tlssocket_connect_to_echo_srv(TLSSocket &sock);
 nsapi_error_t tlssocket_connect_to_discard_srv(TLSSocket &sock);
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 extern mbed_stats_socket_t tls_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];
 int fetch_stats(void);
 #endif
diff --git a/TESTS/netsocket/tls/tlssocket_echotest.cpp b/TESTS/netsocket/tls/tlssocket_echotest.cpp
index eff2cafa4f..15449d1a67 100644
--- a/TESTS/netsocket/tls/tlssocket_echotest.cpp
+++ b/TESTS/netsocket/tls/tlssocket_echotest.cpp
@@ -131,7 +131,7 @@ void tlssocket_echotest_nonblock_receive()
 
 void TLSSOCKET_ECHOTEST_NONBLOCK()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int j = 0;
     int count = fetch_stats();
     for (; j < count; j++) {
@@ -184,7 +184,7 @@ void TLSSOCKET_ECHOTEST_NONBLOCK()
             }
             bytes2send -= sent;
         }
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
         count = fetch_stats();
         for (j = 0; j < count; j++) {
             if ((tls_stats[j].state == SOCK_OPEN) && (tls_stats[j].proto == NSAPI_TLS)) {
diff --git a/TESTS/netsocket/tls/tlssocket_open_destruct.cpp b/TESTS/netsocket/tls/tlssocket_open_destruct.cpp
index cf720043fb..c7ee62efa1 100644
--- a/TESTS/netsocket/tls/tlssocket_open_destruct.cpp
+++ b/TESTS/netsocket/tls/tlssocket_open_destruct.cpp
@@ -28,7 +28,7 @@ using namespace utest::v1;
 
 void TLSSOCKET_OPEN_DESTRUCT()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  tls_stats[j].state);
@@ -43,7 +43,7 @@ void TLSSOCKET_OPEN_DESTRUCT()
         TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
         delete sock;
     }
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, tls_stats[j].state);
diff --git a/TESTS/netsocket/tls/tlssocket_open_limit.cpp b/TESTS/netsocket/tls/tlssocket_open_limit.cpp
index 58ff5bd70a..350e23accb 100644
--- a/TESTS/netsocket/tls/tlssocket_open_limit.cpp
+++ b/TESTS/netsocket/tls/tlssocket_open_limit.cpp
@@ -72,7 +72,7 @@ void TLSSOCKET_OPEN_LIMIT()
             break;
         }
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
         int count = fetch_stats();
         int open_count = 0;
         for (int j = 0; j < count; j++) {
diff --git a/TESTS/netsocket/tls/tlssocket_open_twice.cpp b/TESTS/netsocket/tls/tlssocket_open_twice.cpp
index 4710898ef6..214ec0dfc0 100644
--- a/TESTS/netsocket/tls/tlssocket_open_twice.cpp
+++ b/TESTS/netsocket/tls/tlssocket_open_twice.cpp
@@ -28,7 +28,7 @@ using namespace utest::v1;
 
 void TLSSOCKET_OPEN_TWICE()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  tls_stats[j].state);
@@ -43,7 +43,7 @@ void TLSSOCKET_OPEN_TWICE()
     TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, sock->open(NetworkInterface::get_default_instance()));
 
     delete sock;
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, tls_stats[j].state);
diff --git a/TESTS/netsocket/udp/main.cpp b/TESTS/netsocket/udp/main.cpp
index 0057aed55f..613d2af850 100644
--- a/TESTS/netsocket/udp/main.cpp
+++ b/TESTS/netsocket/udp/main.cpp
@@ -37,7 +37,7 @@ namespace {
 Timer tc_bucket; // Timer to limit a test cases run time
 }
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 mbed_stats_socket_t udp_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];
 #endif
 
@@ -89,7 +89,7 @@ int split2half_rmng_udp_test_time()
     return (udp_global::TESTS_TIMEOUT - tc_bucket.read()) / 2;
 }
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 int fetch_stats()
 {
     return SocketStats::mbed_stats_socket_get_each(&udp_stats[0], MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT);
diff --git a/TESTS/netsocket/udp/udp_tests.h b/TESTS/netsocket/udp/udp_tests.h
index f06817bdee..29e32b7d84 100644
--- a/TESTS/netsocket/udp/udp_tests.h
+++ b/TESTS/netsocket/udp/udp_tests.h
@@ -23,7 +23,7 @@ void drop_bad_packets(UDPSocket &sock, int orig_timeout);
 nsapi_version_t get_ip_version();
 void fill_tx_buffer_ascii(char *buff, size_t len);
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 extern mbed_stats_socket_t udp_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];
 int fetch_stats(void);
 #endif
diff --git a/TESTS/netsocket/udp/udpsocket_bind_address.cpp b/TESTS/netsocket/udp/udpsocket_bind_address.cpp
index 2f8ce54243..2e2bffa6f9 100644
--- a/TESTS/netsocket/udp/udpsocket_bind_address.cpp
+++ b/TESTS/netsocket/udp/udpsocket_bind_address.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void UDPSOCKET_BIND_ADDRESS()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  udp_stats[j].state);
@@ -48,7 +48,7 @@ void UDPSOCKET_BIND_ADDRESS()
 
     delete sock;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, udp_stats[j].state);
diff --git a/TESTS/netsocket/udp/udpsocket_bind_address_invalid.cpp b/TESTS/netsocket/udp/udpsocket_bind_address_invalid.cpp
index 44b0717685..2a8d66ac1a 100644
--- a/TESTS/netsocket/udp/udpsocket_bind_address_invalid.cpp
+++ b/TESTS/netsocket/udp/udpsocket_bind_address_invalid.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void UDPSOCKET_BIND_ADDRESS_INVALID()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  udp_stats[j].state);
@@ -56,7 +56,7 @@ void UDPSOCKET_BIND_ADDRESS_INVALID()
 
     delete sock;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, udp_stats[j].state);
diff --git a/TESTS/netsocket/udp/udpsocket_bind_address_null.cpp b/TESTS/netsocket/udp/udpsocket_bind_address_null.cpp
index 44bf9333e2..0952549178 100644
--- a/TESTS/netsocket/udp/udpsocket_bind_address_null.cpp
+++ b/TESTS/netsocket/udp/udpsocket_bind_address_null.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void UDPSOCKET_BIND_ADDRESS_NULL()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  udp_stats[j].state);
@@ -47,7 +47,7 @@ void UDPSOCKET_BIND_ADDRESS_NULL()
 
     delete sock;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, udp_stats[j].state);
diff --git a/TESTS/netsocket/udp/udpsocket_bind_address_port.cpp b/TESTS/netsocket/udp/udpsocket_bind_address_port.cpp
index 13bd3bdee6..c3917dea2c 100644
--- a/TESTS/netsocket/udp/udpsocket_bind_address_port.cpp
+++ b/TESTS/netsocket/udp/udpsocket_bind_address_port.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void UDPSOCKET_BIND_ADDRESS_PORT()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  udp_stats[j].state);
@@ -47,7 +47,7 @@ void UDPSOCKET_BIND_ADDRESS_PORT()
 
     delete sock;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, udp_stats[j].state);
diff --git a/TESTS/netsocket/udp/udpsocket_bind_port.cpp b/TESTS/netsocket/udp/udpsocket_bind_port.cpp
index f825b42e03..3ad36fd94c 100644
--- a/TESTS/netsocket/udp/udpsocket_bind_port.cpp
+++ b/TESTS/netsocket/udp/udpsocket_bind_port.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void UDPSOCKET_BIND_PORT()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  udp_stats[j].state);
@@ -47,7 +47,7 @@ void UDPSOCKET_BIND_PORT()
 
     delete sock;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, udp_stats[j].state);
diff --git a/TESTS/netsocket/udp/udpsocket_bind_port_fail.cpp b/TESTS/netsocket/udp/udpsocket_bind_port_fail.cpp
index 95a17bf346..14f052a7ae 100644
--- a/TESTS/netsocket/udp/udpsocket_bind_port_fail.cpp
+++ b/TESTS/netsocket/udp/udpsocket_bind_port_fail.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void UDPSOCKET_BIND_PORT_FAIL()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  udp_stats[j].state);
@@ -57,7 +57,7 @@ void UDPSOCKET_BIND_PORT_FAIL()
     delete sock;
     delete sock2;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, udp_stats[j].state);
diff --git a/TESTS/netsocket/udp/udpsocket_bind_unopened.cpp b/TESTS/netsocket/udp/udpsocket_bind_unopened.cpp
index fcd4703395..a422fa35c0 100644
--- a/TESTS/netsocket/udp/udpsocket_bind_unopened.cpp
+++ b/TESTS/netsocket/udp/udpsocket_bind_unopened.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void UDPSOCKET_BIND_UNOPENED()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  udp_stats[j].state);
@@ -46,7 +46,7 @@ void UDPSOCKET_BIND_UNOPENED()
 
     delete sock;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, udp_stats[j].state);
diff --git a/TESTS/netsocket/udp/udpsocket_bind_wrong_type.cpp b/TESTS/netsocket/udp/udpsocket_bind_wrong_type.cpp
index f6a6e7928b..e2e3b2f916 100644
--- a/TESTS/netsocket/udp/udpsocket_bind_wrong_type.cpp
+++ b/TESTS/netsocket/udp/udpsocket_bind_wrong_type.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void UDPSOCKET_BIND_WRONG_TYPE()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  udp_stats[j].state);
@@ -56,7 +56,7 @@ void UDPSOCKET_BIND_WRONG_TYPE()
 
     delete sock;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, udp_stats[j].state);
diff --git a/TESTS/netsocket/udp/udpsocket_echotest.cpp b/TESTS/netsocket/udp/udpsocket_echotest.cpp
index 0da5313f34..928164cfdf 100644
--- a/TESTS/netsocket/udp/udpsocket_echotest.cpp
+++ b/TESTS/netsocket/udp/udpsocket_echotest.cpp
@@ -133,7 +133,7 @@ void udpsocket_echotest_nonblock_receiver(void *receive_bytes)
 
 void UDPSOCKET_ECHOTEST_NONBLOCK()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int j = 0;
     int count = fetch_stats();
     for (; j < count; j++) {
@@ -204,7 +204,7 @@ void UDPSOCKET_ECHOTEST_NONBLOCK()
         printf("Packets sent: %d, packets received %d, loss ratio %.2lf\r\n", packets_sent, packets_recv, loss_ratio);
         TEST_ASSERT_DOUBLE_WITHIN(TOLERATED_LOSS_RATIO, EXPECTED_LOSS_RATIO, loss_ratio);
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
         count = fetch_stats();
         for (j = 0; j < count; j++) {
             if ((NSAPI_UDP == udp_stats[j].proto) && (SOCK_OPEN == udp_stats[j].state)) {
diff --git a/TESTS/netsocket/udp/udpsocket_open_close_repeat.cpp b/TESTS/netsocket/udp/udpsocket_open_close_repeat.cpp
index e118990cf4..90ca0031f5 100644
--- a/TESTS/netsocket/udp/udpsocket_open_close_repeat.cpp
+++ b/TESTS/netsocket/udp/udpsocket_open_close_repeat.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void UDPSOCKET_OPEN_CLOSE_REPEAT()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  udp_stats[j].state);
@@ -42,7 +42,7 @@ void UDPSOCKET_OPEN_CLOSE_REPEAT()
         TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->close());
     }
     delete sock;
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, udp_stats[j].state);
diff --git a/TESTS/netsocket/udp/udpsocket_open_destruct.cpp b/TESTS/netsocket/udp/udpsocket_open_destruct.cpp
index 16fb8c4a3c..a3e4f80a34 100644
--- a/TESTS/netsocket/udp/udpsocket_open_destruct.cpp
+++ b/TESTS/netsocket/udp/udpsocket_open_destruct.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void UDPSOCKET_OPEN_DESTRUCT()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  udp_stats[j].state);
@@ -41,7 +41,7 @@ void UDPSOCKET_OPEN_DESTRUCT()
         TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
         delete sock;
     }
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, udp_stats[j].state);
diff --git a/TESTS/netsocket/udp/udpsocket_open_limit.cpp b/TESTS/netsocket/udp/udpsocket_open_limit.cpp
index dfe35de305..b5d18707f5 100644
--- a/TESTS/netsocket/udp/udpsocket_open_limit.cpp
+++ b/TESTS/netsocket/udp/udpsocket_open_limit.cpp
@@ -70,7 +70,7 @@ void UDPSOCKET_OPEN_LIMIT()
         if (!socket_list_head) {
             break;
         }
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
         int count = fetch_stats();
         int open_count = 0;
         for (int j = 0; j < count; j++) {
diff --git a/TESTS/netsocket/udp/udpsocket_open_twice.cpp b/TESTS/netsocket/udp/udpsocket_open_twice.cpp
index 893450ca9d..3965d35d22 100644
--- a/TESTS/netsocket/udp/udpsocket_open_twice.cpp
+++ b/TESTS/netsocket/udp/udpsocket_open_twice.cpp
@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 void UDPSOCKET_OPEN_TWICE()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED,  udp_stats[j].state);
@@ -41,7 +41,7 @@ void UDPSOCKET_OPEN_TWICE()
     TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, sock->open(NetworkInterface::get_default_instance()));
 
     delete sock;
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     count = fetch_stats();
     for (int j = 0; j < count; j++) {
         TEST_ASSERT_EQUAL(SOCK_CLOSED, udp_stats[j].state);
diff --git a/TESTS/network/l3ip/main.cpp b/TESTS/network/l3ip/main.cpp
index eb43b64fd4..98c04512a4 100644
--- a/TESTS/network/l3ip/main.cpp
+++ b/TESTS/network/l3ip/main.cpp
@@ -50,7 +50,7 @@ static void _ifdown()
     printf("MBED: ifdown\n");
 }
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 int fetch_stats()
 {
     return SocketStats::mbed_stats_socket_get_each(&udp_stats[0], MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT);
diff --git a/TESTS/network/multihoming/main.cpp b/TESTS/network/multihoming/main.cpp
index ec38220e7f..c3a88882c2 100644
--- a/TESTS/network/multihoming/main.cpp
+++ b/TESTS/network/multihoming/main.cpp
@@ -40,7 +40,7 @@ NetworkInterface *net;
 char interface_name[MBED_CONF_MULTIHOMING_MAX_INTERFACES_NUM][INTERFACE_NAME_LEN];
 int  interface_num = 0;
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 mbed_stats_socket_t udp_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];
 #endif
 
@@ -120,7 +120,7 @@ void fill_tx_buffer_ascii(char *buff, size_t len)
     }
 }
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 int fetch_stats()
 {
     return SocketStats::mbed_stats_socket_get_each(&udp_stats[0], MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT);
diff --git a/TESTS/network/multihoming/multihoming_tests.h b/TESTS/network/multihoming/multihoming_tests.h
index f8e4b23d99..8156b49d6d 100644
--- a/TESTS/network/multihoming/multihoming_tests.h
+++ b/TESTS/network/multihoming/multihoming_tests.h
@@ -57,7 +57,7 @@ NetworkInterface *get_interface();
 void drop_bad_packets(UDPSocket &sock, int orig_timeout);
 void fill_tx_buffer_ascii(char *buff, size_t len);
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 extern mbed_stats_socket_t udp_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];
 int fetch_stats(void);
 #endif
diff --git a/TESTS/network/multihoming/multihoming_udpsocket_echotest.cpp b/TESTS/network/multihoming/multihoming_udpsocket_echotest.cpp
index d345051514..25b290c819 100644
--- a/TESTS/network/multihoming/multihoming_udpsocket_echotest.cpp
+++ b/TESTS/network/multihoming/multihoming_udpsocket_echotest.cpp
@@ -120,7 +120,7 @@ void udpsocket_echotest_nonblock_receiver(void *receive_bytes)
 
 void MULTIHOMING_UDPSOCKET_ECHOTEST_NONBLOCK()
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     int j = 0;
     int count = fetch_stats();
     for (; j < count; j++) {
@@ -189,7 +189,7 @@ void MULTIHOMING_UDPSOCKET_ECHOTEST_NONBLOCK()
             printf("Interface %s, Packets sent: %d, packets received %d, loss ratio %.2lf\r\n", interface_name[j], packets_sent, packets_recv, loss_ratio);
             TEST_ASSERT_DOUBLE_WITHIN(TOLERATED_LOSS_RATIO, EXPECTED_LOSS_RATIO, loss_ratio);
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
             count = fetch_stats();
             for (j = 0; j < count; j++) {
                 if ((NSAPI_UDP == udp_stats[j].proto) && (SOCK_OPEN == udp_stats[j].state)) {
diff --git a/UNITTESTS/stubs/SocketStats_Stub.cpp b/UNITTESTS/stubs/SocketStats_Stub.cpp
index 4330be8e40..b22ac5286e 100644
--- a/UNITTESTS/stubs/SocketStats_Stub.cpp
+++ b/UNITTESTS/stubs/SocketStats_Stub.cpp
@@ -16,7 +16,7 @@
 
 #include "SocketStats.h"
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 int SocketStats::get_entry_position(const Socket *const reference_id)
 {
     return 0;
diff --git a/features/netsocket/SocketStats.cpp b/features/netsocket/SocketStats.cpp
index 1e62c82ffe..946345e3d1 100644
--- a/features/netsocket/SocketStats.cpp
+++ b/features/netsocket/SocketStats.cpp
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 SingletonPtr<PlatformMutex> SocketStats::_mutex;
 mbed_stats_socket_t SocketStats::_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];
 uint32_t SocketStats::_size = 0;
@@ -44,7 +44,7 @@ size_t SocketStats::mbed_stats_socket_get_each(mbed_stats_socket_t *stats, size_
 {
     MBED_ASSERT(stats != NULL);
     size_t i = 0;
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     memset(stats, 0, count * sizeof(mbed_stats_socket_t));
     _mutex->lock();
     for (uint32_t j = 0; j < count; j++) {
@@ -64,7 +64,7 @@ SocketStats::SocketStats()
 
 void SocketStats::stats_new_socket_entry(const Socket *const reference_id)
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     _mutex->lock();
     if (get_entry_position(reference_id) >= 0) {
         // Duplicate entry
@@ -98,7 +98,7 @@ void SocketStats::stats_new_socket_entry(const Socket *const reference_id)
 
 void SocketStats::stats_update_socket_state(const Socket *const reference_id, socket_state state)
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     _mutex->lock();
     int position = get_entry_position(reference_id);
     if (position >= 0) {
@@ -113,7 +113,7 @@ void SocketStats::stats_update_socket_state(const Socket *const reference_id, so
 
 void SocketStats::stats_update_peer(const Socket *const reference_id, const SocketAddress &peer)
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     _mutex->lock();
     int position = get_entry_position(reference_id);
     if ((position >= 0) && (!_stats[position].peer)) {
@@ -125,7 +125,7 @@ void SocketStats::stats_update_peer(const Socket *const reference_id, const Sock
 
 void SocketStats::stats_update_proto(const Socket *const reference_id, nsapi_protocol_t proto)
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     _mutex->lock();
     int position = get_entry_position(reference_id);
     if (position >= 0) {
@@ -137,7 +137,7 @@ void SocketStats::stats_update_proto(const Socket *const reference_id, nsapi_pro
 
 void SocketStats::stats_update_sent_bytes(const Socket *const reference_id, size_t sent_bytes)
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     _mutex->lock();
     int position = get_entry_position(reference_id);
     if ((position >= 0) && ((int32_t)sent_bytes > 0)) {
@@ -149,7 +149,7 @@ void SocketStats::stats_update_sent_bytes(const Socket *const reference_id, size
 
 void SocketStats::stats_update_recv_bytes(const Socket *const reference_id, size_t recv_bytes)
 {
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
     _mutex->lock();
     int position = get_entry_position(reference_id);
     if ((position >= 0) && ((int32_t)recv_bytes > 0)) {
diff --git a/features/netsocket/SocketStats.h b/features/netsocket/SocketStats.h
index e476f554b9..5958d119a3 100644
--- a/features/netsocket/SocketStats.h
+++ b/features/netsocket/SocketStats.h
@@ -143,7 +143,7 @@ public:
      */
     void stats_update_recv_bytes(const Socket *const reference_id, size_t recv_bytes);
 
-#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 private:
     static mbed_stats_socket_t _stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];
     static SingletonPtr<PlatformMutex> _mutex;
diff --git a/features/netsocket/mbed_lib.json b/features/netsocket/mbed_lib.json
index 2a11d9f3a1..e1b90c8142 100644
--- a/features/netsocket/mbed_lib.json
+++ b/features/netsocket/mbed_lib.json
@@ -58,7 +58,7 @@
             "help": "Number of cached host name resolutions",
             "value": 3
         },
-        "socket-stats-enable": {
+        "socket-stats-enabled": {
             "help": "Enable network socket statistics",
             "value": false
         },