diff --git a/include/net/yaip/nbuf.h b/include/net/yaip/nbuf.h
index c32524a9ac1..8a7a0bc4ab0 100644
--- a/include/net/yaip/nbuf.h
+++ b/include/net/yaip/nbuf.h
@@ -469,7 +469,7 @@ void net_nbuf_unref(struct net_buf *buf);
  */
 struct net_buf *net_nbuf_ref(struct net_buf *buf);
 
-#endif /* CONFIG_NETWORK_IP_STACK_DEBUG_NET_BUF */
+#endif /* CONFIG_NET_DEBUG_NET_BUF */
 
 /**
  * @brief Copy a buffer with fragments while reserving some extra space
diff --git a/net/yaip/trickle.c b/net/yaip/trickle.c
index 6f05cfd6b4d..18572d970b7 100644
--- a/net/yaip/trickle.c
+++ b/net/yaip/trickle.c
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#if defined(CONFIG_NETWORK_IP_STACK_DEBUG_TRICKLE)
+#if defined(CONFIG_NET_DEBUG_TRICKLE)
 #define SYS_LOG_DOMAIN "net/trickle"
 #define NET_DEBUG 1
 #endif
diff --git a/net/yaip/utils.c b/net/yaip/utils.c
index f4bb4e755ca..652c147f6f9 100644
--- a/net/yaip/utils.c
+++ b/net/yaip/utils.c
@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-#if defined(CONFIG_NETWORK_IP_STACK_DEBUG_UTILS)
+#if defined(CONFIG_NET_DEBUG_UTILS)
 #define SYS_LOG_DOMAIN "net/utils"
 #define NET_DEBUG 1
 #endif
diff --git a/tests/net/context/src/main.c b/tests/net/context/src/main.c
index 06134ed1b3d..b389282bad4 100644
--- a/tests/net/context/src/main.c
+++ b/tests/net/context/src/main.c
@@ -34,7 +34,7 @@
 
 #include "net_private.h"
 
-#if defined(CONFIG_NETWORK_IP_STACK_DEBUG_CONTEXT)
+#if defined(CONFIG_NET_DEBUG_CONTEXT)
 #define DBG(fmt, ...) printk(fmt, ##__VA_ARGS__)
 #else
 #define DBG(fmt, ...)
diff --git a/tests/net/trickle/src/main.c b/tests/net/trickle/src/main.c
index 1d34761a223..bc0d89451b5 100644
--- a/tests/net/trickle/src/main.c
+++ b/tests/net/trickle/src/main.c
@@ -35,7 +35,7 @@
 
 #include "net_private.h"
 
-#if defined(CONFIG_NETWORK_IP_STACK_DEBUG_CONTEXT)
+#if defined(CONFIG_NET_DEBUG_CONTEXT)
 #define DBG(fmt, ...) printk(fmt, ##__VA_ARGS__)
 #else
 #define DBG(fmt, ...)
diff --git a/tests/net/udp/src/main.c b/tests/net/udp/src/main.c
index 6ffb8263f90..a4d342c44ab 100644
--- a/tests/net/udp/src/main.c
+++ b/tests/net/udp/src/main.c
@@ -35,7 +35,7 @@
 
 #include <tc_util.h>
 
-#if defined(CONFIG_NETWORK_IP_STACK_DEBUG_UDP)
+#if defined(CONFIG_NET_DEBUG_UDP)
 #define DBG(fmt, ...) printk(fmt, ##__VA_ARGS__)
 #else
 #define DBG(fmt, ...)