diff --git a/apps/benchmarks/benchmarks.nim b/apps/benchmarks/benchmarks.nim
index 78d9e7c1a..2e4e5ec4a 100644
--- a/apps/benchmarks/benchmarks.nim
+++ b/apps/benchmarks/benchmarks.nim
@@ -3,13 +3,13 @@ import
 
 import
   logos_delivery/waku/[
-    waku_rln_relay/protocol_types,
-    waku_rln_relay/bindings,
-    waku_rln_relay,
-    waku_rln_relay/conversion_utils,
-    waku_rln_relay/group_manager/on_chain/group_manager,
+    waku_rln/protocol_types,
+    waku_rln/bindings,
+    waku_rln,
+    waku_rln/conversion_utils,
+    waku_rln/group_manager/on_chain/group_manager,
   ],
-  tests/waku_rln_relay/utils_onchain
+  tests/waku_rln/utils_onchain
 
 proc benchmark(
     manager: OnChainGroupManager, registerCount: int, messageLimit: int
diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim
index 968d4582a..7b98bcbe5 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_relay
+import ../../logos_delivery/waku/waku_rln
 
 const Help = """
   Commands: /[?|help|connect|nick|exit]
diff --git a/apps/chat2mix/chat2mix.nim b/apps/chat2mix/chat2mix.nim
index 155f1e855..e9ba7ef57 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_relay
+import ../../logos_delivery/waku/waku_rln
 
 logScope:
   topics = "chat2 mix"
diff --git a/apps/networkmonitor/networkmonitor.nim b/apps/networkmonitor/networkmonitor.nim
index 4c2d047ae..fad2d4fdc 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_relay,
+    waku_rln,
     factory/builder,
     factory/networks_config,
   ],
diff --git a/examples/wakustealthcommitments/stealth_commitment_protocol.nim b/examples/wakustealthcommitments/stealth_commitment_protocol.nim
index f7b34e26a..0ce769edc 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_relay],
+  logos_delivery/waku/[common/logging, waku_node, waku_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 92026be5d..af7571b29 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_relay/rln_relay,
+    waku_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 30e37850a..57c85412e 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_relay,
+  ../waku_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.nim b/logos_delivery/waku/factory/waku.nim
index a797b8294..d160ac2b2 100644
--- a/logos_delivery/waku/factory/waku.nim
+++ b/logos_delivery/waku/factory/waku.nim
@@ -24,7 +24,7 @@ import
     waku_core,
     waku_node,
     waku_archive,
-    waku_rln_relay,
+    waku_rln,
     waku_store,
     waku_filter_v2,
     waku_relay/protocol,
diff --git a/logos_delivery/waku/factory/waku_conf.nim b/logos_delivery/waku/factory/waku_conf.nim
index 9de3d3bc8..2e12f6fb3 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_relay/rln_relay,
+  ../waku_rln/rln,
   ../rest_api/endpoint/builder,
   ../discovery/waku_discv5,
   ../discovery/waku_kademlia,
diff --git a/logos_delivery/waku/incentivization/eligibility_manager.nim b/logos_delivery/waku/incentivization/eligibility_manager.nim
index ed882f524..3157d34d9 100644
--- a/logos_delivery/waku/incentivization/eligibility_manager.nim
+++ b/logos_delivery/waku/incentivization/eligibility_manager.nim
@@ -1,7 +1,7 @@
 import logos_delivery/waku/compat/option_valueor
 import std/[options, sets], chronos, web3, stew/byteutils, stint, results, chronicles
 
-import logos_delivery/waku/incentivization/rpc, tests/waku_rln_relay/utils_onchain
+import logos_delivery/waku/incentivization/rpc, tests/waku_rln/utils_onchain
 
 const SimpleTransferGasUsed = Quantity(21000)
 const TxReceiptQueryTimeout = 3.seconds
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 6e77816f0..859bf0179 100644
--- a/logos_delivery/waku/node/health_monitor/node_health_monitor.nim
+++ b/logos_delivery/waku/node/health_monitor/node_health_monitor.nim
@@ -10,7 +10,7 @@ import
   libp2p/protocols/pubsub/rpc/messages,
   logos_delivery/waku/[
     waku_relay,
-    waku_rln_relay,
+    waku_rln,
     api/types,
     events/health_events,
     events/peer_events,
diff --git a/logos_delivery/waku/node/waku_metrics.nim b/logos_delivery/waku/node/waku_metrics.nim
index 08eecbe5c..1a5aed28b 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_relay/protocol_metrics as rln_metrics, utils/collector],
+    [net/auto_port, waku_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 2ad7dc601..9253a0947 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_relay,
+    waku_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 10f27e32f..f21431f5e 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_relay
+  ../../waku_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 c1e79d44e..5eb0cb42c 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_relay,
-    waku_rln_relay/adapters/relay as waku_rln_relay_adapter,
+    waku_rln,
+    waku_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 9075c61df..e48c9243e 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_relay,
+  ../../../waku_rln,
   ../../../node/waku_node,
   ../../message_cache,
   ../../handlers,
diff --git a/logos_delivery/waku/waku_keystore/protocol_types.nim b/logos_delivery/waku/waku_keystore/protocol_types.nim
index 0f50c66ee..3bf748ef9 100644
--- a/logos_delivery/waku/waku_keystore/protocol_types.nim
+++ b/logos_delivery/waku/waku_keystore/protocol_types.nim
@@ -77,7 +77,7 @@ proc toIdentityCredentials*(
 
 proc serialize*(idComms: seq[IDCommitment]): seq[byte] =
   ## serializes a seq of IDCommitments to a byte seq
-  ## the serialization is based on https://github.com/status-im/nwaku/blob/37bd29fbc37ce5cf636734e7dd410b1ed27b88c8/waku/v2/protocol/waku_rln_relay/rln.nim#L142
+  ## the serialization is based on https://github.com/status-im/nwaku/blob/37bd29fbc37ce5cf636734e7dd410b1ed27b88c8/waku/v2/protocol/waku_rln/rln.nim#L142
   ## the order of serialization is |id_commitment_len<8>|id_commitment<var>|
   var idCommsBytes = newSeq[byte]()
 
diff --git a/logos_delivery/waku/waku_lightpush/callbacks.nim b/logos_delivery/waku/waku_lightpush/callbacks.nim
index dd910326e..c8bb0d1dd 100644
--- a/logos_delivery/waku/waku_lightpush/callbacks.nim
+++ b/logos_delivery/waku/waku_lightpush/callbacks.nim
@@ -7,8 +7,8 @@ import
   ../waku_core,
   ../waku_relay,
   ./common,
-  ../waku_rln_relay,
-  ../waku_rln_relay/protocol_types
+  ../waku_rln,
+  ../waku_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 af31ecf7d..00ea25825 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_relay,
-  ../waku_rln_relay/protocol_types
+  ../waku_rln,
+  ../waku_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
new file mode 100644
index 000000000..a24441271
--- /dev/null
+++ b/logos_delivery/waku/waku_rln.nim
@@ -0,0 +1,7 @@
+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/logos_delivery/waku/waku_rln_relay/adapters/relay.nim b/logos_delivery/waku/waku_rln/adapters/relay.nim
similarity index 96%
rename from logos_delivery/waku/waku_rln_relay/adapters/relay.nim
rename to logos_delivery/waku/waku_rln/adapters/relay.nim
index 206839aab..7ca38d893 100644
--- a/logos_delivery/waku/waku_rln_relay/adapters/relay.nim
+++ b/logos_delivery/waku/waku_rln/adapters/relay.nim
@@ -8,7 +8,7 @@ import
   stew/byteutils,
   libp2p/protocols/pubsub/pubsub
 
-import ../rln_relay, ../protocol_types, ../protocol_metrics, ../conversion_utils
+import ../rln, ../protocol_types, ../protocol_metrics, ../conversion_utils
 
 import logos_delivery/waku/[waku_relay, waku_core]
 
diff --git a/logos_delivery/waku/waku_rln_relay/bindings.nim b/logos_delivery/waku/waku_rln/bindings.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/bindings.nim
rename to logos_delivery/waku/waku_rln/bindings.nim
diff --git a/logos_delivery/waku/waku_rln_relay/config.nim b/logos_delivery/waku/waku_rln/config.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/config.nim
rename to logos_delivery/waku/waku_rln/config.nim
diff --git a/logos_delivery/waku/waku_rln_relay/constants.nim b/logos_delivery/waku/waku_rln/constants.nim
similarity index 98%
rename from logos_delivery/waku/waku_rln_relay/constants.nim
rename to logos_delivery/waku/waku_rln/constants.nim
index 7ede78d43..22454b22b 100644
--- a/logos_delivery/waku/waku_rln_relay/constants.nim
+++ b/logos_delivery/waku/waku_rln/constants.nim
@@ -23,7 +23,7 @@ const PathCheckMinInterval* = 30.seconds
 const RlnCredentialsFilename* = "rlnCredentials.txt"
 
 # inputs of the membership contract constructor
-# TODO may be able to make these constants private and put them inside the waku_rln_relay_utils
+# TODO may be able to make these constants private and put them inside the waku_rln_utils
 const
   # in wei
   MembershipFee* = 0.u256
diff --git a/logos_delivery/waku/waku_rln_relay/contract.nim b/logos_delivery/waku/waku_rln/contract.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/contract.nim
rename to logos_delivery/waku/waku_rln/contract.nim
diff --git a/logos_delivery/waku/waku_rln_relay/conversion_utils.nim b/logos_delivery/waku/waku_rln/conversion_utils.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/conversion_utils.nim
rename to logos_delivery/waku/waku_rln/conversion_utils.nim
diff --git a/logos_delivery/waku/waku_rln_relay/group_manager.nim b/logos_delivery/waku/waku_rln/group_manager.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/group_manager.nim
rename to logos_delivery/waku/waku_rln/group_manager.nim
diff --git a/logos_delivery/waku/waku_rln_relay/group_manager/group_manager_base.nim b/logos_delivery/waku/waku_rln/group_manager/group_manager_base.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/group_manager/group_manager_base.nim
rename to logos_delivery/waku/waku_rln/group_manager/group_manager_base.nim
diff --git a/logos_delivery/waku/waku_rln_relay/group_manager/on_chain.nim b/logos_delivery/waku/waku_rln/group_manager/on_chain.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/group_manager/on_chain.nim
rename to logos_delivery/waku/waku_rln/group_manager/on_chain.nim
diff --git a/logos_delivery/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim b/logos_delivery/waku/waku_rln/group_manager/on_chain/group_manager.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim
rename to logos_delivery/waku/waku_rln/group_manager/on_chain/group_manager.nim
diff --git a/logos_delivery/waku/waku_rln_relay/group_manager/on_chain/retry_wrapper.nim b/logos_delivery/waku/waku_rln/group_manager/on_chain/retry_wrapper.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/group_manager/on_chain/retry_wrapper.nim
rename to logos_delivery/waku/waku_rln/group_manager/on_chain/retry_wrapper.nim
diff --git a/logos_delivery/waku/waku_rln_relay/group_manager/on_chain/rpc_wrapper.nim b/logos_delivery/waku/waku_rln/group_manager/on_chain/rpc_wrapper.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/group_manager/on_chain/rpc_wrapper.nim
rename to logos_delivery/waku/waku_rln/group_manager/on_chain/rpc_wrapper.nim
diff --git a/logos_delivery/waku/waku_rln_relay/nonce_manager.nim b/logos_delivery/waku/waku_rln/nonce_manager.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/nonce_manager.nim
rename to logos_delivery/waku/waku_rln/nonce_manager.nim
diff --git a/logos_delivery/waku/waku_rln_relay/nullifier_log.nim b/logos_delivery/waku/waku_rln/nullifier_log.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/nullifier_log.nim
rename to logos_delivery/waku/waku_rln/nullifier_log.nim
diff --git a/logos_delivery/waku/waku_rln_relay/proof.nim b/logos_delivery/waku/waku_rln/proof.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/proof.nim
rename to logos_delivery/waku/waku_rln/proof.nim
diff --git a/logos_delivery/waku/waku_rln_relay/protocol_metrics.nim b/logos_delivery/waku/waku_rln/protocol_metrics.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/protocol_metrics.nim
rename to logos_delivery/waku/waku_rln/protocol_metrics.nim
diff --git a/logos_delivery/waku/waku_rln_relay/protocol_types.nim b/logos_delivery/waku/waku_rln/protocol_types.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/protocol_types.nim
rename to logos_delivery/waku/waku_rln/protocol_types.nim
diff --git a/logos_delivery/waku/waku_rln_relay/rln_relay.nim b/logos_delivery/waku/waku_rln/rln.nim
similarity index 97%
rename from logos_delivery/waku/waku_rln_relay/rln_relay.nim
rename to logos_delivery/waku/waku_rln/rln.nim
index d646554b8..f805ae752 100644
--- a/logos_delivery/waku/waku_rln_relay/rln_relay.nim
+++ b/logos_delivery/waku/waku_rln/rln.nim
@@ -33,9 +33,9 @@ import
   logos_delivery/waku/
     [common/error_handling, waku_core, requests/rln_requests, waku_keystore]
 
-# Re-export the new submodules so existing `import waku_rln_relay`
-# (and `import waku_rln_relay/rln_relay`) callers continue to see the
-# moved symbols (WakuRLNRelay, WakuRlnConfig, generateRLNProof, etc.).
+# Re-export the submodules so existing `import waku_rln`
+# (and `import waku_rln/rln`) callers see the moved symbols
+# (WakuRLNRelay, WakuRlnConfig, generateRLNProof, etc.).
 export types, config, proof, nullifier_log
 
 logScope:
diff --git a/logos_delivery/waku/waku_rln_relay/rln/rln_interface.nim b/logos_delivery/waku/waku_rln/rln/rln_interface.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/rln/rln_interface.nim
rename to logos_delivery/waku/waku_rln/rln/rln_interface.nim
diff --git a/logos_delivery/waku/waku_rln_relay/rln/wrappers.nim b/logos_delivery/waku/waku_rln/rln/wrappers.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/rln/wrappers.nim
rename to logos_delivery/waku/waku_rln/rln/wrappers.nim
diff --git a/logos_delivery/waku/waku_rln_relay/types.nim b/logos_delivery/waku/waku_rln/types.nim
similarity index 100%
rename from logos_delivery/waku/waku_rln_relay/types.nim
rename to logos_delivery/waku/waku_rln/types.nim
diff --git a/logos_delivery/waku/waku_rln_relay.nim b/logos_delivery/waku/waku_rln_relay.nim
deleted file mode 100644
index ce79f98d8..000000000
--- a/logos_delivery/waku/waku_rln_relay.nim
+++ /dev/null
@@ -1,7 +0,0 @@
-import
-  ./waku_rln_relay/group_manager,
-  ./waku_rln_relay/conversion_utils,
-  ./waku_rln_relay/rln_relay,
-  ./waku_rln_relay/contract
-
-export group_manager, conversion_utils, rln_relay, contract
diff --git a/tests/node/test_wakunode_legacy_lightpush.nim b/tests/node/test_wakunode_legacy_lightpush.nim
index 4dfe21e9c..d335270b2 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_relay,
+    waku_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 df6c7f8e0..74574fe07 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_relay],
+    [waku_core, node/peer_manager, waku_node, waku_lightpush, waku_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 c86813fe6..f2200366a 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_relay,
-    waku_rln_relay/bindings,
-    waku_rln_relay/protocol_types,
+    waku_rln,
+    waku_rln/bindings,
+    waku_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 9d86df9bb..f63ba0266 100644
--- a/tests/waku_keystore/utils.nim
+++ b/tests/waku_keystore/utils.nim
@@ -5,7 +5,7 @@ import stint
 
 import
   logos_delivery/waku/
-    [waku_keystore/protocol_types, waku_rln_relay, waku_rln_relay/protocol_types]
+    [waku_keystore/protocol_types, waku_rln, waku_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 0391d47bc..293df8f63 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_relay
+    waku_relay, node/waku_node, node/peer_manager, waku_core, waku_node, waku_rln
   ],
   ../waku_store/store_utils,
   ../waku_archive/archive_utils,
diff --git a/tests/waku_rln_relay/rln/test_rln_interface.nim b/tests/waku_rln_relay/rln/test_rln_interface.nim
index 5ace0c8bb..7d5ff53cf 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_relay/rln/rln_interface
-import logos_delivery/waku/waku_rln_relay/rln/wrappers
+import logos_delivery/waku/waku_rln/rln/rln_interface
+import logos_delivery/waku/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 6e5dd78ac..2939f361f 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_relay/bindings,
-  logos_delivery/waku/waku_rln_relay/rln/wrappers,
+  logos_delivery/waku/waku_rln/bindings,
+  logos_delivery/waku/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 5f30c1b2f..0679be70e 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_relay,
-  logos_delivery/waku/waku_rln_relay/[
+  logos_delivery/waku/waku_rln,
+  logos_delivery/waku/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 f903a2382..393ea14e7 100644
--- a/tests/waku_rln_relay/test_rln_contract_deployment.nim
+++ b/tests/waku_rln_relay/test_rln_contract_deployment.nim
@@ -6,9 +6,9 @@ import std/[options, os], results, testutils/unittests, chronos, web3
 
 import
   logos_delivery/waku/[
-    waku_rln_relay,
-    waku_rln_relay/conversion_utils,
-    waku_rln_relay/group_manager/on_chain/group_manager,
+    waku_rln,
+    waku_rln/conversion_utils,
+    waku_rln/group_manager/on_chain/group_manager,
   ],
   ./utils_onchain
 
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 cf516a0af..a58eac666 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_relay,
-    waku_rln_relay/protocol_types,
-    waku_rln_relay/protocol_metrics,
-    waku_rln_relay/constants,
-    waku_rln_relay/bindings,
-    waku_rln_relay/conversion_utils,
-    waku_rln_relay/group_manager/on_chain/group_manager,
+    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,
   ],
   ../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 fb24f0e29..da846aaf5 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_relay/nonce_manager
+import logos_delivery/waku/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 27142f11f..36fae420d 100644
--- a/tests/waku_rln_relay/test_waku_rln_relay.nim
+++ b/tests/waku_rln_relay/test_waku_rln_relay.nim
@@ -14,9 +14,9 @@ import brokers/broker_context
 import
   logos_delivery/waku/[
     waku_core,
-    waku_rln_relay,
-    waku_rln_relay/bindings,
-    waku_rln_relay/protocol_metrics,
+    waku_rln,
+    waku_rln/bindings,
+    waku_rln/protocol_metrics,
     waku_keystore,
   ],
   ./rln/waku_rln_relay_utils,
diff --git a/tests/waku_rln_relay/test_wakunode_rln_relay.nim b/tests/waku_rln_relay/test_wakunode_rln_relay.nim
index 0056e575e..b0a001d5a 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_relay],
+  logos_delivery/waku/[waku_core, waku_node, waku_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 593f31c3f..7f61df621 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_relay],
+    [node/waku_node, node/peer_manager, waku_core, waku_node, waku_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 e8587e4a9..d17277422 100644
--- a/tests/waku_rln_relay/utils_onchain.nim
+++ b/tests/waku_rln_relay/utils_onchain.nim
@@ -21,10 +21,10 @@ import
 
 import
   logos_delivery/waku/[
-    waku_rln_relay,
-    waku_rln_relay/protocol_types,
-    waku_rln_relay/constants,
-    waku_rln_relay/bindings,
+    waku_rln,
+    waku_rln/protocol_types,
+    waku_rln/constants,
+    waku_rln/bindings,
   ],
   ../testlib/common
 
diff --git a/tests/wakunode_rest/test_rest_health.nim b/tests/wakunode_rest/test_rest_health.nim
index f2d94f6e5..ae2c861b6 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_relay,
+    waku_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 e90ccb31d..e3a56a839 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_relay,
+    waku_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 ad45b7eaa..64d76946f 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_relay/bindings,
-    waku_rln_relay/conversion_utils,
-    waku_rln_relay/group_manager/on_chain,
+    waku_rln/bindings,
+    waku_rln/conversion_utils,
+    waku_rln/group_manager/on_chain,
   ]
 
 logScope: