diff --git a/include/zephyr/internal/syscall_handler.h b/include/zephyr/internal/syscall_handler.h
index f78e4cdbb4c..d26b9508310 100644
--- a/include/zephyr/internal/syscall_handler.h
+++ b/include/zephyr/internal/syscall_handler.h
@@ -112,7 +112,7 @@ typedef void (*_wordlist_cb_func_t)(struct k_object *ko, void *context);
  * @param func function to run on each struct k_object
  * @param context Context pointer to pass to each invocation
  */
-void z_object_wordlist_foreach(_wordlist_cb_func_t func, void *context);
+void k_object_wordlist_foreach(_wordlist_cb_func_t func, void *context);
 
 /**
  * Copy all kernel object permissions from the parent to the child
diff --git a/include/zephyr/linker/kobject-text.ld b/include/zephyr/linker/kobject-text.ld
index 47a989f4c23..ee93f4a2144 100644
--- a/include/zephyr/linker/kobject-text.ld
+++ b/include/zephyr/linker/kobject-text.ld
@@ -19,7 +19,7 @@
 	PROVIDE(z_object_gperf_wordlist_foreach = .);
 #else
 	PROVIDE(z_object_find = .);
-	PROVIDE(z_object_wordlist_foreach = .);
+	PROVIDE(k_object_wordlist_foreach = .);
 #endif
 #endif
 
diff --git a/kernel/userspace.c b/kernel/userspace.c
index 85a60e54a0a..7a0db0f1175 100644
--- a/kernel/userspace.c
+++ b/kernel/userspace.c
@@ -281,7 +281,7 @@ static bool thread_idx_alloc(uintptr_t *tidx)
 					       *tidx);
 
 			/* Clear permission from all objects */
-			z_object_wordlist_foreach(clear_perms_cb,
+			k_object_wordlist_foreach(clear_perms_cb,
 						   (void *)*tidx);
 
 			return true;
@@ -306,7 +306,7 @@ static bool thread_idx_alloc(uintptr_t *tidx)
 static void thread_idx_free(uintptr_t tidx)
 {
 	/* To prevent leaked permission when index is recycled */
-	z_object_wordlist_foreach(clear_perms_cb, (void *)tidx);
+	k_object_wordlist_foreach(clear_perms_cb, (void *)tidx);
 
 	sys_bitfield_set_bit((mem_addr_t)_thread_idx_map, tidx);
 }
@@ -497,7 +497,7 @@ struct k_object *z_object_find(const void *obj)
 	return ret;
 }
 
-void z_object_wordlist_foreach(_wordlist_cb_func_t func, void *context)
+void k_object_wordlist_foreach(_wordlist_cb_func_t func, void *context)
 {
 	struct dyn_obj *obj, *next;
 
@@ -598,7 +598,7 @@ void k_thread_perms_inherit(struct k_thread *parent, struct k_thread *child)
 	};
 
 	if ((ctx.parent_id != -1) && (ctx.child_id != -1)) {
-		z_object_wordlist_foreach(wordlist_cb, &ctx);
+		k_object_wordlist_foreach(wordlist_cb, &ctx);
 	}
 }
 
@@ -633,7 +633,7 @@ void k_thread_perms_all_clear(struct k_thread *thread)
 	uintptr_t index = thread_index_get(thread);
 
 	if ((int)index != -1) {
-		z_object_wordlist_foreach(clear_perms_cb, (void *)index);
+		k_object_wordlist_foreach(clear_perms_cb, (void *)index);
 	}
 }
 
diff --git a/scripts/build/gen_kobject_list.py b/scripts/build/gen_kobject_list.py
index 6bd12010414..c3df9679b1e 100755
--- a/scripts/build/gen_kobject_list.py
+++ b/scripts/build/gen_kobject_list.py
@@ -755,7 +755,7 @@ void z_object_gperf_wordlist_foreach(_wordlist_cb_func_t func, void *context)
 struct k_object *z_object_find(const void *obj)
 	ALIAS_OF(z_object_gperf_find);
 
-void z_object_wordlist_foreach(_wordlist_cb_func_t func, void *context)
+void k_object_wordlist_foreach(_wordlist_cb_func_t func, void *context)
 	ALIAS_OF(z_object_gperf_wordlist_foreach);
 #endif
 """