diff --git a/src/Makefile.am b/src/Makefile.am
index f49ff598da00..95b4176fbc55 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -137,10 +137,10 @@ BITCOIN_CORE_H = \
   checkqueue.h \
   clientversion.h \
   coinjoin/coinjoin.h \
-  coinjoin/coinjoin-client.h \
-  coinjoin/coinjoin-client-options.h \
-  coinjoin/coinjoin-server.h \
-  coinjoin/coinjoin-util.h \
+  coinjoin/client.h \
+  coinjoin/options.h \
+  coinjoin/server.h \
+  coinjoin/util.h \
   coins.h \
   compat.h \
   compat/assumptions.h \
@@ -164,12 +164,12 @@ BITCOIN_CORE_H = \
   evo/specialtx.h \
   dsnotificationinterface.h \
   governance/governance.h \
-  governance/governance-classes.h \
-  governance/governance-exceptions.h \
-  governance/governance-object.h \
-  governance/governance-validators.h \
-  governance/governance-vote.h \
-  governance/governance-votedb.h \
+  governance/classes.h \
+  governance/exceptions.h \
+  governance/object.h \
+  governance/validators.h \
+  governance/vote.h \
+  governance/votedb.h \
   flat-database.h \
   hdchain.h \
   flatfile.h \
@@ -206,11 +206,11 @@ BITCOIN_CORE_H = \
   llmq/quorums_utils.h \
   logging.h \
   logging/timer.h \
-  masternode/activemasternode.h \
-  masternode/masternode-meta.h \
-  masternode/masternode-payments.h \
-  masternode/masternode-sync.h \
-  masternode/masternode-utils.h \
+  masternode/node.h \
+  masternode/meta.h \
+  masternode/payments.h \
+  masternode/sync.h \
+  masternode/utils.h \
   memusage.h \
   merkleblock.h \
   messagesigner.h \
@@ -329,8 +329,8 @@ libdash_server_a_SOURCES = \
   chain.cpp \
   checkpoints.cpp \
   coinjoin/coinjoin.cpp \
-  coinjoin/coinjoin-client-options.cpp \
-  coinjoin/coinjoin-server.cpp \
+  coinjoin/options.cpp \
+  coinjoin/server.cpp \
   consensus/tx_verify.cpp \
   dsnotificationinterface.cpp \
   evo/cbtx.cpp \
@@ -351,11 +351,11 @@ libdash_server_a_SOURCES = \
   init.cpp \
   dbwrapper.cpp \
   governance/governance.cpp \
-  governance/governance-classes.cpp \
-  governance/governance-object.cpp \
-  governance/governance-validators.cpp \
-  governance/governance-vote.cpp \
-  governance/governance-votedb.cpp \
+  governance/classes.cpp \
+  governance/object.cpp \
+  governance/validators.cpp \
+  governance/vote.cpp \
+  governance/votedb.cpp \
   llmq/quorums.cpp \
   llmq/quorums_blockprocessor.cpp \
   llmq/quorums_commitment.cpp \
@@ -369,11 +369,11 @@ libdash_server_a_SOURCES = \
   llmq/quorums_signing.cpp \
   llmq/quorums_signing_shares.cpp \
   llmq/quorums_utils.cpp \
-  masternode/activemasternode.cpp \
-  masternode/masternode-meta.cpp \
-  masternode/masternode-payments.cpp \
-  masternode/masternode-sync.cpp \
-  masternode/masternode-utils.cpp \
+  masternode/node.cpp \
+  masternode/meta.cpp \
+  masternode/payments.cpp \
+  masternode/sync.cpp \
+  masternode/utils.cpp \
   merkleblock.cpp \
   messagesigner.cpp \
   miner.cpp \
@@ -437,9 +437,9 @@ endif
 libdash_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libdash_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libdash_wallet_a_SOURCES = \
-  coinjoin/coinjoin-client.cpp \
-  coinjoin/coinjoin-client-options.cpp \
-  coinjoin/coinjoin-util.cpp \
+  coinjoin/client.cpp \
+  coinjoin/options.cpp \
+  coinjoin/util.cpp \
   interfaces/wallet.cpp \
   keepass.cpp \
   wallet/coincontrol.cpp \
diff --git a/src/coinjoin/coinjoin-client.cpp b/src/coinjoin/client.cpp
similarity index 99%
rename from src/coinjoin/coinjoin-client.cpp
rename to src/coinjoin/client.cpp
index fda138da9782..bde331a453a1 100644
--- a/src/coinjoin/coinjoin-client.cpp
+++ b/src/coinjoin/client.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 <coinjoin/coinjoin-client.h>
-#include <coinjoin/coinjoin-client-options.h>
+#include <coinjoin/client.h>
+#include <coinjoin/options.h>
 
 #include <consensus/validation.h>
 #include <core_io.h>
 #include <evo/deterministicmns.h>
-#include <masternode/masternode-sync.h>
-#include <masternode/masternode-meta.h>
+#include <masternode/sync.h>
+#include <masternode/meta.h>
 #include <netmessagemaker.h>
 #include <net_processing.h>
 #include <script/sign.h>
diff --git a/src/coinjoin/coinjoin-client.h b/src/coinjoin/client.h
similarity index 97%
rename from src/coinjoin/coinjoin-client.h
rename to src/coinjoin/client.h
index c9d29429a63b..1dc97ad896b6 100644
--- a/src/coinjoin/coinjoin-client.h
+++ b/src/coinjoin/client.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_COINJOIN_COINJOIN_CLIENT_H
-#define BITCOIN_COINJOIN_COINJOIN_CLIENT_H
+#ifndef BITCOIN_COINJOIN_CLIENT_H
+#define BITCOIN_COINJOIN_CLIENT_H
 
-#include <coinjoin/coinjoin-util.h>
+#include <coinjoin/util.h>
 #include <coinjoin/coinjoin.h>
 
 #include <utility>
@@ -252,4 +252,4 @@ class CCoinJoinClientManager
 
 void DoCoinJoinMaintenance(CConnman& connman);
 
-#endif // BITCOIN_COINJOIN_COINJOIN_CLIENT_H
+#endif // BITCOIN_COINJOIN_CLIENT_H
diff --git a/src/coinjoin/coinjoin.cpp b/src/coinjoin/coinjoin.cpp
index dfdc11b527ed..e1735bfe78e2 100644
--- a/src/coinjoin/coinjoin.cpp
+++ b/src/coinjoin/coinjoin.cpp
@@ -14,8 +14,8 @@
 #include <util/moneystr.h>
 #include <validation.h>
 #include <bls/bls.h>
