diff --git a/config/zephyr/Kconfig b/config/zephyr/Kconfig
index 9948680c6e..1e3389c544 100644
--- a/config/zephyr/Kconfig
+++ b/config/zephyr/Kconfig
@@ -347,21 +347,21 @@ config CHIP_ICD_FAST_POLLING_INTERVAL
 	  Provides the Intermittently Connected Device fast polling interval in milliseconds while the
 	  device is in the active mode. It determines the fastest frequency at which the device will be able
 	  to receive the messages in the active mode. The CHIP_ICD_FAST_POLLING_INTERVAL shall be smaller than
-	  CHIP_ICD_ACTIVE_MODE_INTERVAL.
+	  CHIP_ICD_ACTIVE_MODE_DURATION.
 
-config CHIP_ICD_IDLE_MODE_INTERVAL
-	int "Intermittently Connected Device idle mode interval (s)"
+config CHIP_ICD_IDLE_MODE_DURATION
+	int "Intermittently Connected Device idle mode duration (s)"
 	default 120
 	help
-	  Provides the Intermittently Connected Device idle mode interval in seconds.
+	  Provides the Intermittently Connected Device idle mode duration in seconds.
 	  It determines the maximum amount of time the device can stay in the idle mode, which means the
 	  device may be unreachable and not able to receive messages.
 
-config CHIP_ICD_ACTIVE_MODE_INTERVAL
-	int "Intermittently Connected Device active mode interval (ms)"
+config CHIP_ICD_ACTIVE_MODE_DURATION
+	int "Intermittently Connected Device active mode duration (ms)"
 	default 300
 	help
-	  Provides the Intermittently Connected Device active mode interval in milliseconds.
+	  Provides the Intermittently Connected Device active mode duration in milliseconds.
 	  It determines the minimum amount of time the device shall stay in the active mode.
 
 config CHIP_ICD_ACTIVE_MODE_THRESHOLD
diff --git a/src/platform/nrfconnect/CHIPPlatformConfig.h b/src/platform/nrfconnect/CHIPPlatformConfig.h
index c8187675c4..778372394b 100644
--- a/src/platform/nrfconnect/CHIPPlatformConfig.h
+++ b/src/platform/nrfconnect/CHIPPlatformConfig.h
@@ -113,15 +113,15 @@
 #endif // CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL
 
 #ifndef CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC
-#ifdef CONFIG_CHIP_ICD_IDLE_MODE_INTERVAL
-#define CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC CONFIG_CHIP_ICD_IDLE_MODE_INTERVAL
-#endif // CONFIG_CHIP_ICD_IDLE_MODE_INTERVAL
+#ifdef CONFIG_CHIP_ICD_IDLE_MODE_DURATION
+#define CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC CONFIG_CHIP_ICD_IDLE_MODE_DURATION
+#endif // CONFIG_CHIP_ICD_IDLE_MODE_DURATION
 #endif // CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC
 
 #ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS
-#ifdef CONFIG_CHIP_ICD_ACTIVE_MODE_INTERVAL
-#define CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS CONFIG_CHIP_ICD_ACTIVE_MODE_INTERVAL
-#endif // CONFIG_CHIP_ICD_ACTIVE_MODE_INTERVAL
+#ifdef CONFIG_CHIP_ICD_ACTIVE_MODE_DURATION
+#define CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS CONFIG_CHIP_ICD_ACTIVE_MODE_DURATION
+#endif // CONFIG_CHIP_ICD_ACTIVE_MODE_DURATION
 #endif // CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS
 
 #ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS