diff --git a/src/Makefile.am b/src/Makefile.am
index 09f468717160..fc58612e81ed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -192,18 +192,19 @@ BITCOIN_CORE_H = \
   dbwrapper.h \
   limitedmap.h \
   llmq/quorums.h \
-  llmq/quorums_blockprocessor.h \
-  llmq/quorums_commitment.h \
-  llmq/quorums_chainlocks.h \
-  llmq/quorums_debug.h \
-  llmq/quorums_dkgsessionhandler.h \
-  llmq/quorums_dkgsessionmgr.h \
-  llmq/quorums_dkgsession.h \
-  llmq/quorums_init.h \
-  llmq/quorums_instantsend.h \
-  llmq/quorums_signing.h \
-  llmq/quorums_signing_shares.h \
-  llmq/quorums_utils.h \
+  llmq/blockprocessor.h \
+  llmq/commitment.h \
+  llmq/chainlocks.h \
+  llmq/debug.h \
+  llmq/dkgsessionhandler.h \
+  llmq/dkgsessionmgr.h \
+  llmq/dkgsession.h \
+  llmq/init.h \
+  llmq/instantsend.h \
+  llmq/signing.h \
+  llmq/signing_shares.h \
+  llmq/utils.h \
+  llmq/params.h \
   logging.h \
   logging/timer.h \
   masternode/node.h \
@@ -357,18 +358,18 @@ libdash_server_a_SOURCES = \
   governance/vote.cpp \
   governance/votedb.cpp \
   llmq/quorums.cpp \
-  llmq/quorums_blockprocessor.cpp \
-  llmq/quorums_commitment.cpp \
-  llmq/quorums_chainlocks.cpp \
-  llmq/quorums_debug.cpp \
-  llmq/quorums_dkgsessionhandler.cpp \
-  llmq/quorums_dkgsessionmgr.cpp \
-  llmq/quorums_dkgsession.cpp \
-  llmq/quorums_init.cpp \
-  llmq/quorums_instantsend.cpp \
-  llmq/quorums_signing.cpp \
-  llmq/quorums_signing_shares.cpp \
-  llmq/quorums_utils.cpp \
+  llmq/blockprocessor.cpp \
+  llmq/commitment.cpp \
+  llmq/chainlocks.cpp \
+  llmq/debug.cpp \
+  llmq/dkgsessionhandler.cpp \
+  llmq/dkgsessionmgr.cpp \
+  llmq/dkgsession.cpp \
+  llmq/init.cpp \
+  llmq/instantsend.cpp \
+  llmq/signing.cpp \
+  llmq/signing_shares.cpp \
+  llmq/utils.cpp \
   masternode/node.cpp \
   masternode/meta.cpp \
   masternode/payments.cpp \
@@ -592,6 +593,7 @@ libdash_common_a_SOURCES = \
   key.cpp \
   key_io.cpp \
   keystore.cpp \
+  llmq/params.cpp \
   netaddress.cpp \
   netbase.cpp \
   net_permissions.cpp \
diff --git a/src/bloom.cpp b/src/bloom.cpp
index 3890962352dd..224183317b4d 100644
--- a/src/bloom.cpp
+++ b/src/bloom.cpp
@@ -8,7 +8,7 @@
 #include <evo/specialtx.h>
 #include <evo/providertx.h>
 #include <evo/cbtx.h>
-#include <llmq/quorums_commitment.h>
+#include <llmq/commitment.h>
 #include <hash.h>
 #include <script/script.h>
 #include <script/standard.h>
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 625bdba185d9..d3597a7bd176 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -8,6 +8,7 @@
 
 #include <chainparamsseeds.h>
 #include <consensus/merkle.h>
+#include <llmq/params.h>
 #include <tinyformat.h>
 #include <util/system.h>
 #include <util/strencodings.h>
@@ -107,145 +108,6 @@ static CBlock FindDevNetGenesisBlock(const CBlock &prevBlock, const CAmount& rew
     assert(false);
 }
 
-// this one is for testing only
-static Consensus::LLMQParams llmq_test = {
-        .type = Consensus::LLMQ_TEST,
-        .name = "llmq_test",
-        .size = 3,
-        .minSize = 2,
-        .threshold = 2,
-
-        .dkgInterval = 24, // one DKG per hour
-        .dkgPhaseBlocks = 2,
-        .dkgMiningWindowStart = 10, // dkgPhaseBlocks * 5 = after finalization
-        .dkgMiningWindowEnd = 18,
-        .dkgBadVotesThreshold = 2,
-
-        .signingActiveQuorumCount = 2, // just a few ones to allow easier testing
-
-        .keepOldConnections = 3,
-        .recoveryMembers = 3,
-};
-
-// this one is for testing only
-static Consensus::LLMQParams llmq_test_v17 = {
-        .type = Consensus::LLMQ_TEST_V17,
-        .name = "llmq_test_v17",
-        .size = 3,
-        .minSize = 2,
-        .threshold = 2,
-
-        .dkgInterval = 24, // one DKG per hour
-        .dkgPhaseBlocks = 2,
-        .dkgMiningWindowStart = 10, // dkgPhaseBlocks * 5 = after finalization
-        .dkgMiningWindowEnd = 18,
-        .dkgBadVotesThreshold = 2,
-
-        .signingActiveQuorumCount = 2, // just a few ones to allow easier testing
-
-        .keepOldConnections = 3,
-        .recoveryMembers = 3,
-};
-
-// this one is for devnets only
-static Consensus::LLMQParams llmq_devnet = {
-        .type = Consensus::LLMQ_DEVNET,
-        .name = "llmq_devnet",
-        .size = 10,
-        .minSize = 7,
-        .threshold = 6,
-
-        .dkgInterval = 24, // one DKG per hour
-        .dkgPhaseBlocks = 2,
-        .dkgMiningWindowStart = 10, // dkgPhaseBlocks * 5 = after finalization
-        .dkgMiningWindowEnd = 18,
-        .dkgBadVotesThreshold = 7,
-
-        .signingActiveQuorumCount = 3, // just a few ones to allow easier testing
-
-        .keepOldConnections = 4,
-        .recoveryMembers = 6,
-};
-
-static Consensus::LLMQParams llmq50_60 = {
-        .type = Consensus::LLMQ_50_60,
-        .name = "llmq_50_60",
-        .size = 50,
-        .minSize = 40,
-        .threshold = 30,
-
-        .dkgInterval = 24, // one DKG per hour
-        .dkgPhaseBlocks = 2,
-        .dkgMiningWindowStart = 10, // dkgPhaseBlocks * 5 = after finalization
-        .dkgMiningWindowEnd = 18,
-        .dkgBadVotesThreshold = 40,
-
-        .signingActiveQuorumCount = 24, // a full day worth of LLMQs
-
-        .keepOldConnections = 25,
-        .recoveryMembers = 25,
-};
-
-static Consensus::LLMQParams llmq400_60 = {
-        .type = Consensus::LLMQ_400_60,
-        .name = "llmq_400_60",
-        .size = 400,
-        .minSize = 300,
-        .threshold = 240,
-
-        .dkgInterval = 24 * 12, // one DKG every 12 hours
-        .dkgPhaseBlocks = 4,
-        .dkgMiningWindowStart = 20, // dkgPhaseBlocks * 5 = after finalization
-        .dkgMiningWindowEnd = 28,
-        .dkgBadVotesThreshold = 300,
-
-        .signingActiveQuorumCount = 4, // two days worth of LLMQs
-
-        .keepOldConnections = 5,
-        .recoveryMembers = 100,
-};
-
-// Used for deployment and min-proto-version signalling, so it needs a higher threshold
-static Consensus::LLMQParams llmq400_85 = {
-        .type = Consensus::LLMQ_400_85,
-        .name = "llmq_400_85",
-        .size = 400,
-        .minSize = 350,
-        .threshold = 340,
-
-        .dkgInterval = 24 * 24, // one DKG every 24 hours
-        .dkgPhaseBlocks = 4,
-        .dkgMiningWindowStart = 20, // dkgPhaseBlocks * 5 = after finalization
-        .dkgMiningWindowEnd = 48, // give it a larger mining window to make sure it is mined
-        .dkgBadVotesThreshold = 300,
-
-        .signingActiveQuorumCount = 4, // four days worth of LLMQs
-
-        .keepOldConnections = 5,
-        .recoveryMembers = 100,
-};
-
-// Used for Platform
-static Consensus::LLMQParams llmq100_67 = {
-        .type = Consensus::LLMQ_100_67,
-        .name = "llmq_100_67",
-        .size = 100,
-        .minSize = 80,
-        .threshold = 67,
-
-        .dkgInterval = 24, // one DKG per hour
-        .dkgPhaseBlocks = 2,
-        .dkgMiningWindowStart = 10, // dkgPhaseBlocks * 5 = after finalization
-        .dkgMiningWindowEnd = 18,
-        .dkgBadVotesThreshold = 80,
-
-        .signingActiveQuorumCount = 24, // a full day worth of LLMQs
-
-        .keepOldConnections = 25,
-        .recoveryMembers = 50,
-};
-
-
 /**
  * Main network
  */