-#include <masternode/activemasternode.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/node.h>
+#include <masternode/sync.h>
 
 #include <llmq/quorums_instantsend.h>
 #include <llmq/quorums_chainlocks.h>
diff --git a/src/coinjoin/coinjoin-client-options.cpp b/src/coinjoin/options.cpp
similarity index 98%
rename from src/coinjoin/coinjoin-client-options.cpp
rename to src/coinjoin/options.cpp
index 74aff83b1133..970df24ab564 100644
--- a/src/coinjoin/coinjoin-client-options.cpp
+++ b/src/coinjoin/options.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 <coinjoin/coinjoin-client-options.h>
+#include <coinjoin/options.h>
 
 #include <util/system.h>
 #include <univalue.h>
diff --git a/src/coinjoin/coinjoin-client-options.h b/src/coinjoin/options.h
similarity index 96%
rename from src/coinjoin/coinjoin-client-options.h
rename to src/coinjoin/options.h
index e87ef0c20b08..6b022778c6e9 100644
--- a/src/coinjoin/coinjoin-client-options.h
+++ b/src/coinjoin/options.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_COINJOIN_COINJOIN_CLIENT_OPTIONS_H
-#define BITCOIN_COINJOIN_COINJOIN_CLIENT_OPTIONS_H
+#ifndef BITCOIN_COINJOIN_OPTIONS_H
+#define BITCOIN_COINJOIN_OPTIONS_H
 
 #include <amount.h>
 #include <atomic>
@@ -91,4 +91,4 @@ class CCoinJoinClientOptions
     static void Init();
 };
 
-#endif // BITCOIN_COINJOIN_COINJOIN_CLIENT_OPTIONS_H
+#endif // BITCOIN_COINJOIN_OPTIONS_H
diff --git a/src/coinjoin/coinjoin-server.cpp b/src/coinjoin/server.cpp
similarity index 99%
rename from src/coinjoin/coinjoin-server.cpp
rename to src/coinjoin/server.cpp
index e07264173b41..7f988ad8d845 100644
--- a/src/coinjoin/coinjoin-server.cpp
+++ b/src/coinjoin/server.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 <coinjoin/coinjoin-server.h>
+#include <coinjoin/server.h>
 
-#include <masternode/activemasternode.h>
+#include <masternode/node.h>
 #include <evo/deterministicmns.h>
 #include <consensus/validation.h>
 #include <core_io.h>
-#include <masternode/masternode-meta.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/meta.h>
+#include <masternode/sync.h>
 #include <net_processing.h>
 #include <netmessagemaker.h>
 #include <script/interpreter.h>
diff --git a/src/coinjoin/coinjoin-server.h b/src/coinjoin/server.h
similarity index 96%
rename from src/coinjoin/coinjoin-server.h
rename to src/coinjoin/server.h
index 2887cbc501b8..f9fb346d4b1a 100644
--- a/src/coinjoin/coinjoin-server.h
+++ b/src/coinjoin/server.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_COINJOIN_COINJOIN_SERVER_H
-#define BITCOIN_COINJOIN_COINJOIN_SERVER_H
+#ifndef BITCOIN_COINJOIN_SERVER_H
+#define BITCOIN_COINJOIN_SERVER_H
 
 #include <coinjoin/coinjoin.h>
 #include <net.h>
@@ -87,4 +87,4 @@ class CCoinJoinServer : public CCoinJoinBaseSession, public CCoinJoinBaseManager
     void GetJsonInfo(UniValue& obj) const;
 };
 
-#endif // BITCOIN_COINJOIN_COINJOIN_SERVER_H
+#endif // BITCOIN_COINJOIN_SERVER_H
diff --git a/src/coinjoin/coinjoin-util.cpp b/src/coinjoin/util.cpp
similarity index 99%
rename from src/coinjoin/coinjoin-util.cpp
rename to src/coinjoin/util.cpp
index c1de05b057d4..c589b1fdd45e 100644
--- a/src/coinjoin/coinjoin-util.cpp
+++ b/src/coinjoin/util.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 <coinjoin/coinjoin-util.h>
+#include <coinjoin/util.h>
 #include <consensus/validation.h>
 #include <net.h>
 #include <policy/fees.h>
diff --git a/src/coinjoin/coinjoin-util.h b/src/coinjoin/util.h
similarity index 98%
rename from src/coinjoin/coinjoin-util.h
rename to src/coinjoin/util.h
index 743b6ff27249..debdc3dfd0b5 100644
--- a/src/coinjoin/coinjoin-util.h
+++ b/src/coinjoin/util.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_COINJOIN_COINJOIN_UTIL_H
-#define BITCOIN_COINJOIN_COINJOIN_UTIL_H
+#ifndef BITCOIN_COINJOIN_UTIL_H
+#define BITCOIN_COINJOIN_UTIL_H
 
 #include <wallet/wallet.h>
 
@@ -137,4 +137,4 @@ class CTransactionBuilder
     int GetSizeOfCompactSizeDiff(size_t nAdd) const;
 };
 
-#endif // BITCOIN_COINJOIN_COINJOIN_UTIL_H
+#endif // BITCOIN_COINJOIN_UTIL_H
diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
index ac1caf4a4309..68203edd17c1 100644
--- a/src/dsnotificationinterface.cpp
+++ b/src/dsnotificationinterface.cpp
@@ -5,11 +5,11 @@
 #include <chainparams.h>
 #include <coinjoin/coinjoin.h>
 #ifdef ENABLE_WALLET
-#include <coinjoin/coinjoin-client.h>
+#include <coinjoin/client.h>
 #endif // ENABLE_WALLET
 #include <dsnotificationinterface.h>
 #include <governance/governance.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/sync.h>
 #include <validation.h>
 
 #include <evo/deterministicmns.h>
diff --git a/src/evo/mnauth.cpp b/src/evo/mnauth.cpp
index 8eb4e541fb80..7e8a9e93f3d6 100644
--- a/src/evo/mnauth.cpp
+++ b/src/evo/mnauth.cpp
@@ -6,9 +6,9 @@
 
 #include <evo/deterministicmns.h>
 #include <llmq/quorums_utils.h>
-#include <masternode/activemasternode.h>
-#include <masternode/masternode-meta.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/node.h>
+#include <masternode/meta.h>
+#include <masternode/sync.h>
 #include <net.h>
 #include <net_processing.h>
 #include <netmessagemaker.h>
