diff --git a/apps/benchmarks/benchmarks.nim b/apps/benchmarks/benchmarks.nim
index 4979fc0a9..eb1efe98d 100644
--- a/apps/benchmarks/benchmarks.nim
+++ b/apps/benchmarks/benchmarks.nim
@@ -3,11 +3,11 @@ import
 
 import
   logos_delivery/waku/[
-    waku_rln/protocol_types,
-    waku_rln/bindings,
-    waku_rln,
-    waku_rln/conversion_utils,
-    waku_rln/group_manager/on_chain/group_manager,
+    rln/protocol_types,
+    rln/bindings,
+    rln,
+    rln/conversion_utils,
+    rln/group_manager/on_chain/group_manager,
   ],
   tests/waku_rln_relay/utils_onchain
 
diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim
index 2481d8065..7e220244e 100644
--- a/apps/chat2/chat2.nim
+++ b/apps/chat2/chat2.nim
@@ -48,7 +48,7 @@ import
   ./config_chat2
 
 import libp2p/protocols/pubsub/rpc/messages, libp2p/protocols/pubsub/pubsub
-import ../../logos_delivery/waku/waku_rln
+import ../../logos_delivery/waku/rln
 
 const Help = """
   Commands: /[?|help|connect|nick|exit]
diff --git a/apps/chat2mix/chat2mix.nim b/apps/chat2mix/chat2mix.nim
index e9ba7ef57..f5d864a8f 100644
--- a/apps/chat2mix/chat2mix.nim
+++ b/apps/chat2mix/chat2mix.nim
@@ -56,7 +56,7 @@ import
   ./config_chat2mix
 
 import libp2p/protocols/pubsub/rpc/messages, libp2p/protocols/pubsub/pubsub
-import ../../logos_delivery/waku/waku_rln
+import ../../logos_delivery/waku/rln
 
 logScope:
   topics = "chat2 mix"
diff --git a/apps/networkmonitor/networkmonitor.nim b/apps/networkmonitor/networkmonitor.nim
index 5a2f3d360..2c0a5ca89 100644
--- a/apps/networkmonitor/networkmonitor.nim
+++ b/apps/networkmonitor/networkmonitor.nim
@@ -25,7 +25,7 @@ import
     discovery/waku_discv5,
     discovery/waku_dnsdisc,
     waku_relay,
-    waku_rln,
+    rln,
     factory/builder,
     factory/networks_config,
   ],
diff --git a/examples/wakustealthcommitments/stealth_commitment_protocol.nim b/examples/wakustealthcommitments/stealth_commitment_protocol.nim
index 0ce769edc..1050545e9 100644
--- a/examples/wakustealthcommitments/stealth_commitment_protocol.nim
+++ b/examples/wakustealthcommitments/stealth_commitment_protocol.nim
@@ -2,7 +2,7 @@
 
 import
   results,
-  logos_delivery/waku/[common/logging, waku_node, waku_rln],
+  logos_delivery/waku/[common/logging, waku_node, rln],
   ./erc_5564_interface as StealthCommitmentFFI,
   ./node_spec,
   ./wire_spec
diff --git a/logos_delivery/messaging/delivery_service/send_service/send_service.nim b/logos_delivery/messaging/delivery_service/send_service/send_service.nim
index 4177ba7dc..3849f661c 100644
--- a/logos_delivery/messaging/delivery_service/send_service/send_service.nim
+++ b/logos_delivery/messaging/delivery_service/send_service/send_service.nim
@@ -15,7 +15,7 @@ import
     waku_store/client,
     waku_store/common,
     waku_relay/protocol,
-    waku_rln/rln,
+    rln/rln,
     waku_lightpush/client,
     waku_lightpush/callbacks,
     events/message_events,
diff --git a/logos_delivery/waku/factory/node_factory.nim b/logos_delivery/waku/factory/node_factory.nim
index 57c85412e..48a21aeb0 100644
--- a/logos_delivery/waku/factory/node_factory.nim
+++ b/logos_delivery/waku/factory/node_factory.nim
@@ -23,7 +23,7 @@ import
   ../net/net_config,
   ../waku_core,
   ../waku_core/codecs,
-  ../waku_rln,
+  ../rln,
   ../discovery/waku_dnsdisc,
   ../waku_archive/retention_policy as policy,
   ../waku_archive/retention_policy/builder as policy_builder,
diff --git a/logos_delivery/waku/factory/waku_conf.nim b/logos_delivery/waku/factory/waku_conf.nim
index 4d05f86e2..0ffe803ae 100644
--- a/logos_delivery/waku/factory/waku_conf.nim
+++ b/logos_delivery/waku/factory/waku_conf.nim
@@ -13,7 +13,7 @@ import
   results
 
 import
-  ../waku_rln/rln,
+  ../rln/rln,
   ../rest_api/endpoint/builder,
   ../discovery/waku_discv5,
   ../discovery/waku_kademlia,
diff --git a/logos_delivery/waku/node/health_monitor/node_health_monitor.nim b/logos_delivery/waku/node/health_monitor/node_health_monitor.nim
index 8d647ac1e..d62898f2b 100644
--- a/logos_delivery/waku/node/health_monitor/node_health_monitor.nim
+++ b/logos_delivery/waku/node/health_monitor/node_health_monitor.nim
@@ -11,7 +11,7 @@ import
   logos_delivery/api/types,
   logos_delivery/waku/[
     waku_relay,
-    waku_rln,
+    rln,
     events/health_events,
     events/peer_events,
     node/waku_node,
diff --git a/logos_delivery/waku/node/waku_metrics.nim b/logos_delivery/waku/node/waku_metrics.nim
index 1a5aed28b..7058af755 100644
--- a/logos_delivery/waku/node/waku_metrics.nim
+++ b/logos_delivery/waku/node/waku_metrics.nim
@@ -4,7 +4,7 @@ import logos_delivery/waku/compat/option_valueor
 import chronicles, chronos, metrics, metrics/chronos_httpserver
 import
   logos_delivery/waku/
-    [net/auto_port, waku_rln/protocol_metrics as rln_metrics, utils/collector],
+    [net/auto_port, rln/protocol_metrics as rln_metrics, utils/collector],
   ./peer_manager,
   ./node_telemetry,
   ./waku_node
diff --git a/logos_delivery/waku/node/waku_node.nim b/logos_delivery/waku/node/waku_node.nim
index 944f94712..695868a76 100644
--- a/logos_delivery/waku/node/waku_node.nim
+++ b/logos_delivery/waku/node/waku_node.nim
@@ -52,7 +52,7 @@ import
     waku_lightpush as lightpush_protocol,
     waku_enr,
     waku_peer_exchange,
-    waku_rln,
+    rln,
     common/rate_limit/setting,
     common/callbacks,
     common/nimchronos,
diff --git a/logos_delivery/waku/node/waku_node/lightpush.nim b/logos_delivery/waku/node/waku_node/lightpush.nim
index 0bacd5266..44add003e 100644
--- a/logos_delivery/waku/node/waku_node/lightpush.nim
+++ b/logos_delivery/waku/node/waku_node/lightpush.nim
@@ -30,7 +30,7 @@ import
   ../../waku_lightpush as lightpush_protocol,
   ../peer_manager,
   ../../common/rate_limit/setting,
-  ../../waku_rln
+  ../../rln
 
 logScope:
   topics = "waku node lightpush api"
diff --git a/logos_delivery/waku/node/waku_node/relay.nim b/logos_delivery/waku/node/waku_node/relay.nim
index 2484dc982..f748373f7 100644
--- a/logos_delivery/waku/node/waku_node/relay.nim
+++ b/logos_delivery/waku/node/waku_node/relay.nim
@@ -28,8 +28,8 @@ import
     waku_filter_v2,
     waku_archive,
     waku_store_sync,
-    waku_rln,
-    waku_rln/adapters/relay as waku_rln_adapter,
+    rln,
+    rln/adapters/relay as waku_rln_adapter,
     node/waku_node,
     node/subscription_manager,
     node/peer_manager,
diff --git a/logos_delivery/waku/rest_api/endpoint/relay/handlers.nim b/logos_delivery/waku/rest_api/endpoint/relay/handlers.nim
index e48c9243e..6dce77e54 100644
--- a/logos_delivery/waku/rest_api/endpoint/relay/handlers.nim
+++ b/logos_delivery/waku/rest_api/endpoint/relay/handlers.nim
@@ -13,7 +13,7 @@ import
 import
   ../../../waku_node,
   ../../../waku_relay/protocol,
-  ../../../waku_rln,
+  ../../../rln,
   ../../../node/waku_node,
   ../../message_cache,
   ../../handlers,
diff --git a/logos_delivery/waku/rln.nim b/logos_delivery/waku/rln.nim
new file mode 100644
index 000000000..fac76bb33
--- /dev/null
+++ b/logos_delivery/waku/rln.nim
@@ -0,0 +1,7 @@
+import
+  ./rln/group_manager,
+  ./rln/conversion_utils,
+  ./rln/rln,
+  ./rln/contract
+
+export group_manager, conversion_utils, rln, contract
diff --git a/logos_delivery/waku/waku_rln/adapters/relay.nim b/logos_delivery/waku/rln/adapters/relay.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/adapters/relay.nim
rename to logos_delivery/waku/rln/adapters/relay.nim
diff --git a/logos_delivery/waku/waku_rln/bindings.nim b/logos_delivery/waku/rln/bindings.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/bindings.nim
rename to logos_delivery/waku/rln/bindings.nim
diff --git a/logos_delivery/waku/waku_rln/config.nim b/logos_delivery/waku/rln/config.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/config.nim
rename to logos_delivery/waku/rln/config.nim
diff --git a/logos_delivery/waku/waku_rln/constants.nim b/logos_delivery/waku/rln/constants.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/constants.nim
rename to logos_delivery/waku/rln/constants.nim
diff --git a/logos_delivery/waku/waku_rln/contract.nim b/logos_delivery/waku/rln/contract.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/contract.nim
rename to logos_delivery/waku/rln/contract.nim
diff --git a/logos_delivery/waku/waku_rln/conversion_utils.nim b/logos_delivery/waku/rln/conversion_utils.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/conversion_utils.nim
rename to logos_delivery/waku/rln/conversion_utils.nim
diff --git a/logos_delivery/waku/waku_rln/group_manager.nim b/logos_delivery/waku/rln/group_manager.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/group_manager.nim
rename to logos_delivery/waku/rln/group_manager.nim
diff --git a/logos_delivery/waku/waku_rln/group_manager/group_manager_base.nim b/logos_delivery/waku/rln/group_manager/group_manager_base.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/group_manager/group_manager_base.nim
rename to logos_delivery/waku/rln/group_manager/group_manager_base.nim
diff --git a/logos_delivery/waku/waku_rln/group_manager/on_chain.nim b/logos_delivery/waku/rln/group_manager/on_chain.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/group_manager/on_chain.nim
rename to logos_delivery/waku/rln/group_manager/on_chain.nim
diff --git a/logos_delivery/waku/waku_rln/group_manager/on_chain/group_manager.nim b/logos_delivery/waku/rln/group_manager/on_chain/group_manager.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/group_manager/on_chain/group_manager.nim
rename to logos_delivery/waku/rln/group_manager/on_chain/group_manager.nim
diff --git a/logos_delivery/waku/waku_rln/group_manager/on_chain/retry_wrapper.nim b/logos_delivery/waku/rln/group_manager/on_chain/retry_wrapper.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/group_manager/on_chain/retry_wrapper.nim
rename to logos_delivery/waku/rln/group_manager/on_chain/retry_wrapper.nim
diff --git a/logos_delivery/waku/waku_rln/group_manager/on_chain/rpc_wrapper.nim b/logos_delivery/waku/rln/group_manager/on_chain/rpc_wrapper.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/group_manager/on_chain/rpc_wrapper.nim
rename to logos_delivery/waku/rln/group_manager/on_chain/rpc_wrapper.nim
diff --git a/logos_delivery/waku/waku_rln/nonce_manager.nim b/logos_delivery/waku/rln/nonce_manager.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/nonce_manager.nim
rename to logos_delivery/waku/rln/nonce_manager.nim
diff --git a/logos_delivery/waku/waku_rln/nullifier_log.nim b/logos_delivery/waku/rln/nullifier_log.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/nullifier_log.nim
rename to logos_delivery/waku/rln/nullifier_log.nim
diff --git a/logos_delivery/waku/waku_rln/proof.nim b/logos_delivery/waku/rln/proof.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/proof.nim
rename to logos_delivery/waku/rln/proof.nim
diff --git a/logos_delivery/waku/waku_rln/protocol_metrics.nim b/logos_delivery/waku/rln/protocol_metrics.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/protocol_metrics.nim
rename to logos_delivery/waku/rln/protocol_metrics.nim
diff --git a/logos_delivery/waku/waku_rln/protocol_types.nim b/logos_delivery/waku/rln/protocol_types.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/protocol_types.nim
rename to logos_delivery/waku/rln/protocol_types.nim
diff --git a/logos_delivery/waku/waku_rln/rln.nim b/logos_delivery/waku/rln/rln.nim
similarity index 98%
rename from logos_delivery/waku/waku_rln/rln.nim
rename to logos_delivery/waku/rln/rln.nim
index bdf34c133..b0b782994 100644
--- a/logos_delivery/waku/waku_rln/rln.nim
+++ b/logos_delivery/waku/rln/rln.nim
@@ -33,8 +33,8 @@ import
   logos_delivery/waku/
     [common/error_handling, waku_core, requests/rln_requests, waku_keystore]
 
-# Re-export the submodules so existing `import waku_rln`
-# (and `import waku_rln/rln`) callers see the moved symbols
+# Re-export the submodules so existing `import rln`
+# (and `import rln/rln`) callers see the moved symbols
 # (WakuRln, WakuRlnConfig, generateRLNProof, etc.).
 export types, config, proof, nullifier_log
 
diff --git a/logos_delivery/waku/waku_rln/rln/rln_interface.nim b/logos_delivery/waku/rln/rln/rln_interface.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/rln/rln_interface.nim
rename to logos_delivery/waku/rln/rln/rln_interface.nim
diff --git a/logos_delivery/waku/waku_rln/rln/wrappers.nim b/logos_delivery/waku/rln/rln/wrappers.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/rln/wrappers.nim
rename to logos_delivery/waku/rln/rln/wrappers.nim
diff --git a/logos_delivery/waku/waku_rln/types.nim b/logos_delivery/waku/rln/types.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln/types.nim
rename to logos_delivery/waku/rln/types.nim
diff --git a/logos_delivery/waku/waku.nim b/logos_delivery/waku/waku.nim
index 27ba98f3a..067b5b6ec 100644
--- a/logos_delivery/waku/waku.nim
+++ b/logos_delivery/waku/waku.nim
@@ -26,7 +26,7 @@ import
     waku_core,
     waku_node,
     waku_archive,
-    waku_rln,
+    rln,
     waku_store,
     waku_filter_v2,
     waku_relay/protocol,
diff --git a/logos_delivery/waku/waku_lightpush/callbacks.nim b/logos_delivery/waku/waku_lightpush/callbacks.nim
index f8862ee22..455df5ab7 100644
--- a/logos_delivery/waku/waku_lightpush/callbacks.nim
+++ b/logos_delivery/waku/waku_lightpush/callbacks.nim
@@ -3,7 +3,7 @@ import logos_delivery/waku/compat/option_valueor
 
 import results
 
-import ../waku_core, ../waku_relay, ./common, ../waku_rln, ../waku_rln/protocol_types
+import ../waku_core, ../waku_relay, ./common, ../rln, ../rln/protocol_types
 
 import std/times, libp2p/peerid, stew/byteutils
 
diff --git a/logos_delivery/waku/waku_lightpush_legacy/callbacks.nim b/logos_delivery/waku/waku_lightpush_legacy/callbacks.nim
index b2628e1ff..d3254a10a 100644
--- a/logos_delivery/waku/waku_lightpush_legacy/callbacks.nim
+++ b/logos_delivery/waku/waku_lightpush_legacy/callbacks.nim
@@ -5,8 +5,8 @@ import
   ../waku_relay,
   ./common,
   ./protocol_metrics,
-  ../waku_rln,
-  ../waku_rln/protocol_types
+  ../rln,
+  ../rln/protocol_types
 
 import std/times, libp2p/peerid, stew/byteutils
 
diff --git a/logos_delivery/waku/waku_rln.nim b/logos_delivery/waku/waku_rln.nim
deleted file mode 100644
index a24441271..000000000
--- a/logos_delivery/waku/waku_rln.nim
+++ /dev/null
@@ -1,7 +0,0 @@
-import
-  ./waku_rln/group_manager,
-  ./waku_rln/conversion_utils,
-  ./waku_rln/rln,
-  ./waku_rln/contract
-
-export group_manager, conversion_utils, rln, contract
diff --git a/tests/node/test_wakunode_legacy_lightpush.nim b/tests/node/test_wakunode_legacy_lightpush.nim
index d335270b2..e7740b55a 100644
--- a/tests/node/test_wakunode_legacy_lightpush.nim
+++ b/tests/node/test_wakunode_legacy_lightpush.nim
@@ -15,7 +15,7 @@ import
     waku_lightpush_legacy,
     waku_lightpush_legacy/common,
     waku_lightpush_legacy/protocol_metrics,
-    waku_rln,
+    rln,
   ],
   ../testlib/[wakucore, wakunode, testasync, futures, testutils],
   ../resources/payloads,
diff --git a/tests/node/test_wakunode_lightpush.nim b/tests/node/test_wakunode_lightpush.nim
index 74574fe07..86f74a470 100644
--- a/tests/node/test_wakunode_lightpush.nim
+++ b/tests/node/test_wakunode_lightpush.nim
@@ -9,7 +9,7 @@ import
 
 import
   logos_delivery/waku/
-    [waku_core, node/peer_manager, waku_node, waku_lightpush, waku_rln],
+    [waku_core, node/peer_manager, waku_node, waku_lightpush, rln],
   ../testlib/[wakucore, wakunode, testasync, futures],
   ../resources/payloads,
   ../waku_rln_relay/[rln/waku_rln_relay_utils, utils_onchain]
diff --git a/tests/node/test_wakunode_relay_rln.nim b/tests/node/test_wakunode_relay_rln.nim
index 68d054309..fa4932998 100644
--- a/tests/node/test_wakunode_relay_rln.nim
+++ b/tests/node/test_wakunode_relay_rln.nim
@@ -17,9 +17,9 @@ import
     waku_core,
     waku_node,
     common/error_handling,
-    waku_rln,
-    waku_rln/bindings,
-    waku_rln/protocol_types,
+    rln,
+    rln/bindings,
+    rln/protocol_types,
     waku_keystore/keystore,
   ],
   ../waku_store/store_utils,
diff --git a/tests/waku_keystore/utils.nim b/tests/waku_keystore/utils.nim
index 23a59a8fb..974acfa49 100644
--- a/tests/waku_keystore/utils.nim
+++ b/tests/waku_keystore/utils.nim
@@ -4,7 +4,7 @@
 import stint
 
 import
-  logos_delivery/waku/[waku_keystore/protocol_types, waku_rln, waku_rln/protocol_types]
+  logos_delivery/waku/[waku_keystore/protocol_types, rln, rln/protocol_types]
 
 func fromStrToBytesLe*(v: string): seq[byte] =
   try:
diff --git a/tests/waku_relay/utils.nim b/tests/waku_relay/utils.nim
index c92db5320..038c596e5 100644
--- a/tests/waku_relay/utils.nim
+++ b/tests/waku_relay/utils.nim
@@ -14,7 +14,7 @@ from std/times import epochTime
 
 import
   logos_delivery/waku/
-    [waku_relay, node/waku_node, node/peer_manager, waku_core, waku_node, waku_rln],
+    [waku_relay, node/waku_node, node/peer_manager, waku_core, waku_node, rln],
   ../waku_store/store_utils,
   ../waku_archive/archive_utils,
   ../testlib/[wakucore, futures]
diff --git a/tests/waku_rln_relay/rln/test_rln_interface.nim b/tests/waku_rln_relay/rln/test_rln_interface.nim
index 7d5ff53cf..7d714c2dd 100644
--- a/tests/waku_rln_relay/rln/test_rln_interface.nim
+++ b/tests/waku_rln_relay/rln/test_rln_interface.nim
@@ -1,7 +1,7 @@
 import testutils/unittests, results
 
-import logos_delivery/waku/waku_rln/rln/rln_interface
-import logos_delivery/waku/waku_rln/rln/wrappers
+import logos_delivery/waku/rln/rln/rln_interface
+import logos_delivery/waku/rln/rln/wrappers
 
 suite "Vec_uint8":
   suite "toVecUint8":
diff --git a/tests/waku_rln_relay/rln/test_wrappers.nim b/tests/waku_rln_relay/rln/test_wrappers.nim
index 2939f361f..9b239dbf0 100644
--- a/tests/waku_rln_relay/rln/test_wrappers.nim
+++ b/tests/waku_rln_relay/rln/test_wrappers.nim
@@ -1,8 +1,8 @@
 import testutils/unittests, results
 
 import
-  logos_delivery/waku/waku_rln/bindings,
-  logos_delivery/waku/waku_rln/rln/wrappers,
+  logos_delivery/waku/rln/bindings,
+  logos_delivery/waku/rln/rln/wrappers,
   ./waku_rln_relay_utils
 
 suite "membershipKeyGen":
diff --git a/tests/waku_rln_relay/rln/waku_rln_relay_utils.nim b/tests/waku_rln_relay/rln/waku_rln_relay_utils.nim
index 2e5911c65..94cd5e86d 100644
--- a/tests/waku_rln_relay/rln/waku_rln_relay_utils.nim
+++ b/tests/waku_rln_relay/rln/waku_rln_relay_utils.nim
@@ -2,8 +2,8 @@ import std/options
 import std/tempfiles
 
 import
-  logos_delivery/waku/waku_rln,
-  logos_delivery/waku/waku_rln/[
+  logos_delivery/waku/rln,
+  logos_delivery/waku/rln/[
     group_manager, bindings, conversion_utils, constants, protocol_types,
     protocol_metrics, nonce_manager,
   ]
diff --git a/tests/waku_rln_relay/test_rln_contract_deployment.nim b/tests/waku_rln_relay/test_rln_contract_deployment.nim
index e4285fb9d..e5600e829 100644
--- a/tests/waku_rln_relay/test_rln_contract_deployment.nim
+++ b/tests/waku_rln_relay/test_rln_contract_deployment.nim
@@ -6,7 +6,7 @@ import std/[options, os], results, testutils/unittests, chronos, web3
 
 import
   logos_delivery/waku/
-    [waku_rln, waku_rln/conversion_utils, waku_rln/group_manager/on_chain/group_manager],
+    [rln, rln/conversion_utils, rln/group_manager/on_chain/group_manager],
   ./utils_onchain
 
 suite "Token and RLN Contract Deployment":
diff --git a/tests/waku_rln_relay/test_rln_group_manager_onchain.nim b/tests/waku_rln_relay/test_rln_group_manager_onchain.nim
index a58eac666..491da4274 100644
--- a/tests/waku_rln_relay/test_rln_group_manager_onchain.nim
+++ b/tests/waku_rln_relay/test_rln_group_manager_onchain.nim
@@ -18,13 +18,13 @@ import
 
 import
   logos_delivery/waku/[
-    waku_rln,
-    waku_rln/protocol_types,
-    waku_rln/protocol_metrics,
-    waku_rln/constants,
-    waku_rln/bindings,
-    waku_rln/conversion_utils,
-    waku_rln/group_manager/on_chain/group_manager,
+    rln,
+    rln/protocol_types,
+    rln/protocol_metrics,
+    rln/constants,
+    rln/bindings,
+    rln/conversion_utils,
+    rln/group_manager/on_chain/group_manager,
   ],
   ../testlib/wakucore,
   ./utils_onchain
diff --git a/tests/waku_rln_relay/test_rln_nonce_manager.nim b/tests/waku_rln_relay/test_rln_nonce_manager.nim
index da846aaf5..f9e541e1a 100644
--- a/tests/waku_rln_relay/test_rln_nonce_manager.nim
+++ b/tests/waku_rln_relay/test_rln_nonce_manager.nim
@@ -1,7 +1,7 @@
 {.used.}
 
 import testutils/unittests, chronos, os
-import logos_delivery/waku/waku_rln/nonce_manager
+import logos_delivery/waku/rln/nonce_manager
 
 suite "Nonce manager":
   test "should initialize successfully":
diff --git a/tests/waku_rln_relay/test_waku_rln_relay.nim b/tests/waku_rln_relay/test_waku_rln_relay.nim
index a66591557..38b61fbb0 100644
--- a/tests/waku_rln_relay/test_waku_rln_relay.nim
+++ b/tests/waku_rln_relay/test_waku_rln_relay.nim
@@ -13,7 +13,7 @@ import brokers/broker_context
 
 import
   logos_delivery/waku/
-    [waku_core, waku_rln, waku_rln/bindings, waku_rln/protocol_metrics, waku_keystore],
+    [waku_core, rln, rln/bindings, rln/protocol_metrics, waku_keystore],
   ./rln/waku_rln_relay_utils,
   ./utils_onchain,
   ../testlib/[wakucore, futures, wakunode, testutils]
diff --git a/tests/waku_rln_relay/test_wakunode_rln_relay.nim b/tests/waku_rln_relay/test_wakunode_rln_relay.nim
index b0a001d5a..4ede7f64c 100644
--- a/tests/waku_rln_relay/test_wakunode_rln_relay.nim
+++ b/tests/waku_rln_relay/test_wakunode_rln_relay.nim
@@ -11,7 +11,7 @@ import
   brokers/broker_context
 
 import
-  logos_delivery/waku/[waku_core, waku_node, waku_rln],
+  logos_delivery/waku/[waku_core, waku_node, rln],
   ../testlib/[wakucore, futures, wakunode, testutils],
   ./utils_onchain,
   ./rln/waku_rln_relay_utils
diff --git a/tests/waku_rln_relay/utils_offchain.nim b/tests/waku_rln_relay/utils_offchain.nim
index 7f61df621..ef24a88d1 100644
--- a/tests/waku_rln_relay/utils_offchain.nim
+++ b/tests/waku_rln_relay/utils_offchain.nim
@@ -12,7 +12,7 @@ from std/times import epochTime
 
 import
   ../../../logos_delivery/waku/
-    [node/waku_node, node/peer_manager, waku_core, waku_node, waku_rln],
+    [node/waku_node, node/peer_manager, waku_core, waku_node, rln],
   ../waku_store/store_utils,
   ../waku_archive/archive_utils,
   ../testlib/[wakucore, futures, assertions]
diff --git a/tests/waku_rln_relay/utils_onchain.nim b/tests/waku_rln_relay/utils_onchain.nim
index c0dcdeea3..b7d797414 100644
--- a/tests/waku_rln_relay/utils_onchain.nim
+++ b/tests/waku_rln_relay/utils_onchain.nim
@@ -21,7 +21,7 @@ import
 
 import
   logos_delivery/waku/
-    [waku_rln, waku_rln/protocol_types, waku_rln/constants, waku_rln/bindings],
+    [rln, rln/protocol_types, rln/constants, rln/bindings],
   ../testlib/common
 
 const CHAIN_ID* = 1234'u256
diff --git a/tests/wakunode_rest/test_rest_health.nim b/tests/wakunode_rest/test_rest_health.nim
index ae2c861b6..18a5abc4c 100644
--- a/tests/wakunode_rest/test_rest_health.nim
+++ b/tests/wakunode_rest/test_rest_health.nim
@@ -19,7 +19,7 @@ import
     rest_api/endpoint/responses,
     rest_api/endpoint/health/handlers as health_rest_interface,
     rest_api/endpoint/health/client as health_rest_client,
-    waku_rln,
+    rln,
     node/health_monitor,
   ],
   ../testlib/common,
diff --git a/tests/wakunode_rest/test_rest_relay.nim b/tests/wakunode_rest/test_rest_relay.nim
index e3a56a839..0c6cf3508 100644
--- a/tests/wakunode_rest/test_rest_relay.nim
+++ b/tests/wakunode_rest/test_rest_relay.nim
@@ -21,7 +21,7 @@ import
     rest_api/endpoint/relay/handlers as relay_rest_interface,
     rest_api/endpoint/relay/client as relay_rest_client,
     waku_relay,
-    waku_rln,
+    rln,
   ],
   ../testlib/wakucore,
   ../testlib/wakunode,
diff --git a/tools/rln_keystore_generator/rln_keystore_generator.nim b/tools/rln_keystore_generator/rln_keystore_generator.nim
index 64d76946f..dc6088feb 100644
--- a/tools/rln_keystore_generator/rln_keystore_generator.nim
+++ b/tools/rln_keystore_generator/rln_keystore_generator.nim
@@ -8,9 +8,9 @@ import chronicles, results, std/[tempfiles, sequtils]
 import
   logos_delivery/waku/[
     waku_keystore,
-    waku_rln/bindings,
-    waku_rln/conversion_utils,
-    waku_rln/group_manager/on_chain,
+    rln/bindings,
+    rln/conversion_utils,
+    rln/group_manager/on_chain,
   ]
 
 logScope: