diff --git a/drivers/console/ipm_console_receiver.c b/drivers/console/ipm_console_receiver.c
index b8d15302bb5..2601e19b095 100644
--- a/drivers/console/ipm_console_receiver.c
+++ b/drivers/console/ipm_console_receiver.c
@@ -44,7 +44,7 @@ static void ipm_console_thread(void *arg1, void *arg2, void *arg3)
 	pos = 0;
 
 	while (1) {
-		k_sem_take(&driver_data->sem, TICKS_UNLIMITED);
+		k_sem_take(&driver_data->sem, K_FOREVER);
 
 		ret = sys_ring_buf_get(&driver_data->rb, &type,
 				       (uint8_t *)&config_info->line_buf[pos],
diff --git a/drivers/timer/arcv2_timer0.c b/drivers/timer/arcv2_timer0.c
index d5d6734a742..1e2e2a211b1 100644
--- a/drivers/timer/arcv2_timer0.c
+++ b/drivers/timer/arcv2_timer0.c
@@ -230,7 +230,7 @@ void _timer_idle_enter(int32_t ticks)
 {
 	uint32_t  status;
 
-	if ((ticks == TICKS_UNLIMITED) || (ticks > max_system_ticks)) {
+	if ((ticks == K_FOREVER) || (ticks > max_system_ticks)) {
 		/*
 		 * The number of cycles until the timer must fire next might not fit
 		 * in the 32-bit counter register. To work around this, program
diff --git a/drivers/timer/loapic_timer.c b/drivers/timer/loapic_timer.c
index 08181091a5b..036138e19f8 100644
--- a/drivers/timer/loapic_timer.c
+++ b/drivers/timer/loapic_timer.c
@@ -355,7 +355,7 @@ void _timer_idle_enter(int32_t ticks /* system ticks */
 
 	cycles = current_count_register_get();
 
-	if ((ticks == TICKS_UNLIMITED) || (ticks > max_system_ticks)) {
+	if ((ticks == K_FOREVER) || (ticks > max_system_ticks)) {
 		/*
 		 * The number of cycles until the timer must fire next might not fit
 		 * in the 32-bit counter register. To work around this, program
diff --git a/samples/net/zperf/src/zperf_tcp_receiver.c b/samples/net/zperf/src/zperf_tcp_receiver.c
index 5a505082796..2a635f06d41 100644
--- a/samples/net/zperf/src/zperf_tcp_receiver.c
+++ b/samples/net/zperf/src/zperf_tcp_receiver.c
@@ -68,7 +68,7 @@ static void zperf_tcp_rx_fiber(int port)
 	}
 
 	while (1) {
-		struct net_buf *buf = net_receive(net_context, TICKS_UNLIMITED);
+		struct net_buf *buf = net_receive(net_context, K_FOREVER);
 		struct session *session = NULL;
 		uint32_t time = k_cycle_get_32();