diff --git a/src/governance/governance-classes.cpp b/src/governance/classes.cpp
similarity index 99%
rename from src/governance/governance-classes.cpp
rename to src/governance/classes.cpp
index 3985dac8581c..97e4be6fdd53 100644
--- a/src/governance/governance-classes.cpp
+++ b/src/governance/classes.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 <governance/governance-classes.h>
+#include <governance/classes.h>
 
 #include <core_io.h>
 #include <governance/governance.h>
diff --git a/src/governance/governance-classes.h b/src/governance/classes.h
similarity index 94%
rename from src/governance/governance-classes.h
rename to src/governance/classes.h
index 70eec7c273cd..601c2a6471e9 100644
--- a/src/governance/governance-classes.h
+++ b/src/governance/classes.h
@@ -1,11 +1,11 @@
 // Copyright (c) 2014-2021 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#ifndef BITCOIN_GOVERNANCE_GOVERNANCE_CLASSES_H
-#define BITCOIN_GOVERNANCE_GOVERNANCE_CLASSES_H
+#ifndef BITCOIN_GOVERNANCE_CLASSES_H
+#define BITCOIN_GOVERNANCE_CLASSES_H
 
 #include <amount.h>
-#include <governance/governance-object.h>
+#include <governance/object.h>
 #include <script/script.h>
 #include <script/standard.h>
 #include <uint256.h>
@@ -150,4 +150,4 @@ class CSuperblock : public CGovernanceObject
     bool IsExpired() const;
 };
 
-#endif // BITCOIN_GOVERNANCE_GOVERNANCE_CLASSES_H
+#endif // BITCOIN_GOVERNANCE_CLASSES_H
diff --git a/src/governance/governance-exceptions.h b/src/governance/exceptions.h
similarity index 94%
rename from src/governance/governance-exceptions.h
rename to src/governance/exceptions.h
index e1962bb80a3a..0c1cacc388a8 100644
--- a/src/governance/governance-exceptions.h
+++ b/src/governance/exceptions.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_GOVERNANCE_GOVERNANCE_EXCEPTIONS_H
-#define BITCOIN_GOVERNANCE_GOVERNANCE_EXCEPTIONS_H
+#ifndef BITCOIN_GOVERNANCE_EXCEPTIONS_H
+#define BITCOIN_GOVERNANCE_EXCEPTIONS_H
 
 #include <exception>
 #include <iostream>
@@ -97,4 +97,4 @@ class CGovernanceException : public std::exception
     }
 };
 
-#endif // BITCOIN_GOVERNANCE_GOVERNANCE_EXCEPTIONS_H
+#endif // BITCOIN_GOVERNANCE_EXCEPTIONS_H
diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index ba5d571aadea..b3996b20aba4 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -7,10 +7,10 @@
 #include <bloom.h>
 #include <chain.h>
 #include <consensus/validation.h>
-#include <governance/governance-classes.h>
-#include <governance/governance-validators.h>
-#include <masternode/masternode-meta.h>
-#include <masternode/masternode-sync.h>
+#include <governance/classes.h>
+#include <governance/validators.h>
+#include <masternode/meta.h>
+#include <masternode/sync.h>
 #include <net_processing.h>
 #include <netfulfilledman.h>
 #include <netmessagemaker.h>
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 38a218840493..40490c5c18f1 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -7,7 +7,7 @@
 
 #include <cachemap.h>
 #include <cachemultimap.h>
-#include <governance/governance-object.h>
+#include <governance/object.h>
 
 class CBloomFilter;
 class CBlockIndex;
diff --git a/src/governance/governance-object.cpp b/src/governance/object.cpp
similarity index 99%
rename from src/governance/governance-object.cpp
rename to src/governance/object.cpp
index 7d96dd49557a..b482a0348964 100644
--- a/src/governance/governance-object.cpp
+++ b/src/governance/object.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 <governance/governance-object.h>
+#include <governance/object.h>
 
 #include <core_io.h>
 #include <evo/deterministicmns.h>
-#include <governance/governance-validators.h>
+#include <governance/validators.h>
 #include <governance/governance.h>
-#include <masternode/masternode-meta.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/meta.h>
+#include <masternode/sync.h>
 #include <messagesigner.h>
 #include <net.h>
 #include <validation.h>
diff --git a/src/governance/governance-object.h b/src/governance/object.h
similarity index 97%
rename from src/governance/governance-object.h
rename to src/governance/object.h
index 44e675262653..9b55887c4215 100644
--- a/src/governance/governance-object.h
+++ b/src/governance/object.h
@@ -2,12 +2,12 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_GOVERNANCE_GOVERNANCE_OBJECT_H
-#define BITCOIN_GOVERNANCE_GOVERNANCE_OBJECT_H
+#ifndef BITCOIN_GOVERNANCE_OBJECT_H
+#define BITCOIN_GOVERNANCE_OBJECT_H
 
-#include <governance/governance-exceptions.h>
-#include <governance/governance-vote.h>
-#include <governance/governance-votedb.h>
+#include <governance/exceptions.h>
+#include <governance/vote.h>
+#include <governance/votedb.h>
 #include <logging.h>
 #include <sync.h>
 
@@ -329,4 +329,4 @@ class CGovernanceObject
 };
 
 
-#endif // BITCOIN_GOVERNANCE_GOVERNANCE_OBJECT_H
+#endif // BITCOIN_GOVERNANCE_OBJECT_H
diff --git a/src/governance/governance-validators.cpp b/src/governance/validators.cpp
similarity index 99%
rename from src/governance/governance-validators.cpp
rename to src/governance/validators.cpp
index 1e1936a1fc4d..a9a43188826f 100644
--- a/src/governance/governance-validators.cpp
+++ b/src/governance/validators.cpp
@@ -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.
 
-#include <governance/governance-object.h>
-#include <governance/governance-validators.h>
+#include <governance/object.h>
+#include <governance/validators.h>
 
 #include <key_io.h>
 #include <timedata.h>
diff --git a/src/governance/governance-validators.h b/src/governance/validators.h
similarity index 88%
rename from src/governance/governance-validators.h
rename to src/governance/validators.h
index 02e0227256cc..2c8ac2a2d54a 100644
--- a/src/governance/governance-validators.h
+++ b/src/governance/validators.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_GOVERNANCE_GOVERNANCE_VALIDATORS_H
-#define BITCOIN_GOVERNANCE_GOVERNANCE_VALIDATORS_H
+#ifndef BITCOIN_GOVERNANCE_VALIDATORS_H
+#define BITCOIN_GOVERNANCE_VALIDATORS_H
 
 #include <string>
 
@@ -45,4 +45,4 @@ class CProposalValidator
     bool CheckURL(const std::string& strURLIn);
 };
 
-#endif // BITCOIN_GOVERNANCE_GOVERNANCE_VALIDATORS_H
+#endif // BITCOIN_GOVERNANCE_VALIDATORS_H
diff --git a/src/governance/governance-vote.cpp b/src/governance/vote.cpp
similarity index 99%
rename from src/governance/governance-vote.cpp
rename to src/governance/vote.cpp
index c50c97494224..709032b52180 100644
--- a/src/governance/governance-vote.cpp
+++ b/src/governance/vote.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 <governance/governance-vote.h>
+#include <governance/vote.h>
 
 #include <bls/bls.h>
 #include <key.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/sync.h>
 #include <messagesigner.h>
 #include <net.h>
 #include <util/system.h>
diff --git a/src/governance/governance-vote.h b/src/governance/vote.h
similarity index 96%
rename from src/governance/governance-vote.h
rename to src/governance/vote.h
index 4ea872a6e7b9..76ee28193910 100644
--- a/src/governance/governance-vote.h
+++ b/src/governance/vote.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_GOVERNANCE_GOVERNANCE_VOTE_H
-#define BITCOIN_GOVERNANCE_GOVERNANCE_VOTE_H
+#ifndef BITCOIN_GOVERNANCE_VOTE_H
+#define BITCOIN_GOVERNANCE_VOTE_H
 
 #include <primitives/transaction.h>
 
@@ -127,4 +127,4 @@ class CGovernanceVote
     }
 };
 
-#endif // BITCOIN_GOVERNANCE_GOVERNANCE_VOTE_H
+#endif // BITCOIN_GOVERNANCE_VOTE_H
diff --git a/src/governance/governance-votedb.cpp b/src/governance/votedb.cpp
similarity index 98%
rename from src/governance/governance-votedb.cpp
rename to src/governance/votedb.cpp
index 9ce2a9bad3eb..13c7556fe5ed 100644
--- a/src/governance/governance-votedb.cpp
+++ b/src/governance/votedb.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 <governance/governance-votedb.h>
+#include <governance/votedb.h>
 
 CGovernanceObjectVoteFile::CGovernanceObjectVoteFile() :
     nMemoryVotes(0),
diff --git a/src/governance/governance-votedb.h b/src/governance/votedb.h
similarity index 91%
rename from src/governance/governance-votedb.h
rename to src/governance/votedb.h
index b88ffdc3e9ac..1d681a9df114 100644
--- a/src/governance/governance-votedb.h
+++ b/src/governance/votedb.h
@@ -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.
 
-#ifndef BITCOIN_GOVERNANCE_GOVERNANCE_VOTEDB_H
-#define BITCOIN_GOVERNANCE_GOVERNANCE_VOTEDB_H
+#ifndef BITCOIN_GOVERNANCE_VOTEDB_H
+#define BITCOIN_GOVERNANCE_VOTEDB_H
 
 #include <list>
 #include <map>
 
-#include <governance/governance-vote.h>
+#include <governance/vote.h>
 #include <serialize.h>
 #include <streams.h>
 #include <uint256.h>
@@ -78,4 +78,4 @@ class CGovernanceObjectVoteFile
     void RebuildIndex();
 };
 
-#endif // BITCOIN_GOVERNANCE_GOVERNANCE_VOTEDB_H
+#endif // BITCOIN_GOVERNANCE_VOTEDB_H
diff --git a/src/init.cpp b/src/init.cpp
index 0e505404aa8a..52256c7c1595 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -57,14 +57,14 @@
 #include <util/validation.h>
 #include <validationinterface.h>
 
-#include <masternode/activemasternode.h>
-#include <coinjoin/coinjoin-server.h>
+#include <masternode/node.h>
+#include <coinjoin/server.h>
 #include <dsnotificationinterface.h>
 #include <flat-database.h>
 #include <governance/governance.h>
-#include <masternode/masternode-meta.h>
-#include <masternode/masternode-sync.h>
-#include <masternode/masternode-utils.h>
+#include <masternode/meta.h>
+#include <masternode/sync.h>
+#include <masternode/utils.h>
 #include <messagesigner.h>
 #include <netfulfilledman.h>
 #include <spork.h>
diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp
index c7b3f7d4ac7b..b7e04a213d4b 100644
--- a/src/interfaces/node.cpp
+++ b/src/interfaces/node.cpp
@@ -10,12 +10,12 @@
 #include <chain.h>
 #include <chainparams.h>
 #include <evo/deterministicmns.h>
-#include <governance/governance-object.h>
+#include <governance/object.h>
 #include <init.h>
 #include <interfaces/handler.h>
 #include <interfaces/wallet.h>
 #include <llmq/quorums_instantsend.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/sync.h>
 #include <net.h>
 #include <net_processing.h>
 #include <netaddress.h>
@@ -39,7 +39,7 @@
 #endif
 
 #include <coinjoin/coinjoin.h>
-#include <coinjoin/coinjoin-client-options.h>
+#include <coinjoin/options.h>
 
 #include <atomic>
 #include <univalue.h>
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp
index 745b9e6d7b7d..5077cbf710a6 100644
--- a/src/interfaces/wallet.cpp
+++ b/src/interfaces/wallet.cpp
@@ -6,7 +6,7 @@
 
 #include <amount.h>
 #include <chain.h>
-#include <coinjoin/coinjoin-client.h>
+#include <coinjoin/client.h>
 #include <consensus/validation.h>
 #include <interfaces/handler.h>
 #include <net.h>
diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
index c4970f6ee4c3..808d5289e8eb 100644
--- a/src/llmq/quorums.cpp
+++ b/src/llmq/quorums.cpp
@@ -12,9 +12,9 @@
 #include <evo/specialtx.h>
 #include <evo/deterministicmns.h>
 
-#include <masternode/activemasternode.h>
+#include <masternode/node.h>
 #include <chainparams.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/sync.h>
 #include <net.h>
 #include <net_processing.h>
 #include <netmessagemaker.h>
diff --git a/src/llmq/quorums_chainlocks.cpp b/src/llmq/quorums_chainlocks.cpp
index 748569f66972..1db0e84383da 100644
--- a/src/llmq/quorums_chainlocks.cpp
+++ b/src/llmq/quorums_chainlocks.cpp
@@ -9,7 +9,7 @@
 
 #include <chain.h>
 #include <consensus/validation.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/sync.h>
 #include <net_processing.h>
 #include <scheduler.h>
 #include <spork.h>
diff --git a/src/llmq/quorums_dkgsession.cpp b/src/llmq/quorums_dkgsession.cpp
index 4800c3415f55..573d8f9ef02d 100644
--- a/src/llmq/quorums_dkgsession.cpp
+++ b/src/llmq/quorums_dkgsession.cpp
@@ -11,8 +11,8 @@
 #include <evo/deterministicmns.h>
 #include <evo/specialtx.h>
 
-#include <masternode/activemasternode.h>
-#include <masternode/masternode-meta.h>
+#include <masternode/node.h>
+#include <masternode/meta.h>
 #include <chainparams.h>
 #include <netmessagemaker.h>
 #include <univalue.h>
diff --git a/src/llmq/quorums_dkgsessionhandler.cpp b/src/llmq/quorums_dkgsessionhandler.cpp
index 6a41c642c19f..7e6cdf687930 100644
--- a/src/llmq/quorums_dkgsessionhandler.cpp
+++ b/src/llmq/quorums_dkgsessionhandler.cpp
@@ -12,7 +12,7 @@
 
 #include <evo/deterministicmns.h>
 
-#include <masternode/activemasternode.h>
+#include <masternode/node.h>
 #include <chainparams.h>
 #include <net_processing.h>
 #include <spork.h>
diff --git a/src/llmq/quorums_instantsend.cpp b/src/llmq/quorums_instantsend.cpp
index 2ab661064b02..f188e9581015 100644
--- a/src/llmq/quorums_instantsend.cpp
+++ b/src/llmq/quorums_instantsend.cpp
@@ -13,7 +13,7 @@
 #include <consensus/validation.h>
 #include <index/txindex.h>
 #include <txmempool.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/sync.h>
 #include <net_processing.h>
 #include <spork.h>
 #include <validation.h>
diff --git a/src/llmq/quorums_signing.cpp b/src/llmq/quorums_signing.cpp
index 27d13f96cce1..456cc00f84b4 100644
--- a/src/llmq/quorums_signing.cpp
+++ b/src/llmq/quorums_signing.cpp
@@ -8,7 +8,7 @@
 #include <llmq/quorums_utils.h>
 #include <llmq/quorums_signing_shares.h>
 
-#include <masternode/activemasternode.h>
+#include <masternode/node.h>
 #include <bls/bls_batchverifier.h>
 #include <chainparams.h>
 #include <cxxtimer.hpp>
diff --git a/src/llmq/quorums_signing_shares.cpp b/src/llmq/quorums_signing_shares.cpp
index 473b79b281f9..1c391c193240 100644
--- a/src/llmq/quorums_signing_shares.cpp
+++ b/src/llmq/quorums_signing_shares.cpp
@@ -10,7 +10,7 @@
 
 
 #include <evo/deterministicmns.h>
-#include <masternode/activemasternode.h>
+#include <masternode/node.h>
 #include <bls/bls_batchverifier.h>
 #include <net_processing.h>
 #include <netmessagemaker.h>
diff --git a/src/llmq/quorums_utils.cpp b/src/llmq/quorums_utils.cpp
index 9f18d2fde90b..df90074a7630 100644
--- a/src/llmq/quorums_utils.cpp
+++ b/src/llmq/quorums_utils.cpp
@@ -15,7 +15,7 @@
 #include <validation.h>
 #include <versionbits.h>
 
-#include <masternode/masternode-meta.h>
+#include <masternode/meta.h>
 
 namespace llmq
 {
diff --git a/src/masternode/masternode-meta.cpp b/src/masternode/meta.cpp
similarity index 98%
rename from src/masternode/masternode-meta.cpp
rename to src/masternode/meta.cpp
index a5e9328adf3f..2a4df3349ab2 100644
--- a/src/masternode/masternode-meta.cpp
+++ b/src/masternode/meta.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 <masternode/masternode-meta.h>
+#include <masternode/meta.h>
 
 #include <timedata.h>
 
diff --git a/src/masternode/masternode-meta.h b/src/masternode/meta.h
similarity index 97%
rename from src/masternode/masternode-meta.h
rename to src/masternode/meta.h
index a78bcaa22a08..1f54b9bf21d5 100644
--- a/src/masternode/masternode-meta.h
+++ b/src/masternode/meta.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_MASTERNODE_MASTERNODE_META_H
-#define BITCOIN_MASTERNODE_MASTERNODE_META_H
+#ifndef BITCOIN_MASTERNODE_META_H
+#define BITCOIN_MASTERNODE_META_H
 
 #include <serialize.h>
 
@@ -151,4 +151,4 @@ class CMasternodeMetaMan
 
 extern CMasternodeMetaMan mmetaman;
 
-#endif // BITCOIN_MASTERNODE_MASTERNODE_META_H
+#endif // BITCOIN_MASTERNODE_META_H
diff --git a/src/masternode/activemasternode.cpp b/src/masternode/node.cpp
similarity index 99%
rename from src/masternode/activemasternode.cpp
rename to src/masternode/node.cpp
index 43d477a29e6f..219fcf219cba 100644
--- a/src/masternode/activemasternode.cpp
+++ b/src/masternode/node.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <masternode/activemasternode.h>
+#include <masternode/node.h>
 
 #include <evo/deterministicmns.h>
 
diff --git a/src/masternode/activemasternode.h b/src/masternode/node.h
similarity index 92%
rename from src/masternode/activemasternode.h
rename to src/masternode/node.h
index c7f4af1ae48c..0b1baf4df747 100644
--- a/src/masternode/activemasternode.h
+++ b/src/masternode/node.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_MASTERNODE_ACTIVEMASTERNODE_H
-#define BITCOIN_MASTERNODE_ACTIVEMASTERNODE_H
+#ifndef BITCOIN_MASTERNODE_NODE_H
+#define BITCOIN_MASTERNODE_NODE_H
 
 #include <chainparams.h>
 #include <primitives/transaction.h>
@@ -62,4 +62,4 @@ class CActiveMasternodeManager : public CValidationInterface
     bool GetLocalAddress(CService& addrRet);
 };
 
-#endif // BITCOIN_MASTERNODE_ACTIVEMASTERNODE_H
+#endif // BITCOIN_MASTERNODE_NODE_H
diff --git a/src/masternode/masternode-payments.cpp b/src/masternode/payments.cpp
similarity index 98%
rename from src/masternode/masternode-payments.cpp
rename to src/masternode/payments.cpp
index cea81f0199d8..fbf60d40d02b 100644
--- a/src/masternode/masternode-payments.cpp
+++ b/src/masternode/payments.cpp
@@ -4,10 +4,10 @@
 
 #include <evo/deterministicmns.h>
 #include <governance/governance.h>
