diff --git a/samples/net/coaps_server/prj_arduino_101.conf b/samples/net/coaps_server/prj_arduino_101.conf
index 41bde1dbe3f..3179881b91e 100644
--- a/samples/net/coaps_server/prj_arduino_101.conf
+++ b/samples/net/coaps_server/prj_arduino_101.conf
@@ -10,7 +10,7 @@ CONFIG_NET_L2_ETHERNET=y
 CONFIG_NET_IPV4=n
 CONFIG_NET_IPV6=y
 CONFIG_NET_BUF=y
-CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=3
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3
 
 # ENC28J60 Ethernet Device
 CONFIG_ETH_ENC28J60=y
diff --git a/samples/net/dns_resolve/prj_frdm_k64f.conf b/samples/net/dns_resolve/prj_frdm_k64f.conf
index 6cdfb6a338d..3ed1c3482d7 100644
--- a/samples/net/dns_resolve/prj_frdm_k64f.conf
+++ b/samples/net/dns_resolve/prj_frdm_k64f.conf
@@ -11,7 +11,7 @@ CONFIG_NET_BUF_RX_COUNT=16
 CONFIG_NET_BUF_TX_COUNT=16
 
 CONFIG_NET_IPV6_RA_RDNSS=y
-CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=3
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3
 
 CONFIG_PRINTK=y
 #CONFIG_NET_DEBUG_NET_BUF=y
diff --git a/samples/net/echo_client/prj_arduino_101.conf b/samples/net/echo_client/prj_arduino_101.conf
index f9a83a47399..d85592ffdb8 100644
--- a/samples/net/echo_client/prj_arduino_101.conf
+++ b/samples/net/echo_client/prj_arduino_101.conf
@@ -10,7 +10,7 @@ CONFIG_NET_L2_ETHERNET=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_IPV6=n
 CONFIG_NET_BUF=y
-CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=3
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3
 CONFIG_NET_PKT_RX_COUNT=2
 CONFIG_NET_PKT_TX_COUNT=3
 CONFIG_NET_BUF_RX_COUNT=6
diff --git a/samples/net/echo_server/prj_arduino_101.conf b/samples/net/echo_server/prj_arduino_101.conf
index 977af3ba558..33c49039db4 100644
--- a/samples/net/echo_server/prj_arduino_101.conf
+++ b/samples/net/echo_server/prj_arduino_101.conf
@@ -10,7 +10,7 @@ CONFIG_NET_L2_ETHERNET=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_IPV6=n
 CONFIG_NET_BUF=y
-CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=3
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3
 CONFIG_NET_PKT_RX_COUNT=5
 CONFIG_NET_PKT_TX_COUNT=2
 CONFIG_NET_BUF_RX_COUNT=10
diff --git a/samples/net/http_client/prj_frdm_k64f.conf b/samples/net/http_client/prj_frdm_k64f.conf
index 5627654ae05..f691e5b2f39 100644
--- a/samples/net/http_client/prj_frdm_k64f.conf
+++ b/samples/net/http_client/prj_frdm_k64f.conf
@@ -8,7 +8,7 @@ CONFIG_NET_LOG=y
 CONFIG_NET_SHELL=y
 
 CONFIG_NET_IPV6_RA_RDNSS=y
-CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=3
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3
 
 CONFIG_NET_PKT_RX_COUNT=64
 CONFIG_NET_PKT_TX_COUNT=64
diff --git a/samples/net/https_client/prj_frdm_k64f.conf b/samples/net/https_client/prj_frdm_k64f.conf
index 382fcafd4ad..9864cd705d3 100644
--- a/samples/net/https_client/prj_frdm_k64f.conf
+++ b/samples/net/https_client/prj_frdm_k64f.conf
@@ -7,8 +7,8 @@ CONFIG_NET_L2_ETHERNET=y
 CONFIG_NET_LOG=y
 CONFIG_NET_SHELL=y
 
-CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=2
-CONFIG_NET_IFACE_UNICAST_IPV6_ADDR_COUNT=2
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=2
+CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=2
 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=5
 
 CONFIG_INIT_STACKS=y
diff --git a/samples/net/mbedtls_dtlsclient/prj_arduino_101.conf b/samples/net/mbedtls_dtlsclient/prj_arduino_101.conf
index b7e7ae7f653..21882cc7866 100644
--- a/samples/net/mbedtls_dtlsclient/prj_arduino_101.conf
+++ b/samples/net/mbedtls_dtlsclient/prj_arduino_101.conf
@@ -10,7 +10,7 @@ CONFIG_NET_L2_ETHERNET=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_IPV6=n
 CONFIG_NET_BUF=y
-CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=3
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3
 
 CONFIG_ETH_ENC28J60=y
 CONFIG_ETH_ENC28J60_0=y
diff --git a/samples/net/mbedtls_sslclient/prj_arduino_101.conf b/samples/net/mbedtls_sslclient/prj_arduino_101.conf
index cffbd0c633c..4645acfb77a 100644
--- a/samples/net/mbedtls_sslclient/prj_arduino_101.conf
+++ b/samples/net/mbedtls_sslclient/prj_arduino_101.conf
@@ -11,7 +11,7 @@ CONFIG_NET_IPV4=y
 CONFIG_NET_IPV6=n
 CONFIG_NET_TCP=y
 CONFIG_NET_BUF=y
-CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=3
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3
 CONFIG_NET_PKT_RX_COUNT=4
 CONFIG_NET_PKT_TX_COUNT=4
 CONFIG_NET_BUF_RX_COUNT=6
diff --git a/samples/net/mqtt_publisher/prj_frdm_k64f.conf b/samples/net/mqtt_publisher/prj_frdm_k64f.conf
index 9604489cbe7..39697433b2f 100644
--- a/samples/net/mqtt_publisher/prj_frdm_k64f.conf
+++ b/samples/net/mqtt_publisher/prj_frdm_k64f.conf
@@ -12,7 +12,7 @@ CONFIG_NET_BUF_RX_COUNT=16
 CONFIG_NET_BUF_TX_COUNT=16
 
 CONFIG_NET_IPV6_RA_RDNSS=y
-CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=3
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3
 
 CONFIG_PRINTK=y
 #CONFIG_NET_DEBUG_NET_PKT=y
diff --git a/tests/net/arp/prj.conf b/tests/net/arp/prj.conf
index c9d4034cec1..a3fbdb03ed1 100644
--- a/tests/net/arp/prj.conf
+++ b/tests/net/arp/prj.conf
@@ -12,7 +12,7 @@ CONFIG_NET_LOG=y
 CONFIG_SYS_LOG_SHOW_COLOR=y
 CONFIG_RANDOM_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=3
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3
 CONFIG_NET_DEBUG_ARP=y
 CONFIG_NET_DEBUG_NET_PKT=y
 CONFIG_NET_DEBUG_IF=y
diff --git a/tests/net/lib/mqtt_publisher/prj_arduino_101.conf b/tests/net/lib/mqtt_publisher/prj_arduino_101.conf
index 0750ad90d22..6a9ae53353c 100644
--- a/tests/net/lib/mqtt_publisher/prj_arduino_101.conf
+++ b/tests/net/lib/mqtt_publisher/prj_arduino_101.conf
@@ -12,7 +12,7 @@ CONFIG_NET_NBUF_RX_DATA_COUNT=16
 CONFIG_NET_NBUF_TX_DATA_COUNT=16
 
 CONFIG_NET_IPV6_RA_RDNSS=y
-CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=3
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3
 
 CONFIG_PRINTK=y
 #CONFIG_NET_DEBUG_NET_BUF=y
diff --git a/tests/net/lib/mqtt_publisher/prj_frdm_k64f.conf b/tests/net/lib/mqtt_publisher/prj_frdm_k64f.conf
index 119e4219215..d33e330882c 100644
--- a/tests/net/lib/mqtt_publisher/prj_frdm_k64f.conf
+++ b/tests/net/lib/mqtt_publisher/prj_frdm_k64f.conf
@@ -12,7 +12,7 @@ CONFIG_NET_NBUF_RX_DATA_COUNT=16
 CONFIG_NET_NBUF_TX_DATA_COUNT=16
 
 CONFIG_NET_IPV6_RA_RDNSS=y
-CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=3
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3
 
 CONFIG_PRINTK=y
 #CONFIG_NET_DEBUG_NET_BUF=y
diff --git a/tests/net/lib/mqtt_subscriber/prj_arduino_101.conf b/tests/net/lib/mqtt_subscriber/prj_arduino_101.conf
index 0750ad90d22..6a9ae53353c 100644
--- a/tests/net/lib/mqtt_subscriber/prj_arduino_101.conf
+++ b/tests/net/lib/mqtt_subscriber/prj_arduino_101.conf
@@ -12,7 +12,7 @@ CONFIG_NET_NBUF_RX_DATA_COUNT=16
 CONFIG_NET_NBUF_TX_DATA_COUNT=16
 
 CONFIG_NET_IPV6_RA_RDNSS=y
-CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=3
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3
 
 CONFIG_PRINTK=y
 #CONFIG_NET_DEBUG_NET_BUF=y
diff --git a/tests/net/lib/mqtt_subscriber/prj_frdm_k64f.conf b/tests/net/lib/mqtt_subscriber/prj_frdm_k64f.conf
index 119e4219215..d33e330882c 100644
--- a/tests/net/lib/mqtt_subscriber/prj_frdm_k64f.conf
+++ b/tests/net/lib/mqtt_subscriber/prj_frdm_k64f.conf
@@ -12,7 +12,7 @@ CONFIG_NET_NBUF_RX_DATA_COUNT=16
 CONFIG_NET_NBUF_TX_DATA_COUNT=16
 
 CONFIG_NET_IPV6_RA_RDNSS=y
-CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=3
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3
 
 CONFIG_PRINTK=y
 #CONFIG_NET_DEBUG_NET_BUF=y
diff --git a/tests/net/neighbor/prj.conf b/tests/net/neighbor/prj.conf
index 5a6b12e0dfe..397d9196ded 100644
--- a/tests/net/neighbor/prj.conf
+++ b/tests/net/neighbor/prj.conf
@@ -11,7 +11,7 @@ CONFIG_NET_LOG=y
 CONFIG_SYS_LOG_SHOW_COLOR=y
 CONFIG_RANDOM_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=3
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=3
 CONFIG_NET_DEBUG_IF=y
 CONFIG_NET_DEBUG_CORE=y
 CONFIG_NET_IPV6_MAX_NEIGHBORS=4
diff --git a/tests/net/udp/prj.conf b/tests/net/udp/prj.conf
index 92c9f7b73df..76623658c41 100644
--- a/tests/net/udp/prj.conf
+++ b/tests/net/udp/prj.conf
@@ -15,8 +15,8 @@ CONFIG_NET_LOG=y
 CONFIG_SYS_LOG_SHOW_COLOR=y
 CONFIG_RANDOM_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_NET_IFACE_UNICAST_IPV6_ADDR_COUNT=2
-CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=2
+CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=2
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=2
 CONFIG_NET_DEBUG_CORE=y
 CONFIG_NET_DEBUG_CONN=y
 #CONFIG_NET_DEBUG_NET_PKT=y