diff --git a/src/coinjoin/coinjoin.cpp b/src/coinjoin/coinjoin.cpp
index e1735bfe78e2..ccf2b6336f8a 100644
--- a/src/coinjoin/coinjoin.cpp
+++ b/src/coinjoin/coinjoin.cpp
@@ -17,8 +17,8 @@
 #include <masternode/node.h>
 #include <masternode/sync.h>
 
-#include <llmq/quorums_instantsend.h>
-#include <llmq/quorums_chainlocks.h>
+#include <llmq/instantsend.h>
+#include <llmq/chainlocks.h>
 
 #include <string>
 
diff --git a/src/core_write.cpp b/src/core_write.cpp
index 2221ffab3f75..091d60df5373 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -22,7 +22,7 @@
 #include <evo/cbtx.h>
 #include <evo/providertx.h>
 #include <evo/specialtx.h>
-#include <llmq/quorums_commitment.h>
+#include <llmq/commitment.h>
 
 UniValue ValueFromAmount(const CAmount& amount)
 {
diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
index 68203edd17c1..159beac8605b 100644
--- a/src/dsnotificationinterface.cpp
+++ b/src/dsnotificationinterface.cpp
@@ -16,9 +16,9 @@
 #include <evo/mnauth.h>
 
 #include <llmq/quorums.h>
-#include <llmq/quorums_chainlocks.h>
-#include <llmq/quorums_instantsend.h>
-#include <llmq/quorums_dkgsessionmgr.h>
+#include <llmq/chainlocks.h>
+#include <llmq/instantsend.h>
+#include <llmq/dkgsessionmgr.h>
 
 void CDSNotificationInterface::InitializeCurrentBlockTip()
 {
diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
index 2e9dcf2e9215..e001f4d2b53e 100644
--- a/src/evo/cbtx.cpp
+++ b/src/evo/cbtx.cpp
@@ -4,8 +4,8 @@
 
 #include <evo/cbtx.h>
 #include <evo/deterministicmns.h>
-#include <llmq/quorums_blockprocessor.h>
-#include <llmq/quorums_commitment.h>
+#include <llmq/blockprocessor.h>
+#include <llmq/commitment.h>
 #include <evo/simplifiedmns.h>
 #include <evo/specialtx.h>
 #include <consensus/validation.h>
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 0cbb02e50d22..8a5de8fb9485 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -5,8 +5,8 @@
 #include <evo/deterministicmns.h>
 #include <evo/specialtx.h>
 #include <evo/simplifiedmns.h>
-#include <llmq/quorums_commitment.h>
-#include <llmq/quorums_utils.h>
+#include <llmq/commitment.h>
+#include <llmq/utils.h>
 
 #include <base58.h>
 #include <chainparams.h>
diff --git a/src/evo/mnauth.cpp b/src/evo/mnauth.cpp
index 7e8a9e93f3d6..62924c0a161e 100644
--- a/src/evo/mnauth.cpp
+++ b/src/evo/mnauth.cpp
@@ -5,7 +5,7 @@
 #include <evo/mnauth.h>
 
 #include <evo/deterministicmns.h>
-#include <llmq/quorums_utils.h>
+#include <llmq/utils.h>
 #include <masternode/node.h>
 #include <masternode/meta.h>
 #include <masternode/sync.h>
diff --git a/src/evo/simplifiedmns.cpp b/src/evo/simplifiedmns.cpp
index 3606248bc2ed..fa6ffc946fbe 100644
--- a/src/evo/simplifiedmns.cpp
+++ b/src/evo/simplifiedmns.cpp
@@ -5,8 +5,8 @@
 #include <evo/cbtx.h>
 #include <core_io.h>
 #include <evo/deterministicmns.h>
-#include <llmq/quorums_blockprocessor.h>
-#include <llmq/quorums_commitment.h>
+#include <llmq/blockprocessor.h>
+#include <llmq/commitment.h>
 #include <evo/simplifiedmns.h>
 #include <evo/specialtx.h>
 
diff --git a/src/evo/specialtx.cpp b/src/evo/specialtx.cpp
index a2624f177fc2..987cf69ccb2d 100644
--- a/src/evo/specialtx.cpp
+++ b/src/evo/specialtx.cpp
@@ -12,8 +12,8 @@
 #include <evo/deterministicmns.h>
 #include <evo/specialtx.h>
 
-#include <llmq/quorums_commitment.h>
-#include <llmq/quorums_blockprocessor.h>
+#include <llmq/commitment.h>
+#include <llmq/blockprocessor.h>
 
 bool CheckSpecialTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state, const CCoinsViewCache& view)
 {
diff --git a/src/init.cpp b/src/init.cpp
index 52256c7c1595..1d6c08459eb8 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -73,10 +73,10 @@
 
 #include <evo/deterministicmns.h>
 #include <llmq/quorums.h>
-#include <llmq/quorums_init.h>
-#include <llmq/quorums_blockprocessor.h>
-#include <llmq/quorums_signing.h>
-#include <llmq/quorums_utils.h>
+#include <llmq/init.h>
+#include <llmq/blockprocessor.h>
+#include <llmq/signing.h>
+#include <llmq/utils.h>
 
 #include <statsd_client.h>
 
diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp
index b7e04a213d4b..96575e42f2d0 100644
--- a/src/interfaces/node.cpp
+++ b/src/interfaces/node.cpp
@@ -14,7 +14,7 @@
 #include <init.h>
 #include <interfaces/handler.h>
 #include <interfaces/wallet.h>
-#include <llmq/quorums_instantsend.h>
+#include <llmq/instantsend.h>
 #include <masternode/sync.h>
 #include <net.h>
 #include <net_processing.h>
diff --git a/src/llmq/quorums_blockprocessor.cpp b/src/llmq/blockprocessor.cpp
similarity index 99%
rename from src/llmq/quorums_blockprocessor.cpp
rename to src/llmq/blockprocessor.cpp
index 1de2973410e9..c703e2918906 100644
--- a/src/llmq/quorums_blockprocessor.cpp
+++ b/src/llmq/blockprocessor.cpp
@@ -2,9 +2,9 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <llmq/quorums_blockprocessor.h>
-#include <llmq/quorums_commitment.h>
-#include <llmq/quorums_debug.h>
+#include <llmq/blockprocessor.h>
+#include <llmq/commitment.h>
+#include <llmq/debug.h>
 
 #include <evo/evodb.h>
 #include <evo/specialtx.h>
diff --git a/src/llmq/quorums_blockprocessor.h b/src/llmq/blockprocessor.h
similarity index 95%
rename from src/llmq/quorums_blockprocessor.h
rename to src/llmq/blockprocessor.h
index cccd38c48753..cc2a05fb28ed 100644
--- a/src/llmq/quorums_blockprocessor.h
+++ b/src/llmq/blockprocessor.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_LLMQ_QUORUMS_BLOCKPROCESSOR_H
-#define BITCOIN_LLMQ_QUORUMS_BLOCKPROCESSOR_H
+#ifndef BITCOIN_LLMQ_BLOCKPROCESSOR_H
+#define BITCOIN_LLMQ_BLOCKPROCESSOR_H
 
 #include <unordered_lru_cache.h>
 
@@ -75,4 +75,4 @@ extern CQuorumBlockProcessor* quorumBlockProcessor;
 
 } // namespace llmq
 
-#endif // BITCOIN_LLMQ_QUORUMS_BLOCKPROCESSOR_H
+#endif // BITCOIN_LLMQ_BLOCKPROCESSOR_H
diff --git a/src/llmq/quorums_chainlocks.cpp b/src/llmq/chainlocks.cpp
similarity index 99%
rename from src/llmq/quorums_chainlocks.cpp
rename to src/llmq/chainlocks.cpp
index 1db0e84383da..14a6acffd4e0 100644
--- a/src/llmq/quorums_chainlocks.cpp
+++ b/src/llmq/chainlocks.cpp
@@ -2,10 +2,10 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <llmq/quorums_chainlocks.h>
+#include <llmq/chainlocks.h>
 #include <llmq/quorums.h>
-#include <llmq/quorums_instantsend.h>
-#include <llmq/quorums_utils.h>
+#include <llmq/instantsend.h>
+#include <llmq/utils.h>
 
 #include <chain.h>
 #include <consensus/validation.h>
diff --git a/src/llmq/quorums_chainlocks.h b/src/llmq/chainlocks.h
similarity index 96%
rename from src/llmq/quorums_chainlocks.h
rename to src/llmq/chainlocks.h
index 4f3e61fff374..9dc37f71d876 100644
--- a/src/llmq/quorums_chainlocks.h
+++ b/src/llmq/chainlocks.h
@@ -2,11 +2,11 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_LLMQ_QUORUMS_CHAINLOCKS_H
-#define BITCOIN_LLMQ_QUORUMS_CHAINLOCKS_H
+#ifndef BITCOIN_LLMQ_CHAINLOCKS_H
+#define BITCOIN_LLMQ_CHAINLOCKS_H
 
 #include <bls/bls.h>
-#include <llmq/quorums_signing.h>
+#include <llmq/signing.h>
 
 #include <chainparams.h>
 #include <net.h>
@@ -122,4 +122,4 @@ bool AreChainLocksEnabled();
 
 } // namespace llmq
 
-#endif // BITCOIN_LLMQ_QUORUMS_CHAINLOCKS_H
+#endif // BITCOIN_LLMQ_CHAINLOCKS_H
diff --git a/src/llmq/quorums_commitment.cpp b/src/llmq/commitment.cpp
similarity index 99%
rename from src/llmq/quorums_commitment.cpp
rename to src/llmq/commitment.cpp
index 3b1005c3eb51..54edebc62c24 100644
--- a/src/llmq/quorums_commitment.cpp
+++ b/src/llmq/commitment.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <llmq/quorums_commitment.h>
+#include <llmq/commitment.h>
 
 #include <evo/deterministicmns.h>
 #include <evo/specialtx.h>
diff --git a/src/llmq/quorums_commitment.h b/src/llmq/commitment.h
similarity index 96%
rename from src/llmq/quorums_commitment.h
rename to src/llmq/commitment.h
index 56dfb4f79777..242ca29c3b2e 100644
--- a/src/llmq/quorums_commitment.h
+++ b/src/llmq/commitment.h
@@ -2,10 +2,10 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_LLMQ_QUORUMS_COMMITMENT_H
-#define BITCOIN_LLMQ_QUORUMS_COMMITMENT_H
+#ifndef BITCOIN_LLMQ_COMMITMENT_H
+#define BITCOIN_LLMQ_COMMITMENT_H
 
-#include <llmq/quorums_utils.h>
+#include <llmq/utils.h>
 #include <bls/bls.h>
 
 #include <univalue.h>
@@ -135,4 +135,4 @@ bool CheckLLMQCommitment(const CTransaction& tx, const CBlockIndex* pindexPrev,
 
 } // namespace llmq
 
-#endif // BITCOIN_LLMQ_QUORUMS_COMMITMENT_H
+#endif // BITCOIN_LLMQ_COMMITMENT_H
diff --git a/src/llmq/quorums_debug.cpp b/src/llmq/debug.cpp
similarity index 98%
rename from src/llmq/quorums_debug.cpp
rename to src/llmq/debug.cpp
index 0073737c9128..92db5bba1d27 100644
--- a/src/llmq/quorums_debug.cpp
+++ b/src/llmq/debug.cpp
@@ -2,14 +2,14 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <llmq/quorums_debug.h>
+#include <llmq/debug.h>
 
 #include <chainparams.h>
 #include <timedata.h>
 #include <validation.h>
 
 #include <evo/deterministicmns.h>
-#include <llmq/quorums_utils.h>
+#include <llmq/utils.h>
 
 namespace llmq
 {
diff --git a/src/llmq/quorums_debug.h b/src/llmq/debug.h
similarity index 95%
rename from src/llmq/quorums_debug.h
rename to src/llmq/debug.h
index ff91cb2603a0..da760b401606 100644
--- a/src/llmq/quorums_debug.h
+++ b/src/llmq/debug.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_LLMQ_QUORUMS_DEBUG_H
-#define BITCOIN_LLMQ_QUORUMS_DEBUG_H
+#ifndef BITCOIN_LLMQ_DEBUG_H
+#define BITCOIN_LLMQ_DEBUG_H
 
 #include <consensus/params.h>
 #include <sync.h>
@@ -108,4 +108,4 @@ extern CDKGDebugManager* quorumDKGDebugManager;
 
 } // namespace llmq
 
-#endif // BITCOIN_LLMQ_QUORUMS_DEBUG_H
+#endif // BITCOIN_LLMQ_DEBUG_H
diff --git a/src/llmq/quorums_dkgsession.cpp b/src/llmq/dkgsession.cpp
similarity index 99%
rename from src/llmq/quorums_dkgsession.cpp
rename to src/llmq/dkgsession.cpp
index 2bceec7dddbc..24e382388f54 100644
--- a/src/llmq/quorums_dkgsession.cpp
+++ b/src/llmq/dkgsession.cpp
@@ -2,11 +2,11 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <llmq/quorums_dkgsession.h>
+#include <llmq/dkgsession.h>
 
-#include <llmq/quorums_commitment.h>
-#include <llmq/quorums_debug.h>
-#include <llmq/quorums_dkgsessionmgr.h>
+#include <llmq/commitment.h>
+#include <llmq/debug.h>
+#include <llmq/dkgsessionmgr.h>
 
 #include <evo/deterministicmns.h>
 #include <evo/specialtx.h>
diff --git a/src/llmq/quorums_dkgsession.h b/src/llmq/dkgsession.h
similarity index 98%
rename from src/llmq/quorums_dkgsession.h
rename to src/llmq/dkgsession.h
index 96a9e79d2c12..8e4373fc8b2d 100644
--- a/src/llmq/quorums_dkgsession.h
+++ b/src/llmq/dkgsession.h
@@ -2,15 +2,15 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_LLMQ_QUORUMS_DKGSESSION_H
-#define BITCOIN_LLMQ_QUORUMS_DKGSESSION_H
+#ifndef BITCOIN_LLMQ_DKGSESSION_H
+#define BITCOIN_LLMQ_DKGSESSION_H
 
 #include <batchedlogger.h>
 
 #include <bls/bls_ies.h>
 #include <bls/bls_worker.h>
 
-#include <llmq/quorums_utils.h>
+#include <llmq/utils.h>
 
 class UniValue;
 
@@ -338,4 +338,4 @@ void SetSimulatedDKGErrorRate(const std::string& type, double rate);
 
 } // namespace llmq
 
-#endif // BITCOIN_LLMQ_QUORUMS_DKGSESSION_H
+#endif // BITCOIN_LLMQ_DKGSESSION_H
diff --git a/src/llmq/quorums_dkgsessionhandler.cpp b/src/llmq/dkgsessionhandler.cpp
similarity index 99%
rename from src/llmq/quorums_dkgsessionhandler.cpp
rename to src/llmq/dkgsessionhandler.cpp
index 7e6cdf687930..a5e66d91829b 100644
--- a/src/llmq/quorums_dkgsessionhandler.cpp
+++ b/src/llmq/dkgsessionhandler.cpp
@@ -2,13 +2,13 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <llmq/quorums_dkgsessionhandler.h>
+#include <llmq/dkgsessionhandler.h>
 
-#include <llmq/quorums_commitment.h>
-#include <llmq/quorums_dkgsession.h>
-#include <llmq/quorums_blockprocessor.h>
-#include <llmq/quorums_debug.h>
-#include <llmq/quorums_utils.h>
+#include <llmq/commitment.h>
+#include <llmq/dkgsession.h>
+#include <llmq/blockprocessor.h>
+#include <llmq/debug.h>
+#include <llmq/utils.h>
 
 #include <evo/deterministicmns.h>
 
diff --git a/src/llmq/quorums_dkgsessionhandler.h b/src/llmq/dkgsessionhandler.h
similarity index 97%
rename from src/llmq/quorums_dkgsessionhandler.h
rename to src/llmq/dkgsessionhandler.h
index 8316870bda87..611f5027ae88 100644
--- a/src/llmq/quorums_dkgsessionhandler.h
+++ b/src/llmq/dkgsessionhandler.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_LLMQ_QUORUMS_DKGSESSIONHANDLER_H
-#define BITCOIN_LLMQ_QUORUMS_DKGSESSIONHANDLER_H
+#ifndef BITCOIN_LLMQ_DKGSESSIONHANDLER_H
+#define BITCOIN_LLMQ_DKGSESSIONHANDLER_H
 
 
 #include <ctpl_stl.h>
@@ -150,4 +150,4 @@ class CDKGSessionHandler
 
 } // namespace llmq
 
-#endif // BITCOIN_LLMQ_QUORUMS_DKGSESSIONHANDLER_H
+#endif // BITCOIN_LLMQ_DKGSESSIONHANDLER_H
diff --git a/src/llmq/quorums_dkgsessionmgr.cpp b/src/llmq/dkgsessionmgr.cpp
similarity index 99%
rename from src/llmq/quorums_dkgsessionmgr.cpp
rename to src/llmq/dkgsessionmgr.cpp
index 1de7ff61a877..d291acf8d57b 100644
--- a/src/llmq/quorums_dkgsessionmgr.cpp
+++ b/src/llmq/dkgsessionmgr.cpp
@@ -2,9 +2,9 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <llmq/quorums_dkgsessionmgr.h>
-#include <llmq/quorums_debug.h>
-#include <llmq/quorums_utils.h>
+#include <llmq/dkgsessionmgr.h>
+#include <llmq/debug.h>
+#include <llmq/utils.h>
 
 #include <evo/deterministicmns.h>
 
diff --git a/src/llmq/quorums_dkgsessionmgr.h b/src/llmq/dkgsessionmgr.h
similarity index 94%
rename from src/llmq/quorums_dkgsessionmgr.h
rename to src/llmq/dkgsessionmgr.h
index af39e13ec804..c9427a2af483 100644
--- a/src/llmq/quorums_dkgsessionmgr.h
+++ b/src/llmq/dkgsessionmgr.h
@@ -2,11 +2,11 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_LLMQ_QUORUMS_DKGSESSIONMGR_H
-#define BITCOIN_LLMQ_QUORUMS_DKGSESSIONMGR_H
+#ifndef BITCOIN_LLMQ_DKGSESSIONMGR_H
+#define BITCOIN_LLMQ_DKGSESSIONMGR_H
 
-#include <llmq/quorums_dkgsessionhandler.h>
-#include <llmq/quorums_dkgsession.h>
+#include <llmq/dkgsessionhandler.h>
+#include <llmq/dkgsession.h>
 #include <bls/bls.h>
 #include <bls/bls_worker.h>
 
@@ -81,4 +81,4 @@ extern CDKGSessionManager* quorumDKGSessionManager;
 
 } // namespace llmq
 
-#endif // BITCOIN_LLMQ_QUORUMS_DKGSESSIONMGR_H
+#endif // BITCOIN_LLMQ_DKGSESSIONMGR_H
diff --git a/src/llmq/quorums_init.cpp b/src/llmq/init.cpp
similarity index 89%
rename from src/llmq/quorums_init.cpp
rename to src/llmq/init.cpp
index 1ffbc9cbdf9c..eebc2c3a1381 100644
--- a/src/llmq/quorums_init.cpp
+++ b/src/llmq/init.cpp
@@ -2,18 +2,18 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <llmq/quorums_init.h>
+#include <llmq/init.h>
 
 #include <llmq/quorums.h>
-#include <llmq/quorums_blockprocessor.h>
-#include <llmq/quorums_commitment.h>
-#include <llmq/quorums_chainlocks.h>
-#include <llmq/quorums_debug.h>
-#include <llmq/quorums_dkgsessionmgr.h>
-#include <llmq/quorums_instantsend.h>
-#include <llmq/quorums_signing.h>
-#include <llmq/quorums_signing_shares.h>
-#include <llmq/quorums_utils.h>
+#include <llmq/blockprocessor.h>
+#include <llmq/commitment.h>
+#include <llmq/chainlocks.h>
+#include <llmq/debug.h>
+#include <llmq/dkgsessionmgr.h>
+#include <llmq/instantsend.h>
+#include <llmq/signing.h>
+#include <llmq/signing_shares.h>
+#include <llmq/utils.h>
 #include <consensus/validation.h>
 
 #include <dbwrapper.h>
diff --git a/src/llmq/quorums_init.h b/src/llmq/init.h
similarity index 82%
rename from src/llmq/quorums_init.h
rename to src/llmq/init.h
index 905e57b51c75..e2589d2a9071 100644
--- a/src/llmq/quorums_init.h
+++ b/src/llmq/init.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_LLMQ_QUORUMS_INIT_H
-#define BITCOIN_LLMQ_QUORUMS_INIT_H
+#ifndef BITCOIN_LLMQ_INIT_H
+#define BITCOIN_LLMQ_INIT_H
 
 class CDBWrapper;
 class CEvoDB;
@@ -21,4 +21,4 @@ void StopLLMQSystem();
 void InterruptLLMQSystem();
 } // namespace llmq
 
-#endif // BITCOIN_LLMQ_QUORUMS_INIT_H
+#endif // BITCOIN_LLMQ_INIT_H
diff --git a/src/llmq/quorums_instantsend.cpp b/src/llmq/instantsend.cpp
similarity index 99%
rename from src/llmq/quorums_instantsend.cpp
rename to src/llmq/instantsend.cpp
index ac17d810e362..0b6c8aa475c4 100644
--- a/src/llmq/quorums_instantsend.cpp
+++ b/src/llmq/instantsend.cpp
@@ -2,11 +2,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <llmq/quorums_chainlocks.h>
+#include <llmq/chainlocks.h>
 #include <llmq/quorums.h>