-#include <governance/governance-classes.h>
-#include <masternode/activemasternode.h>
-#include <masternode/masternode-payments.h>
-#include <masternode/masternode-sync.h>
+#include <governance/classes.h>
+#include <masternode/node.h>
+#include <masternode/payments.h>
+#include <masternode/sync.h>
 #include <netfulfilledman.h>
 #include <netmessagemaker.h>
 #include <validation.h>
diff --git a/src/masternode/masternode-payments.h b/src/masternode/payments.h
similarity index 89%
rename from src/masternode/masternode-payments.h
rename to src/masternode/payments.h
index 8404d0afa7df..0d82d0685f9e 100644
--- a/src/masternode/masternode-payments.h
+++ b/src/masternode/payments.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_MASTERNODE_MASTERNODE_PAYMENTS_H
-#define BITCOIN_MASTERNODE_MASTERNODE_PAYMENTS_H
+#ifndef BITCOIN_MASTERNODE_PAYMENTS_H
+#define BITCOIN_MASTERNODE_PAYMENTS_H
 
 class CMasternodePayments;
 
@@ -28,4 +28,4 @@ class CMasternodePayments
     static bool GetMasternodeTxOuts(int nBlockHeight, CAmount blockReward, std::vector<CTxOut>& voutMasternodePaymentsRet);
 };
 
-#endif // BITCOIN_MASTERNODE_MASTERNODE_PAYMENTS_H
+#endif // BITCOIN_MASTERNODE_PAYMENTS_H
diff --git a/src/masternode/masternode-sync.cpp b/src/masternode/sync.cpp
similarity index 99%
rename from src/masternode/masternode-sync.cpp
rename to src/masternode/sync.cpp
index fbc1c09912ee..71dc233c9418 100644
--- a/src/masternode/masternode-sync.cpp
+++ b/src/masternode/sync.cpp
@@ -4,7 +4,7 @@
 
 #include <governance/governance.h>
 #include <validation.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/sync.h>
 #include <netfulfilledman.h>
 #include <netmessagemaker.h>
 #include <shutdown.h>
diff --git a/src/masternode/masternode-sync.h b/src/masternode/sync.h
similarity index 95%
rename from src/masternode/masternode-sync.h
rename to src/masternode/sync.h
index 2f7334017b0b..d261038a6c06 100644
--- a/src/masternode/masternode-sync.h
+++ b/src/masternode/sync.h
@@ -1,8 +1,8 @@
 // Copyright (c) 2014-2021 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#ifndef BITCOIN_MASTERNODE_MASTERNODE_SYNC_H
-#define BITCOIN_MASTERNODE_MASTERNODE_SYNC_H
+#ifndef BITCOIN_MASTERNODE_SYNC_H
+#define BITCOIN_MASTERNODE_SYNC_H
 
 #include <atomic>
 
@@ -74,4 +74,4 @@ class CMasternodeSync
     void DoMaintenance(CConnman &connman);
 };
 
-#endif // BITCOIN_MASTERNODE_MASTERNODE_SYNC_H
+#endif // BITCOIN_MASTERNODE_SYNC_H
diff --git a/src/masternode/masternode-utils.cpp b/src/masternode/utils.cpp
similarity index 95%
rename from src/masternode/masternode-utils.cpp
rename to src/masternode/utils.cpp
index f969fedf8feb..cf0abaa9fae9 100644
--- a/src/masternode/masternode-utils.cpp
+++ b/src/masternode/utils.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 <masternode/masternode-utils.h>
+#include <masternode/utils.h>
 #include <evo/deterministicmns.h>
 
 #ifdef ENABLE_WALLET
-#include <coinjoin/coinjoin-client.h>
+#include <coinjoin/client.h>
 #endif
-#include <masternode/masternode-sync.h>
+#include <masternode/sync.h>
 #include <net.h>
 #include <shutdown.h>
 #include <validation.h>
diff --git a/src/masternode/masternode-utils.h b/src/masternode/utils.h
similarity index 72%
rename from src/masternode/masternode-utils.h
rename to src/masternode/utils.h
index 72a1eb5efc64..7dcfb69647a9 100644
--- a/src/masternode/masternode-utils.h
+++ b/src/masternode/utils.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_MASTERNODE_MASTERNODE_UTILS_H
-#define BITCOIN_MASTERNODE_MASTERNODE_UTILS_H
+#ifndef BITCOIN_MASTERNODE_UTILS_H
+#define BITCOIN_MASTERNODE_UTILS_H
 
 class CConnman;
 
@@ -14,4 +14,4 @@ class CMasternodeUtils
     static void DoMaintenance(CConnman &connman);
 };
 
-#endif // BITCOIN_MASTERNODE_MASTERNODE_UTILS_H
+#endif // BITCOIN_MASTERNODE_UTILS_H
diff --git a/src/miner.cpp b/src/miner.cpp
index 607aa0e2df7b..1cd7f3d80c07 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -34,8 +34,8 @@
 #include <llmq/quorums_blockprocessor.h>
 #include <llmq/quorums_chainlocks.h>
 #include <llmq/quorums_utils.h>
-#include <masternode/masternode-payments.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/payments.h>
+#include <masternode/sync.h>
 
 #include <algorithm>
 #include <queue>
diff --git a/src/net.cpp b/src/net.cpp
index 9c088b64e37c..0a1670997d03 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -25,8 +25,8 @@
 #include <util/strencodings.h>
 #include <validation.h>
 
-#include <masternode/masternode-meta.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/meta.h>
+#include <masternode/sync.h>
 #include <coinjoin/coinjoin.h>
 #include <evo/deterministicmns.h>
 
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index f8226d35fd74..08153e19c7e6 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -40,13 +40,13 @@
 
 #include <spork.h>
 #include <governance/governance.h>
-#include <masternode/masternode-payments.h>
-#include <masternode/masternode-sync.h>
-#include <masternode/masternode-meta.h>
+#include <masternode/payments.h>
+#include <masternode/sync.h>
+#include <masternode/meta.h>
 #ifdef ENABLE_WALLET
-#include <coinjoin/coinjoin-client.h>
+#include <coinjoin/client.h>
 #endif // ENABLE_WALLET
-#include <coinjoin/coinjoin-server.h>
+#include <coinjoin/server.h>
 
 #include <evo/deterministicmns.h>
 #include <evo/mnauth.h>
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 88c65cdf5a0c..a3b5a1e3bdde 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -20,7 +20,7 @@
 #include <txdb.h> // for -dbcache defaults
 
 #ifdef ENABLE_WALLET
