diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj
index 4b7d562e61..34e502c786 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj
+++ b/Builds/VisualStudio2013/RippleD.vcxproj
@@ -2645,11 +2645,11 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\peerfinder\impl\Logic.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\peerfinder\impl\Manager.cpp">
+    <ClCompile Include="..\..\src\ripple\peerfinder\impl\PeerfinderConfig.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\peerfinder\impl\PeerfinderConfig.cpp">
+    <ClCompile Include="..\..\src\ripple\peerfinder\impl\PeerfinderManager.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
@@ -2677,7 +2677,7 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\peerfinder\make_Manager.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\peerfinder\Manager.h">
+    <ClInclude Include="..\..\src\ripple\peerfinder\PeerfinderManager.h">
     </ClInclude>
     <None Include="..\..\src\ripple\peerfinder\README.md">
     </None>
@@ -3044,15 +3044,15 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\resource\impl\Logic.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\resource\impl\Manager.cpp">
+    <ClCompile Include="..\..\src\ripple\resource\impl\ResourceManager.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\resource\impl\Tuning.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\resource\Manager.h">
-    </ClInclude>
     <None Include="..\..\src\ripple\resource\README.md">
     </None>
+    <ClInclude Include="..\..\src\ripple\resource\ResourceManager.h">
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\resource\tests\Logic.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -3060,7 +3060,7 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\rpc\Coroutine.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\rpc\handlers\AccountCurrencies.cpp">
+    <ClCompile Include="..\..\src\ripple\rpc\handlers\AccountCurrenciesHandler.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\rpc\handlers\AccountInfo.cpp">
@@ -3124,7 +3124,7 @@
     <ClCompile Include="..\..\src\ripple\rpc\handlers\LedgerAccept.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\rpc\handlers\LedgerCleaner.cpp">
+    <ClCompile Include="..\..\src\ripple\rpc\handlers\LedgerCleanerHandler.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\rpc\handlers\LedgerClosed.cpp">
@@ -3181,10 +3181,10 @@
     <ClCompile Include="..\..\src\ripple\rpc\handlers\ServerState.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\rpc\handlers\Sign.cpp">
+    <ClCompile Include="..\..\src\ripple\rpc\handlers\SignFor.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\rpc\handlers\SignFor.cpp">
+    <ClCompile Include="..\..\src\ripple\rpc\handlers\SignHandler.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\rpc\handlers\Stop.cpp">
@@ -3512,7 +3512,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\json.cpp">
+    <ClCompile Include="..\..\src\ripple\test\jtx\impl\jtx_json.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
@@ -3576,10 +3576,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClInclude Include="..\..\src\ripple\test\jtx\json.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\test\jtx\JTx.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\test\jtx\jtx_json.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\test\jtx\memo.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\test\jtx\multisign.h">
@@ -3776,9 +3776,6 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\validators\impl\Logic.h">
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\validators\impl\Manager.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
     <ClInclude Include="..\..\src\ripple\validators\impl\Store.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\validators\impl\StoreSqdb.cpp">
@@ -3788,13 +3785,16 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\validators\impl\Tuning.h">
     </ClInclude>
+    <ClCompile Include="..\..\src\ripple\validators\impl\ValidatorManager.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClInclude Include="..\..\src\ripple\validators\make_Manager.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\validators\Manager.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\validators\tests\Validators.test.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClInclude Include="..\..\src\ripple\validators\ValidatorManager.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\websocket\AutoSocket.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\websocket\Config04.h">
diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters
index 7a6ef94178..61688028a0 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters
@@ -3357,10 +3357,10 @@
     <ClInclude Include="..\..\src\ripple\peerfinder\impl\Logic.h">
       <Filter>ripple\peerfinder\impl</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\peerfinder\impl\Manager.cpp">
+    <ClCompile Include="..\..\src\ripple\peerfinder\impl\PeerfinderConfig.cpp">
       <Filter>ripple\peerfinder\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\peerfinder\impl\PeerfinderConfig.cpp">
+    <ClCompile Include="..\..\src\ripple\peerfinder\impl\PeerfinderManager.cpp">
       <Filter>ripple\peerfinder\impl</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\peerfinder\impl\Reporting.h">
@@ -3393,7 +3393,7 @@
     <ClInclude Include="..\..\src\ripple\peerfinder\make_Manager.h">
       <Filter>ripple\peerfinder</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\peerfinder\Manager.h">
+    <ClInclude Include="..\..\src\ripple\peerfinder\PeerfinderManager.h">
       <Filter>ripple\peerfinder</Filter>
     </ClInclude>
     <None Include="..\..\src\ripple\peerfinder\README.md">
@@ -3762,18 +3762,18 @@
     <ClInclude Include="..\..\src\ripple\resource\impl\Logic.h">
       <Filter>ripple\resource\impl</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\resource\impl\Manager.cpp">
+    <ClCompile Include="..\..\src\ripple\resource\impl\ResourceManager.cpp">
       <Filter>ripple\resource\impl</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\resource\impl\Tuning.h">
       <Filter>ripple\resource\impl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\resource\Manager.h">
-      <Filter>ripple\resource</Filter>
-    </ClInclude>
     <None Include="..\..\src\ripple\resource\README.md">
       <Filter>ripple\resource</Filter>
     </None>
+    <ClInclude Include="..\..\src\ripple\resource\ResourceManager.h">
+      <Filter>ripple\resource</Filter>
+    </ClInclude>
     <ClCompile Include="..\..\src\ripple\resource\tests\Logic.test.cpp">
       <Filter>ripple\resource\tests</Filter>
     </ClCompile>
@@ -3783,7 +3783,7 @@
     <ClInclude Include="..\..\src\ripple\rpc\Coroutine.h">
       <Filter>ripple\rpc</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\rpc\handlers\AccountCurrencies.cpp">
+    <ClCompile Include="..\..\src\ripple\rpc\handlers\AccountCurrenciesHandler.cpp">
       <Filter>ripple\rpc\handlers</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\rpc\handlers\AccountInfo.cpp">
@@ -3849,7 +3849,7 @@
     <ClCompile Include="..\..\src\ripple\rpc\handlers\LedgerAccept.cpp">
       <Filter>ripple\rpc\handlers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\rpc\handlers\LedgerCleaner.cpp">
+    <ClCompile Include="..\..\src\ripple\rpc\handlers\LedgerCleanerHandler.cpp">
       <Filter>ripple\rpc\handlers</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\rpc\handlers\LedgerClosed.cpp">
@@ -3906,10 +3906,10 @@
     <ClCompile Include="..\..\src\ripple\rpc\handlers\ServerState.cpp">
       <Filter>ripple\rpc\handlers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\rpc\handlers\Sign.cpp">
+    <ClCompile Include="..\..\src\ripple\rpc\handlers\SignFor.cpp">
       <Filter>ripple\rpc\handlers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\rpc\handlers\SignFor.cpp">
+    <ClCompile Include="..\..\src\ripple\rpc\handlers\SignHandler.cpp">
       <Filter>ripple\rpc\handlers</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\rpc\handlers\Stop.cpp">
@@ -4278,7 +4278,7 @@
     <ClCompile Include="..\..\src\ripple\test\jtx\impl\flags.cpp">
       <Filter>ripple\test\jtx\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\test\jtx\impl\json.cpp">
+    <ClCompile Include="..\..\src\ripple\test\jtx\impl\jtx_json.cpp">
       <Filter>ripple\test\jtx\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\test\jtx\impl\memo.cpp">
@@ -4326,10 +4326,10 @@
     <ClCompile Include="..\..\src\ripple\test\jtx\impl\utility.cpp">
       <Filter>ripple\test\jtx\impl</Filter>
     </ClCompile>
-    <ClInclude Include="..\..\src\ripple\test\jtx\json.h">
+    <ClInclude Include="..\..\src\ripple\test\jtx\JTx.h">
       <Filter>ripple\test\jtx</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\test\jtx\JTx.h">
+    <ClInclude Include="..\..\src\ripple\test\jtx\jtx_json.h">
       <Filter>ripple\test\jtx</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\test\jtx\memo.h">
@@ -4524,9 +4524,6 @@
     <ClInclude Include="..\..\src\ripple\validators\impl\Logic.h">
       <Filter>ripple\validators\impl</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\ripple\validators\impl\Manager.cpp">
-      <Filter>ripple\validators\impl</Filter>
-    </ClCompile>
     <ClInclude Include="..\..\src\ripple\validators\impl\Store.h">
       <Filter>ripple\validators\impl</Filter>
     </ClInclude>
@@ -4539,15 +4536,18 @@
     <ClInclude Include="..\..\src\ripple\validators\impl\Tuning.h">
       <Filter>ripple\validators\impl</Filter>
     </ClInclude>
+    <ClCompile Include="..\..\src\ripple\validators\impl\ValidatorManager.cpp">
+      <Filter>ripple\validators\impl</Filter>
+    </ClCompile>
     <ClInclude Include="..\..\src\ripple\validators\make_Manager.h">
       <Filter>ripple\validators</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\validators\Manager.h">
-      <Filter>ripple\validators</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\ripple\validators\tests\Validators.test.cpp">
       <Filter>ripple\validators\tests</Filter>
     </ClCompile>
+    <ClInclude Include="..\..\src\ripple\validators\ValidatorManager.h">
+      <Filter>ripple\validators</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\websocket\AutoSocket.h">
       <Filter>ripple\websocket</Filter>
     </ClInclude>
diff --git a/src/ripple/app/ledger/impl/LedgerMaster.cpp b/src/ripple/app/ledger/impl/LedgerMaster.cpp
index e6ba6a0bfb..f36df95ee0 100644
--- a/src/ripple/app/ledger/impl/LedgerMaster.cpp
+++ b/src/ripple/app/ledger/impl/LedgerMaster.cpp
@@ -44,7 +44,7 @@
 #include <ripple/protocol/digest.h>
 #include <ripple/protocol/HashPrefix.h>
 #include <ripple/resource/Fees.h>
-#include <ripple/validators/Manager.h>
+#include <ripple/validators/ValidatorManager.h>
 #include <algorithm>
 #include <cassert>
 #include <beast/cxx14/memory.h> // <memory>
diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp
index cb23ebe62e..9c4570d430 100644
--- a/src/ripple/app/misc/NetworkOPs.cpp
+++ b/src/ripple/app/misc/NetworkOPs.cpp
@@ -59,7 +59,7 @@
 #include <ripple/protocol/Indexes.h>
 #include <ripple/resource/Fees.h>
 #include <ripple/resource/Gossip.h>
-#include <ripple/resource/Manager.h>
+#include <ripple/resource/ResourceManager.h>
 #include <beast/module/core/text/LexicalCast.h>
 #include <beast/module/core/thread/DeadlineTimer.h>
 #include <beast/module/core/system/SystemStats.h>
diff --git a/src/ripple/overlay/impl/OverlayImpl.h b/src/ripple/overlay/impl/OverlayImpl.h
index 7c01c71da7..3c183fda7e 100644
--- a/src/ripple/overlay/impl/OverlayImpl.h
+++ b/src/ripple/overlay/impl/OverlayImpl.h
@@ -28,8 +28,8 @@
 #include <ripple/basics/Resolver.h>
 #include <ripple/basics/chrono.h>
 #include <ripple/basics/UnorderedContainers.h>
-#include <ripple/peerfinder/Manager.h>
-#include <ripple/resource/Manager.h>
+#include <ripple/peerfinder/PeerfinderManager.h>
+#include <ripple/resource/ResourceManager.h>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/context.hpp>
 #include <boost/asio/strand.hpp>
diff --git a/src/ripple/overlay/impl/PeerImp.h b/src/ripple/overlay/impl/PeerImp.h
index b6c386151b..16236f8857 100644
--- a/src/ripple/overlay/impl/PeerImp.h
+++ b/src/ripple/overlay/impl/PeerImp.h
@@ -33,7 +33,7 @@
 #include <ripple/core/LoadEvent.h>
 #include <ripple/protocol/Protocol.h>
 #include <ripple/protocol/STTx.h>
-#include <ripple/validators/Manager.h>
+#include <ripple/validators/ValidatorManager.h>
 #include <beast/ByteOrder.h>
 #include <beast/asio/IPAddressConversion.h>
 #include <beast/asio/placeholders.h>
