diff --git a/library/waku_thread_requests/debug_node_request.nim b/library/kernel_api/debug_node_api.nim
similarity index 100%
rename from library/waku_thread_requests/debug_node_request.nim
rename to library/kernel_api/debug_node_api.nim
diff --git a/library/waku_thread_requests/discovery_request.nim b/library/kernel_api/discovery_api.nim
similarity index 100%
rename from library/waku_thread_requests/discovery_request.nim
rename to library/kernel_api/discovery_api.nim
diff --git a/library/waku_thread_requests/node_lifecycle_request.nim b/library/kernel_api/node_lifecycle_api.nim
similarity index 100%
rename from library/waku_thread_requests/node_lifecycle_request.nim
rename to library/kernel_api/node_lifecycle_api.nim
diff --git a/library/waku_thread_requests/peer_manager_request.nim b/library/kernel_api/peer_manager_api.nim
similarity index 100%
rename from library/waku_thread_requests/peer_manager_request.nim
rename to library/kernel_api/peer_manager_api.nim
diff --git a/library/waku_thread_requests/ping_request.nim b/library/kernel_api/ping_api.nim
similarity index 100%
rename from library/waku_thread_requests/ping_request.nim
rename to library/kernel_api/ping_api.nim
diff --git a/library/waku_thread_requests/protocols/filter_request.nim b/library/kernel_api/protocols/filter_api.nim
similarity index 100%
rename from library/waku_thread_requests/protocols/filter_request.nim
rename to library/kernel_api/protocols/filter_api.nim
diff --git a/library/waku_thread_requests/protocols/lightpush_request.nim b/library/kernel_api/protocols/lightpush_api.nim
similarity index 100%
rename from library/waku_thread_requests/protocols/lightpush_request.nim
rename to library/kernel_api/protocols/lightpush_api.nim
diff --git a/library/waku_thread_requests/protocols/relay_request.nim b/library/kernel_api/protocols/relay_api.nim
similarity index 100%
rename from library/waku_thread_requests/protocols/relay_request.nim
rename to library/kernel_api/protocols/relay_api.nim
diff --git a/library/waku_thread_requests/protocols/store_request.nim b/library/kernel_api/protocols/store_api.nim
similarity index 100%
rename from library/waku_thread_requests/protocols/store_request.nim
rename to library/kernel_api/protocols/store_api.nim
diff --git a/library/libwaku.nim b/library/libwaku.nim
index 2916c3ec6..c71e823d6 100644
--- a/library/libwaku.nim
+++ b/library/libwaku.nim
@@ -15,15 +15,15 @@ import
 ################################################################################
 ## Include different APIs, i.e. all procs with {.ffi.} pragma
 include
-  ./waku_thread_requests/peer_manager_request,
-  ./waku_thread_requests/discovery_request,
-  ./waku_thread_requests/node_lifecycle_request,
-  ./waku_thread_requests/debug_node_request,
-  ./waku_thread_requests/ping_request,
-  ./waku_thread_requests/protocols/relay_request,
-  ./waku_thread_requests/protocols/store_request,
-  ./waku_thread_requests/protocols/lightpush_request,
-  ./waku_thread_requests/protocols/filter_request
+  ./kernel_api/peer_manager_api,
+  ./kernel_api/discovery_api,
+  ./kernel_api/node_lifecycle_api,
+  ./kernel_api/debug_node_api,
+  ./kernel_api/ping_api,
+  ./kernel_api/protocols/relay_api,
+  ./kernel_api/protocols/store_api,
+  ./kernel_api/protocols/lightpush_api,
+  ./kernel_api/protocols/filter_api
 
 ################################################################################
 ### Exported procs