-#include <coinjoin/coinjoin-client-options.h>
+#include <coinjoin/options.h>
 #endif
 
 #include <QNetworkProxy>
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index 481546c72e03..36cd3c40340f 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -15,7 +15,7 @@
 #include <qt/utilitydialog.h>
 #include <qt/walletmodel.h>
 
-#include <coinjoin/coinjoin-client-options.h>
+#include <coinjoin/options.h>
 
 #include <QAbstractItemDelegate>
 #include <QPainter>
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp
index 32a2678184b5..973f05ceaef3 100644
--- a/src/qt/test/wallettests.cpp
+++ b/src/qt/test/wallettests.cpp
@@ -1,7 +1,7 @@
 #include <qt/test/wallettests.h>
 #include <qt/test/util.h>
 
-#include <coinjoin/coinjoin-client.h>
+#include <coinjoin/client.h>
 #include <interfaces/node.h>
 #include <base58.h>
 #include <qt/bitcoinamountfield.h>
diff --git a/src/rpc/coinjoin.cpp b/src/rpc/coinjoin.cpp
index bccf9315fe21..4eed603763f4 100644
--- a/src/rpc/coinjoin.cpp
+++ b/src/rpc/coinjoin.cpp
@@ -4,11 +4,11 @@
 
 #include <validation.h>
 #ifdef ENABLE_WALLET
-#include <coinjoin/coinjoin-client.h>
-#include <coinjoin/coinjoin-client-options.h>
+#include <coinjoin/client.h>
+#include <coinjoin/options.h>
 #include <wallet/rpcwallet.h>
 #endif // ENABLE_WALLET
-#include <coinjoin/coinjoin-server.h>
+#include <coinjoin/server.h>
 #include <rpc/server.h>
 #include <util/strencodings.h>
 
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index d525a57a718c..e40dc3dbd898 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -6,13 +6,13 @@
 #include <core_io.h>
 #include <evo/deterministicmns.h>
 #include <governance/governance.h>
-#include <governance/governance-vote.h>
-#include <governance/governance-classes.h>
-#include <governance/governance-validators.h>
+#include <governance/vote.h>
+#include <governance/classes.h>
+#include <governance/validators.h>
 #include <index/txindex.h>
 #include <txmempool.h>
-#include <masternode/activemasternode.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/node.h>
+#include <masternode/sync.h>
 #include <messagesigner.h>
 #include <net.h>
 #include <rpc/server.h>
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index e0007c39d5b1..1e69620631d4 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -3,10 +3,10 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <evo/deterministicmns.h>
-#include <governance/governance-classes.h>
+#include <governance/classes.h>
 #include <index/txindex.h>
-#include <masternode/activemasternode.h>
-#include <masternode/masternode-payments.h>
+#include <masternode/node.h>
+#include <masternode/payments.h>
 #include <net.h>
 #include <netbase.h>
 #include <rpc/server.h>
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 5b52f6873c58..376ae7c10aed 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -31,9 +31,9 @@
 #include <versionbitsinfo.h>
 #include <warnings.h>
 
-#include <governance/governance-classes.h>
+#include <governance/classes.h>
 #include <governance/governance.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/sync.h>
 
 #include <evo/deterministicmns.h>
 
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 70a352459836..08ca25ea9148 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -24,7 +24,7 @@
 #include <util/validation.h>
 #include <warnings.h>
 
-#include <masternode/masternode-sync.h>
+#include <masternode/sync.h>
 #include <spork.h>
 
 #include <stdint.h>
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index 3eebef22ccea..f5724142be78 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -28,7 +28,7 @@
 
 #include <bls/bls.h>
 
-#include <masternode/masternode-meta.h>
+#include <masternode/meta.h>
 
 #ifdef ENABLE_WALLET
 extern UniValue signrawtransaction(const JSONRPCRequest& request);
diff --git a/src/rpc/rpcquorums.cpp b/src/rpc/rpcquorums.cpp
index 6bdcf61c4aee..77ca9be93a44 100644
--- a/src/rpc/rpcquorums.cpp
+++ b/src/rpc/rpcquorums.cpp
@@ -7,7 +7,7 @@
 #include <rpc/server.h>
 #include <validation.h>
 
-#include <masternode/activemasternode.h>
+#include <masternode/node.h>
 #include <evo/deterministicmns.h>
 
 #include <llmq/quorums.h>
diff --git a/src/test/governance_validators_tests.cpp b/src/test/governance_validators_tests.cpp
index 68bbde20e3ce..4cd77faef846 100644
--- a/src/test/governance_validators_tests.cpp
+++ b/src/test/governance_validators_tests.cpp
@@ -1,6 +1,6 @@
 // Copyright (c) 2014-2020 The Dash Core developers
 
-#include <governance/governance-validators.h>
+#include <governance/validators.h>
 #include <util/strencodings.h>
 
 #include <test/data/proposals_valid.json.h>
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 78d75e572fa5..aebe1479821d 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -9,7 +9,7 @@
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
 #include <validation.h>
-#include <masternode/masternode-payments.h>
+#include <masternode/payments.h>
 #include <miner.h>
 #include <policy/policy.h>
 #include <pow.h>
diff --git a/src/validation.cpp b/src/validation.cpp
index a63596dd18ff..fdcb8b9102cf 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -45,7 +45,7 @@
 #include <versionbitsinfo.h>
 #include <warnings.h>
 
-#include <masternode/masternode-payments.h>
+#include <masternode/payments.h>
 
 #include <evo/specialtx.h>
 #include <evo/deterministicmns.h>
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp
index 4a443b41a805..d695829a65c4 100644
--- a/src/wallet/init.cpp
+++ b/src/wallet/init.cpp
@@ -16,8 +16,8 @@
 #include <wallet/wallet.h>
 #include <wallet/walletutil.h>
 
-#include <coinjoin/coinjoin-client.h>
-#include <coinjoin/coinjoin-client-options.h>
+#include <coinjoin/client.h>
+#include <coinjoin/options.h>
 
 #include <functional>
 
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 507653df5453..e8a6f7fcee7f 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -34,8 +34,8 @@
 #include <wallet/walletutil.h>
 #include <key_io.h>
 
-#include <coinjoin/coinjoin-client.h>
-#include <coinjoin/coinjoin-client-options.h>
+#include <coinjoin/client.h>
+#include <coinjoin/options.h>
 #include <llmq/quorums_chainlocks.h>
 #include <llmq/quorums_instantsend.h>
 