diff --git a/src/ripple/overlay/make_Overlay.h b/src/ripple/overlay/make_Overlay.h
index 12aaa7f5b7..4d66c2182b 100644
--- a/src/ripple/overlay/make_Overlay.h
+++ b/src/ripple/overlay/make_Overlay.h
@@ -22,7 +22,7 @@
 
 #include <ripple/server/ServerHandler.h>
 #include <ripple/overlay/Overlay.h>
-#include <ripple/resource/Manager.h>
+#include <ripple/resource/ResourceManager.h>
 #include <ripple/basics/Resolver.h>
 #include <beast/threads/Stoppable.h>
 #include <beast/module/core/files/File.h>
diff --git a/src/ripple/peerfinder/Manager.h b/src/ripple/peerfinder/PeerfinderManager.h
similarity index 100%
rename from src/ripple/peerfinder/Manager.h
rename to src/ripple/peerfinder/PeerfinderManager.h
diff --git a/src/ripple/peerfinder/impl/Bootcache.h b/src/ripple/peerfinder/impl/Bootcache.h
index 6cc0c41983..a0a7b5961a 100644
--- a/src/ripple/peerfinder/impl/Bootcache.h
+++ b/src/ripple/peerfinder/impl/Bootcache.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PEERFINDER_BOOTCACHE_H_INCLUDED
 #define RIPPLE_PEERFINDER_BOOTCACHE_H_INCLUDED
 
-#include <ripple/peerfinder/Manager.h>
+#include <ripple/peerfinder/PeerfinderManager.h>
 #include <ripple/peerfinder/impl/Store.h>
 #include <beast/utility/Journal.h>
 #include <beast/utility/PropertyStream.h>
diff --git a/src/ripple/peerfinder/impl/Counts.h b/src/ripple/peerfinder/impl/Counts.h
index 4e87d36ceb..01f5a774cf 100644
--- a/src/ripple/peerfinder/impl/Counts.h
+++ b/src/ripple/peerfinder/impl/Counts.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PEERFINDER_COUNTS_H_INCLUDED
 #define RIPPLE_PEERFINDER_COUNTS_H_INCLUDED
 
-#include <ripple/peerfinder/Manager.h>
+#include <ripple/peerfinder/PeerfinderManager.h>
 #include <ripple/peerfinder/Slot.h>
 #include <ripple/peerfinder/impl/Tuning.h>
 #include <random>