-#include <llmq/quorums_instantsend.h>
-#include <llmq/quorums_utils.h>
-#include <llmq/quorums_commitment.h>
+#include <llmq/instantsend.h>
+#include <llmq/utils.h>
+#include <llmq/commitment.h>
 
 #include <bls/bls_batchverifier.h>
 #include <chainparams.h>
diff --git a/src/llmq/quorums_instantsend.h b/src/llmq/instantsend.h
similarity index 98%
rename from src/llmq/quorums_instantsend.h
rename to src/llmq/instantsend.h
index 1fe3caa5b87a..c2f269c645af 100644
--- a/src/llmq/quorums_instantsend.h
+++ b/src/llmq/instantsend.h
@@ -2,10 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_LLMQ_QUORUMS_INSTANTSEND_H
-#define BITCOIN_LLMQ_QUORUMS_INSTANTSEND_H
+#ifndef BITCOIN_LLMQ_INSTANTSEND_H
+#define BITCOIN_LLMQ_INSTANTSEND_H
 
-#include <llmq/quorums_signing.h>
+#include <llmq/signing.h>
 #include <unordered_lru_cache.h>
 
 #include <chain.h>
@@ -286,4 +286,4 @@ bool RejectConflictingBlocks();
 
 } // namespace llmq
 
-#endif // BITCOIN_LLMQ_QUORUMS_INSTANTSEND_H
+#endif // BITCOIN_LLMQ_INSTANTSEND_H
diff --git a/src/llmq/params.cpp b/src/llmq/params.cpp
new file mode 100644
index 000000000000..7f6c90d31d0a
--- /dev/null
+++ b/src/llmq/params.cpp
@@ -0,0 +1,179 @@
+// Copyright (c) 2021 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <llmq/params.h>
+
+/**
+ * llmq_test
+ * This quorum is only used for testing
+ *
+ */
+Consensus::LLMQParams llmq_test = {
+    .type = Consensus::LLMQ_TEST,
+    .name = "llmq_test",
+    .size = 3,
+    .minSize = 2,
+    .threshold = 2,
+
+    .dkgInterval = 24, // one DKG per hour
+    .dkgPhaseBlocks = 2,
+    .dkgMiningWindowStart = 10, // dkgPhaseBlocks * 5 = after finalization
+    .dkgMiningWindowEnd = 18,
+    .dkgBadVotesThreshold = 2,
+
+    .signingActiveQuorumCount = 2, // just a few ones to allow easier testing
+
+    .keepOldConnections = 3,
+    .recoveryMembers = 3,
+};
+
+/**
+ * llmq_test (Dash Core 0.17) aka llmq_test_v17
+ * This quorum is only used for testing
+ *
+ */
+Consensus::LLMQParams llmq_test_v17 = {
+    .type = Consensus::LLMQ_TEST_V17,
+    .name = "llmq_test_v17",
+    .size = 3,
+    .minSize = 2,
+    .threshold = 2,
+
+    .dkgInterval = 24, // one DKG per hour
+    .dkgPhaseBlocks = 2,
+    .dkgMiningWindowStart = 10, // dkgPhaseBlocks * 5 = after finalization
+    .dkgMiningWindowEnd = 18,
+    .dkgBadVotesThreshold = 2,
+
+    .signingActiveQuorumCount = 2, // just a few ones to allow easier testing
+
+    .keepOldConnections = 3,
+    .recoveryMembers = 3,
+};
+
+/**
+ * llmq_devnet
+ * This quorum is only used for testing on devnets
+ *
+ */
+Consensus::LLMQParams llmq_devnet = {
+    .type = Consensus::LLMQ_DEVNET,
+    .name = "llmq_devnet",
+    .size = 10,
+    .minSize = 7,
+    .threshold = 6,
+
+    .dkgInterval = 24, // one DKG per hour
+    .dkgPhaseBlocks = 2,
+    .dkgMiningWindowStart = 10, // dkgPhaseBlocks * 5 = after finalization
+    .dkgMiningWindowEnd = 18,
+    .dkgBadVotesThreshold = 7,
+
+    .signingActiveQuorumCount = 3, // just a few ones to allow easier testing
+
+    .keepOldConnections = 4,
+    .recoveryMembers = 6,
+};
+
+/**
+ * llmq50_60
+ * This quorum is deployed on mainnet and requires
+ * 40 - 50 participants
+ *
+ */
+Consensus::LLMQParams llmq50_60 = {
+    .type = Consensus::LLMQ_50_60,
+    .name = "llmq_50_60",
+    .size = 50,
+    .minSize = 40,
+    .threshold = 30,
+
+    .dkgInterval = 24, // one DKG per hour
+    .dkgPhaseBlocks = 2,
+    .dkgMiningWindowStart = 10, // dkgPhaseBlocks * 5 = after finalization
+    .dkgMiningWindowEnd = 18,
+    .dkgBadVotesThreshold = 40,
+
+    .signingActiveQuorumCount = 24, // a full day worth of LLMQs
+
+    .keepOldConnections = 25,
+    .recoveryMembers = 25,
+};
+
+/**
+ * llmq400_60
+ * This quorum is deployed on mainnet and requires
+ * 300 - 400 participants
+ *
+ */
+Consensus::LLMQParams llmq400_60 = {
+    .type = Consensus::LLMQ_400_60,
+    .name = "llmq_400_60",
+    .size = 400,
+    .minSize = 300,
+    .threshold = 240,
+
+    .dkgInterval = 24 * 12, // one DKG every 12 hours
+    .dkgPhaseBlocks = 4,
+    .dkgMiningWindowStart = 20, // dkgPhaseBlocks * 5 = after finalization
+    .dkgMiningWindowEnd = 28,
+    .dkgBadVotesThreshold = 300,
+
+    .signingActiveQuorumCount = 4, // two days worth of LLMQs
+
+    .keepOldConnections = 5,
+    .recoveryMembers = 100,
+};
+
+/**
+ * llmq400_85
+ * This quorum is deployed on mainnet and requires
+ * 300 - 400 participants _with_ a supermajority
+ *
+ * Used for deployment and min-proto-version signalling
+ */
+Consensus::LLMQParams llmq400_85 = {
+    .type = Consensus::LLMQ_400_85,
+    .name = "llmq_400_85",
+    .size = 400,
+    .minSize = 350,
+    .threshold = 340,
+
+    .dkgInterval = 24 * 24, // one DKG every 24 hours
+    .dkgPhaseBlocks = 4,
+    .dkgMiningWindowStart = 20, // dkgPhaseBlocks * 5 = after finalization
+    .dkgMiningWindowEnd = 48,   // give it a larger mining window to make sure it is mined
+    .dkgBadVotesThreshold = 300,
+
+    .signingActiveQuorumCount = 4, // four days worth of LLMQs
+
+    .keepOldConnections = 5,
+    .recoveryMembers = 100,
+};
+
+/**
+ * llmq100_67
+ * This quorum is deployed on mainnet and requires
+ * 80 - 100 participants
+ *
+ * Used by Dash Platform
+ */
+Consensus::LLMQParams llmq100_67 = {
+    .type = Consensus::LLMQ_100_67,
+    .name = "llmq_100_67",
+    .size = 100,
+    .minSize = 80,
+    .threshold = 67,
+
+    .dkgInterval = 24, // one DKG per hour
+    .dkgPhaseBlocks = 2,
+    .dkgMiningWindowStart = 10, // dkgPhaseBlocks * 5 = after finalization
+    .dkgMiningWindowEnd = 18,
+    .dkgBadVotesThreshold = 80,
+
+    .signingActiveQuorumCount = 24, // a full day worth of LLMQs
+
+    .keepOldConnections = 25,
+    .recoveryMembers = 50,
+};
diff --git a/src/llmq/params.h b/src/llmq/params.h
new file mode 100644
index 000000000000..28b2d7d2ed61
--- /dev/null
+++ b/src/llmq/params.h
@@ -0,0 +1,18 @@
+// Copyright (c) 2021 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_LLMQ_PARAMS_H
+#define BITCOIN_LLMQ_PARAMS_H
+
+#include <consensus/params.h>
+
+extern Consensus::LLMQParams llmq_test;
+extern Consensus::LLMQParams llmq_test_v17;
+extern Consensus::LLMQParams llmq_devnet;
+extern Consensus::LLMQParams llmq50_60;
+extern Consensus::LLMQParams llmq400_60;
+extern Consensus::LLMQParams llmq400_85;
+extern Consensus::LLMQParams llmq100_67;
+
+#endif // BITCOIN_LLMQ_PARAMS_H
diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
index 808d5289e8eb..68a70cf2074a 100644
--- a/src/llmq/quorums.cpp
+++ b/src/llmq/quorums.cpp
@@ -3,11 +3,11 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <llmq/quorums.h>
-#include <llmq/quorums_commitment.h>
-#include <llmq/quorums_blockprocessor.h>
-#include <llmq/quorums_dkgsession.h>
-#include <llmq/quorums_dkgsessionmgr.h>
-#include <llmq/quorums_utils.h>
+#include <llmq/commitment.h>
+#include <llmq/blockprocessor.h>
+#include <llmq/dkgsession.h>
+#include <llmq/dkgsessionmgr.h>
+#include <llmq/utils.h>
 
 #include <evo/specialtx.h>
 #include <evo/deterministicmns.h>