diff --git a/src/wallet/test/coinjoin_tests.cpp b/src/wallet/test/coinjoin_tests.cpp
index 807adbbc446a..73e8d73fa770 100644
--- a/src/wallet/test/coinjoin_tests.cpp
+++ b/src/wallet/test/coinjoin_tests.cpp
@@ -5,7 +5,7 @@
 #include <test/test_dash.h>
 
 #include <amount.h>
-#include <coinjoin/coinjoin-util.h>
+#include <coinjoin/util.h>
 #include <coinjoin/coinjoin.h>
 #include <consensus/validation.h>
 #include <validation.h>
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index be4d1d5abcbc..a45d240b7e87 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -32,8 +32,8 @@
 #include <wallet/fees.h>
 #include <warnings.h>
 
-#include <coinjoin/coinjoin-client.h>
-#include <coinjoin/coinjoin-client-options.h>
+#include <coinjoin/client.h>
+#include <coinjoin/options.h>
 #include <governance/governance.h>
 #include <evo/deterministicmns.h>
 #include <keepass.h>
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index a6f3a14754ac..04b15c6f1d61 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -23,7 +23,7 @@
 #include <wallet/walletdb.h>
 #include <wallet/walletutil.h>
 
-#include <governance/governance-object.h>
+#include <governance/object.h>
 
 #include <algorithm>
 #include <atomic>
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 563dc917ab6a..2c5a774816b4 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -10,7 +10,7 @@
 #include <consensus/validation.h>
 #include <key_io.h>
 #include <fs.h>
-#include <governance/governance-object.h>
+#include <governance/object.h>
 #include <protocol.h>
 #include <serialize.h>
 #include <sync.h>
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index 1da8401fa05a..5b037f2bac99 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -12,8 +12,8 @@
 #include <validation.h>
 #include <zmq/zmqutil.h>
 
-#include <governance/governance-object.h>
-#include <governance/governance-vote.h>
+#include <governance/object.h>
+#include <governance/vote.h>
 
 #include <llmq/quorums_chainlocks.h>
 #include <llmq/quorums_instantsend.h>
diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
index 8dc85c2a1727..bdd468e15cbb 100755
--- a/test/lint/lint-circular-dependencies.sh
+++ b/test/lint/lint-circular-dependencies.sh
@@ -36,7 +36,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/signverifymessagedialog -> qt/addressbookpage"
     "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/sendcoinsdialog -> qt/sendcoinsentry -> qt/addressbookpage"
     # Dash
-    "coinjoin/coinjoin-server -> net_processing -> coinjoin/coinjoin-server"
+    "coinjoin/server -> net_processing -> coinjoin/server"
     "evo/cbtx -> evo/simplifiedmns -> evo/cbtx"
     "evo/cbtx -> evo/specialtx -> evo/cbtx"
     "evo/deterministicmns -> evo/providertx -> evo/deterministicmns"
@@ -49,11 +49,12 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "evo/specialtx -> llmq/quorums_blockprocessor -> evo/specialtx"
     "evo/specialtx -> llmq/quorums_commitment -> evo/specialtx"
     "evo/specialtx -> validation -> evo/specialtx"
-    "governance/governance -> governance/governance-classes -> governance/governance"
-    "governance/governance -> governance/governance-object -> governance/governance"
-    "governance/governance -> masternode/masternode-sync -> governance/governance"
+    "governance/classes -> governance/governance -> governance/classes"
+    "governance/classes -> governance/governance -> net_processing -> masternode/payments -> governance/classes"
+    "governance/governance -> governance/object -> governance/governance"
+    "governance/governance -> masternode/sync -> governance/governance"
     "governance/governance -> net_processing -> governance/governance"
-    "governance/governance-object -> governance/governance-validators -> governance/governance-object"
+    "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"
@@ -66,7 +67,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "llmq/quorums_signing -> net_processing -> llmq/quorums_signing"
     "llmq/quorums_signing_shares -> net_processing -> llmq/quorums_signing_shares"
     "logging -> util/system -> logging"
-    "masternode/masternode-payments -> validation -> masternode/masternode-payments"
+    "masternode/payments -> validation -> masternode/payments"
     "net -> netmessagemaker -> net"
     "net_processing -> spork -> net_processing"
     "netaddress -> netbase -> netaddress"
@@ -82,7 +83,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "logging -> util/system -> random -> logging"
     "logging -> util/system -> sync -> logging"
     "logging -> util/system -> stacktraces -> logging"
-    "coinjoin/coinjoin-client -> coinjoin/coinjoin-util -> wallet/wallet -> coinjoin/coinjoin-client"
+    "coinjoin/client -> coinjoin/util -> wallet/wallet -> coinjoin/client"
     "qt/appearancewidget -> qt/guiutil -> qt/optionsdialog -> qt/appearancewidget"
     "qt/bitcoinaddressvalidator -> qt/guiutil -> qt/qvalidatedlineedit -> qt/bitcoinaddressvalidator"
     "qt/guiutil -> qt/optionsdialog -> qt/optionsmodel -> qt/guiutil"
@@ -93,22 +94,18 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "evo/specialtx -> llmq/quorums_blockprocessor -> net_processing -> txmempool -> evo/specialtx"
     "evo/providertx -> evo/specialtx -> llmq/quorums_blockprocessor -> net_processing -> txmempool -> evo/providertx"
 
-    "coinjoin/coinjoin-client -> net_processing -> coinjoin/coinjoin-client"
+    "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"
     "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/masternode-payments -> evo/deterministicmns"
-    "core_io -> evo/cbtx -> llmq/quorums_blockprocessor -> net_processing -> masternode/masternode-payments -> governance/governance-classes -> core_io"
-    "evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> masternode/masternode-payments -> masternode/activemasternode -> evo/deterministicmns"
-    "evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net -> masternode/masternode-sync -> evo/deterministicmns"
-    "governance/governance -> net_processing -> masternode/masternode-payments -> governance/governance"
-    "core_io -> evo/cbtx -> llmq/quorums_blockprocessor -> net_processing -> masternode/masternode-payments -> governance/governance-classes -> governance/governance-object -> core_io"
-    "evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> masternode/masternode-payments -> governance/governance-classes -> governance/governance-object -> evo/deterministicmns"
+    "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"
+    "governance/governance -> net_processing -> masternode/payments -> governance/governance"
     "evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net -> evo/deterministicmns"
-    "evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> masternode/masternode-payments -> governance/governance-classes -> governance/governance-object -> governance/governance-vote -> evo/deterministicmns"
     "coinjoin/coinjoin -> llmq/quorums_chainlocks -> net -> coinjoin/coinjoin"
 )