diff --git a/src/ripple/peerfinder/impl/Endpoint.cpp b/src/ripple/peerfinder/impl/Endpoint.cpp
index b2656a3bb4..13700aedbb 100644
--- a/src/ripple/peerfinder/impl/Endpoint.cpp
+++ b/src/ripple/peerfinder/impl/Endpoint.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/peerfinder/Manager.h>
+#include <ripple/peerfinder/PeerfinderManager.h>
 
 namespace ripple {
 namespace PeerFinder {
diff --git a/src/ripple/peerfinder/impl/Livecache.h b/src/ripple/peerfinder/impl/Livecache.h
index f8caab5f19..90fd01fb7b 100644
--- a/src/ripple/peerfinder/impl/Livecache.h
+++ b/src/ripple/peerfinder/impl/Livecache.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PEERFINDER_LIVECACHE_H_INCLUDED
 #define RIPPLE_PEERFINDER_LIVECACHE_H_INCLUDED
 
-#include <ripple/peerfinder/Manager.h>
+#include <ripple/peerfinder/PeerfinderManager.h>
 #include <ripple/peerfinder/impl/iosformat.h>
 #include <ripple/peerfinder/impl/Tuning.h>
 #include <beast/chrono/chrono_io.h>
diff --git a/src/ripple/peerfinder/impl/Logic.h b/src/ripple/peerfinder/impl/Logic.h
index ba5552f6c5..440f3706e9 100644
--- a/src/ripple/peerfinder/impl/Logic.h
+++ b/src/ripple/peerfinder/impl/Logic.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PEERFINDER_LOGIC_H_INCLUDED
 #define RIPPLE_PEERFINDER_LOGIC_H_INCLUDED
 
-#include <ripple/peerfinder/Manager.h>
+#include <ripple/peerfinder/PeerfinderManager.h>
 #include <ripple/peerfinder/impl/Bootcache.h>
 #include <ripple/peerfinder/impl/Counts.h>
 #include <ripple/peerfinder/impl/Fixed.h>
diff --git a/src/ripple/peerfinder/impl/PeerfinderConfig.cpp b/src/ripple/peerfinder/impl/PeerfinderConfig.cpp
index 4b98c0ff46..7831cd04cb 100644
--- a/src/ripple/peerfinder/impl/PeerfinderConfig.cpp
+++ b/src/ripple/peerfinder/impl/PeerfinderConfig.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/peerfinder/Manager.h>
+#include <ripple/peerfinder/PeerfinderManager.h>
 #include <ripple/peerfinder/impl/Tuning.h>
 
 namespace ripple {
diff --git a/src/ripple/peerfinder/impl/Manager.cpp b/src/ripple/peerfinder/impl/PeerfinderManager.cpp
similarity index 99%
rename from src/ripple/peerfinder/impl/Manager.cpp
rename to src/ripple/peerfinder/impl/PeerfinderManager.cpp
index adc35dc2b2..d166636429 100644
--- a/src/ripple/peerfinder/impl/Manager.cpp
+++ b/src/ripple/peerfinder/impl/PeerfinderManager.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/peerfinder/Manager.h>
+#include <ripple/peerfinder/PeerfinderManager.h>
 #include <ripple/peerfinder/impl/Checker.h>
 #include <ripple/peerfinder/impl/Logic.h>
 #include <ripple/peerfinder/impl/SourceStrings.h>
diff --git a/src/ripple/peerfinder/impl/SlotImp.cpp b/src/ripple/peerfinder/impl/SlotImp.cpp
index a116a51601..9936453c47 100644
--- a/src/ripple/peerfinder/impl/SlotImp.cpp
+++ b/src/ripple/peerfinder/impl/SlotImp.cpp
@@ -19,7 +19,7 @@
 
 #include <BeastConfig.h>
 #include <ripple/peerfinder/impl/SlotImp.h>
-#include <ripple/peerfinder/Manager.h>
+#include <ripple/peerfinder/PeerfinderManager.h>
 #include <ripple/peerfinder/impl/Tuning.h>
 
 namespace ripple {
diff --git a/src/ripple/peerfinder/impl/SlotImp.h b/src/ripple/peerfinder/impl/SlotImp.h
index 5f85e99e73..d36bc84d6c 100644
--- a/src/ripple/peerfinder/impl/SlotImp.h
+++ b/src/ripple/peerfinder/impl/SlotImp.h
@@ -21,7 +21,7 @@
 #define RIPPLE_PEERFINDER_SLOTIMP_H_INCLUDED
 
 #include <ripple/peerfinder/Slot.h>
-#include <ripple/peerfinder/Manager.h>
+#include <ripple/peerfinder/PeerfinderManager.h>
 #include <beast/config/CompilerConfig.h>
 #include <beast/container/aged_unordered_map.h>
 #include <beast/container/aged_container_utility.h>
diff --git a/src/ripple/peerfinder/impl/Source.h b/src/ripple/peerfinder/impl/Source.h
index 2adc357d6b..f75562e164 100644
--- a/src/ripple/peerfinder/impl/Source.h
+++ b/src/ripple/peerfinder/impl/Source.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PEERFINDER_SOURCE_H_INCLUDED
 #define RIPPLE_PEERFINDER_SOURCE_H_INCLUDED
 
-#include <ripple/peerfinder/Manager.h>
+#include <ripple/peerfinder/PeerfinderManager.h>
 #include <beast/smart_ptr/SharedObject.h>
 #include <boost/system/error_code.hpp>
 
diff --git a/src/ripple/peerfinder/make_Manager.h b/src/ripple/peerfinder/make_Manager.h
index 9cc8e681e9..6e208f9060 100644
--- a/src/ripple/peerfinder/make_Manager.h
+++ b/src/ripple/peerfinder/make_Manager.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_PEERFINDER_MAKE_MANAGER_H_INCLUDED
 #define RIPPLE_PEERFINDER_MAKE_MANAGER_H_INCLUDED
 
-#include <ripple/peerfinder/Manager.h>
+#include <ripple/peerfinder/PeerfinderManager.h>
 #include <boost/asio/io_service.hpp>
 #include <memory>
 
diff --git a/src/ripple/resource/Manager.h b/src/ripple/resource/ResourceManager.h
similarity index 100%
rename from src/ripple/resource/Manager.h
rename to src/ripple/resource/ResourceManager.h
diff --git a/src/ripple/resource/impl/Manager.cpp b/src/ripple/resource/impl/ResourceManager.cpp
similarity index 98%
rename from src/ripple/resource/impl/Manager.cpp
rename to src/ripple/resource/impl/ResourceManager.cpp
index a62d3946ce..6ad6368415 100644
--- a/src/ripple/resource/impl/Manager.cpp
+++ b/src/ripple/resource/impl/ResourceManager.cpp
@@ -19,10 +19,10 @@
 
 #include <BeastConfig.h>
 #include <ripple/basics/chrono.h>
-#include <ripple/resource/Manager.h>
+#include <ripple/resource/ResourceManager.h>
 #include <beast/threads/Thread.h>
 #include <beast/cxx14/memory.h> // <memory>
-    
+
 namespace ripple {
 namespace Resource {
 
diff --git a/src/ripple/rpc/handlers/AccountCurrencies.cpp b/src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp
similarity index 100%
rename from src/ripple/rpc/handlers/AccountCurrencies.cpp
rename to src/ripple/rpc/handlers/AccountCurrenciesHandler.cpp
diff --git a/src/ripple/rpc/handlers/BlackList.cpp b/src/ripple/rpc/handlers/BlackList.cpp
index cd6f274080..ba6b4b3eca 100644
--- a/src/ripple/rpc/handlers/BlackList.cpp
+++ b/src/ripple/rpc/handlers/BlackList.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/resource/Manager.h>
+#include <ripple/resource/ResourceManager.h>
 
 namespace ripple {
 
diff --git a/src/ripple/rpc/handlers/LedgerCleaner.cpp b/src/ripple/rpc/handlers/LedgerCleanerHandler.cpp
similarity index 100%
rename from src/ripple/rpc/handlers/LedgerCleaner.cpp
rename to src/ripple/rpc/handlers/LedgerCleanerHandler.cpp
diff --git a/src/ripple/rpc/handlers/Sign.cpp b/src/ripple/rpc/handlers/SignHandler.cpp
similarity index 100%
rename from src/ripple/rpc/handlers/Sign.cpp
rename to src/ripple/rpc/handlers/SignHandler.cpp
diff --git a/src/ripple/server/impl/ServerHandlerImp.cpp b/src/ripple/server/impl/ServerHandlerImp.cpp
index 8fbdd307a3..565bef5f89 100644
--- a/src/ripple/server/impl/ServerHandlerImp.cpp
+++ b/src/ripple/server/impl/ServerHandlerImp.cpp
@@ -29,7 +29,7 @@
 #include <ripple/core/JobQueue.h>
 #include <ripple/server/make_Server.h>
 #include <ripple/overlay/Overlay.h>
-#include <ripple/resource/Manager.h>
+#include <ripple/resource/ResourceManager.h>
 #include <ripple/resource/Fees.h>
 #include <ripple/rpc/Coroutine.h>
 #include <beast/crypto/base64.h>
diff --git a/src/ripple/server/make_ServerHandler.h b/src/ripple/server/make_ServerHandler.h
index b21468e083..a19392a69e 100644
--- a/src/ripple/server/make_ServerHandler.h
+++ b/src/ripple/server/make_ServerHandler.h
@@ -21,7 +21,7 @@
 #define RIPPLE_SERVER_MAKE_SERVERHANDLER_H_INCLUDED
 
 #include <ripple/core/JobQueue.h>
-#include <ripple/resource/Manager.h>
+#include <ripple/resource/ResourceManager.h>
 #include <ripple/server/ServerHandler.h>
 #include <beast/threads/Stoppable.h>
 #include <boost/asio/io_service.hpp>
diff --git a/src/ripple/test/jtx.h b/src/ripple/test/jtx.h
index ac0a7ce6c6..8bf47e841e 100644
--- a/src/ripple/test/jtx.h
+++ b/src/ripple/test/jtx.h
@@ -29,7 +29,7 @@
 #include <ripple/test/jtx/Env.h>
 #include <ripple/test/jtx/fee.h>
 #include <ripple/test/jtx/flags.h>
-#include <ripple/test/jtx/json.h>
+#include <ripple/test/jtx/jtx_json.h>
 #include <ripple/test/jtx/JTx.h>
 #include <ripple/test/jtx/memo.h>
 #include <ripple/test/jtx/multisign.h>
@@ -54,4 +54,3 @@
 #include <ripple/test/jtx/utility.h>
 
 #endif
-
diff --git a/src/ripple/test/jtx/impl/json.cpp b/src/ripple/test/jtx/impl/jtx_json.cpp
similarity index 97%
rename from src/ripple/test/jtx/impl/json.cpp
rename to src/ripple/test/jtx/impl/jtx_json.cpp
index 9d33b65cc6..b3fa2cfb84 100644
--- a/src/ripple/test/jtx/impl/json.cpp
+++ b/src/ripple/test/jtx/impl/jtx_json.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx/json.h>
+#include <ripple/test/jtx/jtx_json.h>
 #include <ripple/test/jtx/utility.h>
 #include <ripple/json/json_reader.h>
 
diff --git a/src/ripple/test/jtx/json.h b/src/ripple/test/jtx/jtx_json.h
similarity index 100%
rename from src/ripple/test/jtx/json.h
rename to src/ripple/test/jtx/jtx_json.h
diff --git a/src/ripple/unity/peerfinder.cpp b/src/ripple/unity/peerfinder.cpp
index ee5a783dc9..3593597c32 100644
--- a/src/ripple/unity/peerfinder.cpp
+++ b/src/ripple/unity/peerfinder.cpp
@@ -28,7 +28,7 @@
 #include <ripple/peerfinder/impl/Bootcache.cpp>
 #include <ripple/peerfinder/impl/PeerfinderConfig.cpp>
 #include <ripple/peerfinder/impl/Endpoint.cpp>
-#include <ripple/peerfinder/impl/Manager.cpp>
+#include <ripple/peerfinder/impl/PeerfinderManager.cpp>
 #include <ripple/peerfinder/impl/SlotImp.cpp>
 #include <ripple/peerfinder/impl/SourceStrings.cpp>
 
diff --git a/src/ripple/unity/resource.cpp b/src/ripple/unity/resource.cpp
index d4f2fd08a2..efc5f229d9 100644
--- a/src/ripple/unity/resource.cpp
+++ b/src/ripple/unity/resource.cpp
@@ -24,7 +24,7 @@
 #include <ripple/resource/impl/Fees.cpp>
 #include <ripple/resource/impl/Key.h>
 #include <ripple/resource/impl/Kind.h>
-#include <ripple/resource/impl/Manager.cpp>
+#include <ripple/resource/impl/ResourceManager.cpp>
 #include <ripple/resource/impl/Tuning.h>
 #include <ripple/resource/tests/Logic.test.cpp>
 
diff --git a/src/ripple/unity/rpcx.cpp b/src/ripple/unity/rpcx.cpp
index f152ab64a8..eb594fdc6a 100644
--- a/src/ripple/unity/rpcx.cpp
+++ b/src/ripple/unity/rpcx.cpp
@@ -33,7 +33,7 @@
 #include <ripple/rpc/impl/Utilities.cpp>
 
 #include <ripple/rpc/handlers/Handlers.h>
-#include <ripple/rpc/handlers/AccountCurrencies.cpp>
+#include <ripple/rpc/handlers/AccountCurrenciesHandler.cpp>
 #include <ripple/rpc/handlers/AccountInfo.cpp>
 #include <ripple/rpc/handlers/AccountLines.cpp>
 #include <ripple/rpc/handlers/AccountObjects.cpp>
@@ -53,7 +53,7 @@
 #include <ripple/rpc/handlers/Internal.cpp>
 #include <ripple/rpc/handlers/Ledger.cpp>
 #include <ripple/rpc/handlers/LedgerAccept.cpp>
-#include <ripple/rpc/handlers/LedgerCleaner.cpp>
+#include <ripple/rpc/handlers/LedgerCleanerHandler.cpp>
 #include <ripple/rpc/handlers/LedgerClosed.cpp>
 #include <ripple/rpc/handlers/LedgerCurrent.cpp>
 #include <ripple/rpc/handlers/LedgerData.cpp>
@@ -72,7 +72,7 @@
 #include <ripple/rpc/handlers/RipplePathFind.cpp>
 #include <ripple/rpc/handlers/ServerInfo.cpp>
 #include <ripple/rpc/handlers/ServerState.cpp>
-#include <ripple/rpc/handlers/Sign.cpp>
+#include <ripple/rpc/handlers/SignHandler.cpp>
 #include <ripple/rpc/handlers/SignFor.cpp>
 #include <ripple/rpc/handlers/Stop.cpp>
 #include <ripple/rpc/handlers/Submit.cpp>
diff --git a/src/ripple/unity/test.cpp b/src/ripple/unity/test.cpp
index a89cea70de..932b9dcfa4 100644
--- a/src/ripple/unity/test.cpp
+++ b/src/ripple/unity/test.cpp
@@ -26,7 +26,7 @@
 #include <ripple/test/jtx/impl/Env.cpp>
 #include <ripple/test/jtx/impl/fee.cpp>
 #include <ripple/test/jtx/impl/flags.cpp>
-#include <ripple/test/jtx/impl/json.cpp>
+#include <ripple/test/jtx/impl/jtx_json.cpp>
 #include <ripple/test/jtx/impl/memo.cpp>
 #include <ripple/test/jtx/impl/multisign.cpp>
 #include <ripple/test/jtx/impl/offer.cpp>
diff --git a/src/ripple/unity/validators.cpp b/src/ripple/unity/validators.cpp
index b0e246f2c1..a85b1a2a2c 100644
--- a/src/ripple/unity/validators.cpp
+++ b/src/ripple/unity/validators.cpp
@@ -20,6 +20,6 @@
 #include <BeastConfig.h>
 #include <ripple/validators/impl/ConnectionImp.cpp>
 #include <ripple/validators/impl/Logic.cpp>
-#include <ripple/validators/impl/Manager.cpp>
+#include <ripple/validators/impl/ValidatorManager.cpp>
 #include <ripple/validators/impl/StoreSqdb.cpp>
 #include <ripple/validators/tests/Validators.test.cpp>
diff --git a/src/ripple/validators/Manager.h b/src/ripple/validators/ValidatorManager.h
similarity index 100%
rename from src/ripple/validators/Manager.h
rename to src/ripple/validators/ValidatorManager.h
diff --git a/src/ripple/validators/impl/Manager.cpp b/src/ripple/validators/impl/ValidatorManager.cpp
similarity index 99%
rename from src/ripple/validators/impl/Manager.cpp
rename to src/ripple/validators/impl/ValidatorManager.cpp
index 06a18a2d0a..06de0fb8d9 100644
--- a/src/ripple/validators/impl/Manager.cpp
+++ b/src/ripple/validators/impl/ValidatorManager.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/validators/Manager.h>
+#include <ripple/validators/ValidatorManager.h>
 #include <ripple/validators/make_Manager.h>
 #include <ripple/validators/impl/ConnectionImp.h>
 #include <ripple/validators/impl/Logic.h>
diff --git a/src/ripple/validators/make_Manager.h b/src/ripple/validators/make_Manager.h
index 8e53b2d2e8..d4d8333e6f 100644
--- a/src/ripple/validators/make_Manager.h
+++ b/src/ripple/validators/make_Manager.h
@@ -20,7 +20,7 @@
 #ifndef RIPPLE_VALIDATORS_MAKE_MANAGER_H_INCLUDED
 #define RIPPLE_VALIDATORS_MAKE_MANAGER_H_INCLUDED
 
-#include <ripple/validators/Manager.h>
+#include <ripple/validators/ValidatorManager.h>
 #include <beast/threads/Stoppable.h>
 #include <beast/utility/Journal.h>
 #include <beast/module/core/files/File.h>
diff --git a/src/ripple/websocket/Connection.h b/src/ripple/websocket/Connection.h
index 0ee029c2bc..52595f564c 100644
--- a/src/ripple/websocket/Connection.h
+++ b/src/ripple/websocket/Connection.h
@@ -31,7 +31,7 @@
 #include <ripple/protocol/ErrorCodes.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/resource/Fees.h>
-#include <ripple/resource/Manager.h>
+#include <ripple/resource/ResourceManager.h>
 #include <ripple/rpc/RPCHandler.h>
 #include <ripple/server/Port.h>
 #include <ripple/json/to_string.h>