diff --git a/src/llmq/quorums_signing.cpp b/src/llmq/signing.cpp
similarity index 99%
rename from src/llmq/quorums_signing.cpp
rename to src/llmq/signing.cpp
index 456cc00f84b4..8ac37e25180a 100644
--- a/src/llmq/quorums_signing.cpp
+++ b/src/llmq/signing.cpp
@@ -3,10 +3,10 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <llmq/quorums.h>
-#include <llmq/quorums_commitment.h>
-#include <llmq/quorums_signing.h>
-#include <llmq/quorums_utils.h>
-#include <llmq/quorums_signing_shares.h>
+#include <llmq/commitment.h>
+#include <llmq/signing.h>
+#include <llmq/utils.h>
+#include <llmq/signing_shares.h>
 
 #include <masternode/node.h>
 #include <bls/bls_batchverifier.h>
diff --git a/src/llmq/quorums_signing.h b/src/llmq/signing.h
similarity index 98%
rename from src/llmq/quorums_signing.h
rename to src/llmq/signing.h
index 04b63b5fffb9..85ca1eba12bf 100644
--- a/src/llmq/quorums_signing.h
+++ b/src/llmq/signing.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_LLMQ_QUORUMS_SIGNING_H
-#define BITCOIN_LLMQ_QUORUMS_SIGNING_H
+#ifndef BITCOIN_LLMQ_SIGNING_H
+#define BITCOIN_LLMQ_SIGNING_H
 
 #include <bls/bls.h>
 #include <unordered_lru_cache.h>
@@ -190,4 +190,4 @@ extern CSigningManager* quorumSigningManager;
 
 } // namespace llmq
 
-#endif // BITCOIN_LLMQ_QUORUMS_SIGNING_H
+#endif // BITCOIN_LLMQ_SIGNING_H
diff --git a/src/llmq/quorums_signing_shares.cpp b/src/llmq/signing_shares.cpp
similarity index 99%
rename from src/llmq/quorums_signing_shares.cpp
rename to src/llmq/signing_shares.cpp
index 1c391c193240..52906c43b909 100644
--- a/src/llmq/quorums_signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -3,10 +3,10 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <llmq/quorums.h>
-#include <llmq/quorums_commitment.h>
-#include <llmq/quorums_signing.h>
-#include <llmq/quorums_signing_shares.h>
-#include <llmq/quorums_utils.h>
+#include <llmq/commitment.h>
+#include <llmq/signing.h>
+#include <llmq/signing_shares.h>
+#include <llmq/utils.h>
 
 
 #include <evo/deterministicmns.h>
diff --git a/src/llmq/quorums_signing_shares.h b/src/llmq/signing_shares.h
similarity index 98%
rename from src/llmq/quorums_signing_shares.h
rename to src/llmq/signing_shares.h
index 4796fdb3d028..e374617a730e 100644
--- a/src/llmq/quorums_signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_LLMQ_QUORUMS_SIGNING_SHARES_H
-#define BITCOIN_LLMQ_QUORUMS_SIGNING_SHARES_H
+#ifndef BITCOIN_LLMQ_SIGNING_SHARES_H
+#define BITCOIN_LLMQ_SIGNING_SHARES_H
 
 #include <chainparams.h>
 #include <net.h>
@@ -431,4 +431,4 @@ extern CSigSharesManager* quorumSigSharesManager;
 
 } // namespace llmq
 
-#endif // BITCOIN_LLMQ_QUORUMS_SIGNING_SHARES_H
+#endif // BITCOIN_LLMQ_SIGNING_SHARES_H
diff --git a/src/llmq/quorums_utils.cpp b/src/llmq/utils.cpp
similarity index 99%
rename from src/llmq/quorums_utils.cpp
rename to src/llmq/utils.cpp
index df90074a7630..ccf63044ac93 100644
--- a/src/llmq/quorums_utils.cpp
+++ b/src/llmq/utils.cpp
@@ -3,8 +3,8 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <llmq/quorums.h>
-#include <llmq/quorums_commitment.h>
-#include <llmq/quorums_utils.h>
+#include <llmq/commitment.h>
+#include <llmq/utils.h>
 
 #include <bls/bls.h>
 #include <evo/deterministicmns.h>
diff --git a/src/llmq/quorums_utils.h b/src/llmq/utils.h
similarity index 97%
rename from src/llmq/quorums_utils.h
rename to src/llmq/utils.h
index c0ffedc4e80e..98c8993e7c16 100644
--- a/src/llmq/quorums_utils.h
+++ b/src/llmq/utils.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_LLMQ_QUORUMS_UTILS_H
-#define BITCOIN_LLMQ_QUORUMS_UTILS_H
+#ifndef BITCOIN_LLMQ_UTILS_H
+#define BITCOIN_LLMQ_UTILS_H
 
 #include <consensus/params.h>
 
@@ -126,4 +126,4 @@ const Consensus::LLMQParams& GetLLMQParams(const Consensus::LLMQType llmqType);
 
 } // namespace llmq
 
-#endif // BITCOIN_LLMQ_QUORUMS_UTILS_H
+#endif // BITCOIN_LLMQ_UTILS_H
diff --git a/src/miner.cpp b/src/miner.cpp
index 1cd7f3d80c07..14fb090623df 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -31,9 +31,9 @@
 #include <evo/cbtx.h>
 #include <evo/simplifiedmns.h>
 #include <evo/deterministicmns.h>
-#include <llmq/quorums_blockprocessor.h>
-#include <llmq/quorums_chainlocks.h>
-#include <llmq/quorums_utils.h>
+#include <llmq/blockprocessor.h>
+#include <llmq/chainlocks.h>
+#include <llmq/utils.h>
 #include <masternode/payments.h>
 #include <masternode/sync.h>
 
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index a97a6ea5ad5f..bb5f3e31d696 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -52,13 +52,13 @@
 #include <evo/mnauth.h>
 #include <evo/simplifiedmns.h>
 #include <llmq/quorums.h>
-#include <llmq/quorums_blockprocessor.h>
-#include <llmq/quorums_commitment.h>
-#include <llmq/quorums_chainlocks.h>
-#include <llmq/quorums_dkgsessionmgr.h>
-#include <llmq/quorums_instantsend.h>
-#include <llmq/quorums_signing.h>
-#include <llmq/quorums_signing_shares.h>
+#include <llmq/blockprocessor.h>
+#include <llmq/commitment.h>
+#include <llmq/chainlocks.h>
+#include <llmq/dkgsessionmgr.h>
+#include <llmq/instantsend.h>
+#include <llmq/signing.h>
+#include <llmq/signing_shares.h>
 
 #include <statsd_client.h>
 
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index 13a3bb3ec3dc..42f54f968f56 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -16,7 +16,7 @@
 #include <univalue.h>
 #include <util/system.h>
 
-#include <llmq/quorums_init.h>
+#include <llmq/init.h>
 
 #include <QDir>
 #include <QtGlobal>
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index ec93bde51f82..575663ae0680 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -41,8 +41,8 @@
 #include <evo/specialtx.h>
 #include <evo/cbtx.h>
 
-#include <llmq/quorums_chainlocks.h>
-#include <llmq/quorums_instantsend.h>
+#include <llmq/chainlocks.h>
+#include <llmq/instantsend.h>
 
 #include <assert.h>
 #include <stdint.h>
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 8e654b5061fb..60c827e99e35 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -37,9 +37,9 @@
 #include <evo/providertx.h>
 #include <evo/cbtx.h>
 
-#include <llmq/quorums_chainlocks.h>
-#include <llmq/quorums_commitment.h>
-#include <llmq/quorums_instantsend.h>
+#include <llmq/chainlocks.h>
+#include <llmq/commitment.h>
+#include <llmq/instantsend.h>
 
 #include <stdint.h>
 
diff --git a/src/rpc/rpcquorums.cpp b/src/rpc/rpcquorums.cpp
index 77ca9be93a44..2046abe49fa1 100644
--- a/src/rpc/rpcquorums.cpp
+++ b/src/rpc/rpcquorums.cpp
@@ -11,12 +11,12 @@
 #include <evo/deterministicmns.h>
 
 #include <llmq/quorums.h>
-#include <llmq/quorums_commitment.h>
-#include <llmq/quorums_blockprocessor.h>
-#include <llmq/quorums_debug.h>
-#include <llmq/quorums_dkgsession.h>
-#include <llmq/quorums_signing.h>
-#include <llmq/quorums_signing_shares.h>
+#include <llmq/commitment.h>
+#include <llmq/blockprocessor.h>
+#include <llmq/debug.h>
+#include <llmq/dkgsession.h>
+#include <llmq/signing.h>
+#include <llmq/signing_shares.h>
 
 namespace llmq {
 extern const std::string CLSIG_REQUESTID_PREFIX;
diff --git a/src/test/test_dash.cpp b/src/test/test_dash.cpp
index 4fa7da1f43b3..4465b411db33 100644
--- a/src/test/test_dash.cpp
+++ b/src/test/test_dash.cpp
@@ -28,7 +28,7 @@
 #include <evo/specialtx.h>
 #include <evo/deterministicmns.h>
 #include <evo/cbtx.h>
-#include <llmq/quorums_init.h>
+#include <llmq/init.h>
 
 const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
 
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 2ca4b8222ef7..aef5c81be4ce 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -23,7 +23,7 @@
 #include <evo/specialtx.h>
 #include <evo/providertx.h>
 #include <evo/deterministicmns.h>
-#include <llmq/quorums_instantsend.h>
+#include <llmq/instantsend.h>
 
 CTxMemPoolEntry::CTxMemPoolEntry(const CTransactionRef& _tx, const CAmount& _nFee,
                                  int64_t _nTime, unsigned int _entryHeight,
diff --git a/src/validation.cpp b/src/validation.cpp
index fdcb8b9102cf..d809248c1bd5 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -50,8 +50,8 @@
 #include <evo/specialtx.h>
 #include <evo/deterministicmns.h>
 
-#include <llmq/quorums_instantsend.h>
-#include <llmq/quorums_chainlocks.h>
+#include <llmq/instantsend.h>
+#include <llmq/chainlocks.h>
 
 #include <statsd_client.h>
 
diff --git a/src/wallet/coinselection.cpp b/src/wallet/coinselection.cpp
index 640b3fa05a70..79c30dbede30 100644
--- a/src/wallet/coinselection.cpp
+++ b/src/wallet/coinselection.cpp
@@ -7,7 +7,7 @@
 #include <util/system.h>
 #include <util/moneystr.h>
 
-#include <llmq/quorums_instantsend.h>
+#include <llmq/instantsend.h>
 #include <coinjoin/coinjoin.h>
 
 #include <boost/optional.hpp>
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index e8a6f7fcee7f..21b484aed2cf 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -36,8 +36,8 @@
 
 #include <coinjoin/client.h>
 #include <coinjoin/options.h>
-#include <llmq/quorums_chainlocks.h>
-#include <llmq/quorums_instantsend.h>
+#include <llmq/chainlocks.h>
+#include <llmq/instantsend.h>
 
 #include <stdint.h>
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index a45d240b7e87..889a42bf98f5 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -40,8 +40,8 @@
 
 #include <evo/providertx.h>
 
-#include <llmq/quorums_instantsend.h>
-#include <llmq/quorums_chainlocks.h>
+#include <llmq/instantsend.h>
+#include <llmq/chainlocks.h>
 
 #include <assert.h>
 #include <future>
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index 5b037f2bac99..806af29a8a5d 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -15,9 +15,9 @@
 #include <governance/object.h>
 #include <governance/vote.h>
 
-#include <llmq/quorums_chainlocks.h>
-#include <llmq/quorums_instantsend.h>
-#include <llmq/quorums_signing.h>
+#include <llmq/chainlocks.h>
+#include <llmq/instantsend.h>
+#include <llmq/signing.h>
 
 #include <zmq.h>
 
diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
index bdd468e15cbb..870079b22931 100755
--- a/test/lint/lint-circular-dependencies.sh
+++ b/test/lint/lint-circular-dependencies.sh
@@ -42,12 +42,12 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "evo/deterministicmns -> evo/providertx -> evo/deterministicmns"
     "evo/deterministicmns -> evo/simplifiedmns -> evo/deterministicmns"
     "evo/deterministicmns -> evo/specialtx -> evo/deterministicmns"
-    "evo/deterministicmns -> llmq/quorums_commitment -> evo/deterministicmns"
-    "evo/deterministicmns -> llmq/quorums_utils -> evo/deterministicmns"
+    "evo/deterministicmns -> llmq/commitment -> evo/deterministicmns"
+    "evo/deterministicmns -> llmq/utils -> evo/deterministicmns"
     "evo/deterministicmns -> validation -> evo/deterministicmns"
     "evo/mnauth -> net_processing -> evo/mnauth"
-    "evo/specialtx -> llmq/quorums_blockprocessor -> evo/specialtx"
-    "evo/specialtx -> llmq/quorums_commitment -> evo/specialtx"
+    "evo/specialtx -> llmq/blockprocessor -> evo/specialtx"
+    "evo/specialtx -> llmq/commitment -> evo/specialtx"
     "evo/specialtx -> validation -> evo/specialtx"
     "governance/classes -> governance/governance -> governance/classes"
     "governance/classes -> governance/governance -> net_processing -> masternode/payments -> governance/classes"
@@ -55,17 +55,17 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "governance/governance -> masternode/sync -> governance/governance"
     "governance/governance -> net_processing -> governance/governance"
     "governance/object -> governance/validators -> governance/object"
-    "llmq/quorums -> llmq/quorums_utils -> llmq/quorums"
-    "llmq/quorums_blockprocessor -> net_processing -> llmq/quorums_blockprocessor"
-    "llmq/quorums_chainlocks -> llmq/quorums_instantsend -> llmq/quorums_chainlocks"
-    "llmq/quorums_chainlocks -> net_processing -> llmq/quorums_chainlocks"
-    "llmq/quorums_dkgsessionmgr -> net_processing -> llmq/quorums_dkgsessionmgr"
-    "llmq/quorums_instantsend -> net_processing -> llmq/quorums_instantsend"
-    "llmq/quorums_instantsend -> txmempool -> llmq/quorums_instantsend"
-    "llmq/quorums_instantsend -> validation -> llmq/quorums_instantsend"
-    "llmq/quorums_signing -> llmq/quorums_signing_shares -> llmq/quorums_signing"
-    "llmq/quorums_signing -> net_processing -> llmq/quorums_signing"
-    "llmq/quorums_signing_shares -> net_processing -> llmq/quorums_signing_shares"
+    "llmq/quorums -> llmq/utils -> llmq/quorums"
+    "llmq/blockprocessor -> net_processing -> llmq/blockprocessor"
+    "llmq/chainlocks -> llmq/instantsend -> llmq/chainlocks"
+    "llmq/chainlocks -> net_processing -> llmq/chainlocks"
+    "llmq/dkgsessionmgr -> net_processing -> llmq/dkgsessionmgr"
+    "llmq/instantsend -> net_processing -> llmq/instantsend"
+    "llmq/instantsend -> txmempool -> llmq/instantsend"
+    "llmq/instantsend -> validation -> llmq/instantsend"
+    "llmq/signing -> llmq/signing_shares -> llmq/signing"
+    "llmq/signing -> net_processing -> llmq/signing"
+    "llmq/signing_shares -> net_processing -> llmq/signing_shares"
     "logging -> util/system -> logging"
     "masternode/payments -> validation -> masternode/payments"
     "net -> netmessagemaker -> net"
@@ -78,8 +78,8 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "qt/guiutil -> qt/qvalidatedlineedit -> qt/guiutil"
     "core_io -> evo/cbtx -> evo/deterministicmns -> core_io"
     "core_io -> evo/cbtx -> evo/simplifiedmns -> core_io"
-    "evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> evo/simplifiedmns"
-    "llmq/quorums_dkgsession -> llmq/quorums_dkgsessionmgr -> llmq/quorums_dkgsessionhandler -> llmq/quorums_dkgsession"
+    "evo/simplifiedmns -> llmq/blockprocessor -> net_processing -> evo/simplifiedmns"
+    "llmq/dkgsession -> llmq/dkgsessionmgr -> llmq/dkgsessionhandler -> llmq/dkgsession"
     "logging -> util/system -> random -> logging"
     "logging -> util/system -> sync -> logging"
     "logging -> util/system -> stacktraces -> logging"
@@ -88,25 +88,24 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "qt/bitcoinaddressvalidator -> qt/guiutil -> qt/qvalidatedlineedit -> qt/bitcoinaddressvalidator"
     "qt/guiutil -> qt/optionsdialog -> qt/optionsmodel -> qt/guiutil"
     "bloom -> evo/cbtx -> evo/simplifiedmns -> merkleblock -> bloom"
-    "bloom -> evo/cbtx -> llmq/quorums_blockprocessor -> net -> bloom"
-    "evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> llmq/quorums_debug -> evo/deterministicmns"
-    "evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> evo/deterministicmns"
-    "evo/specialtx -> llmq/quorums_blockprocessor -> net_processing -> txmempool -> evo/specialtx"
-    "evo/providertx -> evo/specialtx -> llmq/quorums_blockprocessor -> net_processing -> txmempool -> evo/providertx"
+    "bloom -> evo/cbtx -> llmq/blockprocessor -> net -> bloom"
+    "evo/deterministicmns -> evo/simplifiedmns -> llmq/blockprocessor -> llmq/debug -> evo/deterministicmns"
+    "evo/deterministicmns -> evo/simplifiedmns -> llmq/blockprocessor -> net_processing -> evo/deterministicmns"
+    "evo/specialtx -> llmq/blockprocessor -> net_processing -> txmempool -> evo/specialtx"
+    "evo/providertx -> evo/specialtx -> llmq/blockprocessor -> net_processing -> txmempool -> evo/providertx"
 
     "coinjoin/client -> net_processing -> coinjoin/client"
     "llmq/quorums -> net_processing -> llmq/quorums"
-    "llmq/quorums_commitment -> llmq/quorums_utils -> llmq/quorums_commitment"
-    "llmq/quorums_dkgsession -> llmq/quorums_dkgsessionmgr -> llmq/quorums_dkgsession"
+    "llmq/commitment -> llmq/utils -> llmq/commitment"
+    "llmq/dkgsession -> llmq/dkgsessionmgr -> llmq/dkgsession"
     "evo/deterministicmns -> validationinterface -> txmempool -> evo/deterministicmns"
-    "llmq/quorums -> validation -> llmq/quorums_chainlocks -> llmq/quorums"
-    "llmq/quorums_chainlocks -> llmq/quorums_instantsend -> validation -> llmq/quorums_chainlocks"
-    "evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> masternode/payments -> evo/deterministicmns"
-    "evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> masternode/payments -> masternode/node -> evo/deterministicmns"
-    "evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net -> masternode/sync -> evo/deterministicmns"
+    "llmq/chainlocks -> llmq/instantsend -> validation -> llmq/chainlocks"
+    "evo/deterministicmns -> evo/simplifiedmns -> llmq/blockprocessor -> net_processing -> masternode/payments -> evo/deterministicmns"
+    "evo/deterministicmns -> evo/simplifiedmns -> llmq/blockprocessor -> net_processing -> masternode/payments -> masternode/node -> evo/deterministicmns"
+    "evo/deterministicmns -> evo/simplifiedmns -> llmq/blockprocessor -> net -> masternode/sync -> evo/deterministicmns"
     "governance/governance -> net_processing -> masternode/payments -> governance/governance"
-    "evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net -> evo/deterministicmns"
-    "coinjoin/coinjoin -> llmq/quorums_chainlocks -> net -> coinjoin/coinjoin"
+    "evo/deterministicmns -> evo/simplifiedmns -> llmq/blockprocessor -> net -> evo/deterministicmns"
+    "coinjoin/coinjoin -> llmq/chainlocks -> net -> coinjoin/coinjoin"
 )
 
 EXIT_CODE=0
diff --git a/test/lint/lint-cppcheck-dash.sh b/test/lint/lint-cppcheck-dash.sh
index fbbcb5d1c3b1..4bdbb6641e0b 100755
--- a/test/lint/lint-cppcheck-dash.sh
+++ b/test/lint/lint-cppcheck-dash.sh
@@ -36,7 +36,7 @@ ENABLED_CHECKS=(
 
 IGNORED_WARNINGS=(
     "src/bls/bls.h:.* Struct 'CBLSIdImplicit' has a constructor with 1 argument that is not explicit."
-    "src/llmq/quorums_init.cpp:.* warning: Variable 'llmqDbTmp' is assigned a value that is never used."
+    "src/llmq/init.cpp:.* warning: Variable 'llmqDbTmp' is assigned a value that is never used."
     "src/llmq/quorums.cpp:.* warning: Parameter '_blsWorker' can be declared with const"
 
 # General catchall, for some reason any value named 'hash' is viewed as never used.