Rename Distributor to TopLevelDistributor.

39 files changed, 128 insertions, 128 deletions

diff --git a/storage/src/tests/distributor/bucketstateoperationtest.cpp b/storage/src/tests/distributor/bucketstateoperationtest.cpp
index 34ab8e5ccdb..377948d7b02 100644
--- a/storage/src/tests/distributor/bucketstateoperationtest.cpp
+++ b/storage/src/tests/distributor/bucketstateoperationtest.cpp
@@ -2,7 +2,7 @@
 
 #include <tests/distributor/distributor_stripe_test_util.h>
 #include <vespa/storage/distributor/operations/idealstate/setbucketstateoperation.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/document/test/make_document_bucket.h>
 #include <vespa/vespalib/gtest/gtest.h>
 #include "dummy_cluster_context.h"
diff --git a/storage/src/tests/distributor/distributor_stripe_test.cpp b/storage/src/tests/distributor/distributor_stripe_test.cpp
index 573362c9ef4..547e7f02b02 100644
--- a/storage/src/tests/distributor/distributor_stripe_test.cpp
+++ b/storage/src/tests/distributor/distributor_stripe_test.cpp
@@ -5,7 +5,7 @@
 #include <vespa/document/test/make_bucket_space.h>
 #include <vespa/document/test/make_document_bucket.h>
 #include <vespa/storage/distributor/bucket_spaces_stats_provider.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_bucket_space.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storageapi/message/bucketsplitting.h>
diff --git a/storage/src/tests/distributor/distributortestutil.cpp b/storage/src/tests/distributor/distributortestutil.cpp
index 3ec1c95b206..1e24bd72c9b 100644
--- a/storage/src/tests/distributor/distributortestutil.cpp
+++ b/storage/src/tests/distributor/distributortestutil.cpp
@@ -3,7 +3,7 @@
 #include <vespa/config-stor-distribution.h>
 #include <vespa/document/test/make_bucket_space.h>
 #include <vespa/document/test/make_document_bucket.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_bucket_space.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storage/distributor/distributor_stripe_component.h>
@@ -30,7 +30,7 @@ DistributorTestUtil::createLinks()
     _node.reset(new TestDistributorApp(_config.getConfigId()));
     _threadPool = framework::TickingThreadPool::createDefault("distributor");
     _stripe_pool = std::make_unique<DistributorStripePool>();
-    _distributor.reset(new Distributor(
+    _distributor.reset(new TopLevelDistributor(
             _node->getComponentRegister(),
             _node->node_identity(),
             *_threadPool,
diff --git a/storage/src/tests/distributor/distributortestutil.h b/storage/src/tests/distributor/distributortestutil.h
index 533fd49811f..9457bfeba83 100644
--- a/storage/src/tests/distributor/distributortestutil.h
+++ b/storage/src/tests/distributor/distributortestutil.h
@@ -17,7 +17,7 @@ namespace framework { struct TickingThreadPool; }
 
 namespace distributor {
 
-class Distributor;
+class TopLevelDistributor;
 class DistributorBucketSpace;
 class DistributorBucketSpaceRepo;
 class DistributorNodeContext;
@@ -122,8 +122,8 @@ public:
     storage::distributor::DistributorStripeOperationContext& operation_context();
     const DocumentSelectionParser& doc_selection_parser() const;
 
-    Distributor& getDistributor() noexcept { return *_distributor; }
-    const Distributor& getDistributor() const noexcept { return *_distributor; }
+    TopLevelDistributor& getDistributor() noexcept { return *_distributor; }
+    const TopLevelDistributor& getDistributor() const noexcept { return *_distributor; }
 
     bool tick();
 
@@ -217,7 +217,7 @@ protected:
     std::unique_ptr<TestDistributorApp> _node;
     std::unique_ptr<framework::TickingThreadPool> _threadPool;
     std::unique_ptr<DistributorStripePool> _stripe_pool;
-    std::unique_ptr<Distributor> _distributor;
+    std::unique_ptr<TopLevelDistributor> _distributor;
     std::unique_ptr<storage::DistributorComponent> _component;
     DistributorMessageSenderStub _sender;
     DistributorMessageSenderStub _senderDown;
diff --git a/storage/src/tests/distributor/externaloperationhandlertest.cpp b/storage/src/tests/distributor/externaloperationhandlertest.cpp
index 769029524e5..6545e25075c 100644
--- a/storage/src/tests/distributor/externaloperationhandlertest.cpp
+++ b/storage/src/tests/distributor/externaloperationhandlertest.cpp
@@ -7,7 +7,7 @@
 #include <vespa/document/update/assignvalueupdate.h>
 #include <vespa/document/update/documentupdate.h>
 #include <vespa/storage/common/reindexing_constants.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_bucket_space.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storage/distributor/distributormetricsset.h>
diff --git a/storage/src/tests/distributor/garbagecollectiontest.cpp b/storage/src/tests/distributor/garbagecollectiontest.cpp
index 89b6e4beea4..e78d808a898 100644
--- a/storage/src/tests/distributor/garbagecollectiontest.cpp
+++ b/storage/src/tests/distributor/garbagecollectiontest.cpp
@@ -3,7 +3,7 @@
 #include "dummy_cluster_context.h"
 #include <tests/distributor/distributor_stripe_test_util.h>
 #include <vespa/document/test/make_document_bucket.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/idealstatemanager.h>
 #include <vespa/storage/distributor/idealstatemetricsset.h>
 #include <vespa/storage/distributor/operations/idealstate/garbagecollectionoperation.h>
diff --git a/storage/src/tests/distributor/getoperationtest.cpp b/storage/src/tests/distributor/getoperationtest.cpp
index 4860d7221a9..dede84e1d0c 100644
--- a/storage/src/tests/distributor/getoperationtest.cpp
+++ b/storage/src/tests/distributor/getoperationtest.cpp
@@ -8,7 +8,7 @@
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/test/make_document_bucket.h>
 #include <vespa/storage/bucketdb/bucketdatabase.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_bucket_space.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storage/distributor/distributormetricsset.h>
diff --git a/storage/src/tests/distributor/idealstatemanagertest.cpp b/storage/src/tests/distributor/idealstatemanagertest.cpp
index 248b2b7064b..28a57fc6afd 100644
--- a/storage/src/tests/distributor/idealstatemanagertest.cpp
+++ b/storage/src/tests/distributor/idealstatemanagertest.cpp
@@ -5,7 +5,7 @@
 #include <vespa/document/test/make_bucket_space.h>
 #include <vespa/document/test/make_document_bucket.h>
 #include <vespa/storage/distributor/bucketdbupdater.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storage/distributor/operation_sequencer.h>
 #include <vespa/storage/distributor/operations/idealstate/mergeoperation.h>
diff --git a/storage/src/tests/distributor/joinbuckettest.cpp b/storage/src/tests/distributor/joinbuckettest.cpp
index 920aa5e9e83..31a2c6b6476 100644
--- a/storage/src/tests/distributor/joinbuckettest.cpp
+++ b/storage/src/tests/distributor/joinbuckettest.cpp
@@ -2,7 +2,7 @@
 #include "dummy_cluster_context.h"
 #include <tests/distributor/distributor_stripe_test_util.h>
 #include <vespa/document/test/make_document_bucket.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/operations/idealstate/joinoperation.h>
 #include <vespa/storageapi/message/bucketsplitting.h>
 #include <vespa/vespalib/gtest/gtest.h>
diff --git a/storage/src/tests/distributor/legacy_bucket_db_updater_test.cpp b/storage/src/tests/distributor/legacy_bucket_db_updater_test.cpp
index e353e976081..e73fa14c219 100644
--- a/storage/src/tests/distributor/legacy_bucket_db_updater_test.cpp
+++ b/storage/src/tests/distributor/legacy_bucket_db_updater_test.cpp
@@ -12,7 +12,7 @@
 #include <vespa/document/test/make_bucket_space.h>
 #include <vespa/document/bucket/fixed_bucket_spaces.h>
 #include <vespa/storage/distributor/simpleclusterinformation.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storage/distributor/distributor_bucket_space.h>
 #include <vespa/vespalib/gtest/gtest.h>
diff --git a/storage/src/tests/distributor/legacy_distributor_test.cpp b/storage/src/tests/distributor/legacy_distributor_test.cpp
index 67441d5f7c0..11dc79769a7 100644
--- a/storage/src/tests/distributor/legacy_distributor_test.cpp
+++ b/storage/src/tests/distributor/legacy_distributor_test.cpp
@@ -12,7 +12,7 @@
 #include <vespa/document/test/make_document_bucket.h>
 #include <vespa/document/test/make_bucket_space.h>
 #include <vespa/storage/config/config-stor-distributormanager.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storage/distributor/distributor_status.h>
 #include <vespa/storage/distributor/distributor_bucket_space.h>
@@ -157,7 +157,7 @@ struct LegacyDistributorTest : Test, DistributorTestUtil {
         return _distributor->_stripe->_statusToDo;
     }
 
-    Distributor::MetricUpdateHook distributor_metric_update_hook() {
+    TopLevelDistributor::MetricUpdateHook distributor_metric_update_hook() {
         return _distributor->_metricUpdateHook;
     }
 
diff --git a/storage/src/tests/distributor/mergeoperationtest.cpp b/storage/src/tests/distributor/mergeoperationtest.cpp
index b661075402a..aeffbccea33 100644
--- a/storage/src/tests/distributor/mergeoperationtest.cpp
+++ b/storage/src/tests/distributor/mergeoperationtest.cpp
@@ -4,7 +4,7 @@
 #include <vespa/document/test/make_bucket_space.h>
 #include <vespa/document/test/make_document_bucket.h>
 #include <vespa/storage/distributor/bucketdbupdater.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/idealstatemanager.h>
 #include <vespa/storage/distributor/operation_sequencer.h>
 #include <vespa/storage/distributor/operations/idealstate/mergeoperation.h>
diff --git a/storage/src/tests/distributor/putoperationtest.cpp b/storage/src/tests/distributor/putoperationtest.cpp
index b6f12a87e9a..4b13a9b3b51 100644
--- a/storage/src/tests/distributor/putoperationtest.cpp
+++ b/storage/src/tests/distributor/putoperationtest.cpp
@@ -3,7 +3,7 @@
 #include <tests/distributor/distributor_stripe_test_util.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/test/make_document_bucket.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_bucket_space.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storage/distributor/operations/external/putoperation.h>
diff --git a/storage/src/tests/distributor/read_for_write_visitor_operation_test.cpp b/storage/src/tests/distributor/read_for_write_visitor_operation_test.cpp
index 6a4351a2ec6..ca5850a1cd1 100644
--- a/storage/src/tests/distributor/read_for_write_visitor_operation_test.cpp
+++ b/storage/src/tests/distributor/read_for_write_visitor_operation_test.cpp
@@ -6,7 +6,7 @@
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/update/documentupdate.h>
 #include <vespa/storage/common/reindexing_constants.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storage/distributor/distributormetricsset.h>
 #include <vespa/storage/distributor/operations/external/read_for_write_visitor_operation.h>
diff --git a/storage/src/tests/distributor/removebucketoperationtest.cpp b/storage/src/tests/distributor/removebucketoperationtest.cpp
index e1dc13ce2e1..03ba0743655 100644
--- a/storage/src/tests/distributor/removebucketoperationtest.cpp
+++ b/storage/src/tests/distributor/removebucketoperationtest.cpp
@@ -4,7 +4,7 @@
 #include <tests/common/dummystoragelink.h>
 #include <tests/distributor/distributor_stripe_test_util.h>
 #include <vespa/document/test/make_document_bucket.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/idealstatemanager.h>
 #include <vespa/storage/distributor/operations/idealstate/removebucketoperation.h>
 #include <vespa/storageapi/message/bucket.h>
diff --git a/storage/src/tests/distributor/removelocationtest.cpp b/storage/src/tests/distributor/removelocationtest.cpp
index ff48ed6f18a..05a82349713 100644
--- a/storage/src/tests/distributor/removelocationtest.cpp
+++ b/storage/src/tests/distributor/removelocationtest.cpp
@@ -2,7 +2,7 @@
 
 #include <tests/distributor/distributor_stripe_test_util.h>
 #include <vespa/document/test/make_document_bucket.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storage/distributor/operations/external/removelocationoperation.h>
 #include <vespa/storageapi/message/removelocation.h>
diff --git a/storage/src/tests/distributor/removeoperationtest.cpp b/storage/src/tests/distributor/removeoperationtest.cpp
index f7ea22f4537..ca2f365f1ad 100644
--- a/storage/src/tests/distributor/removeoperationtest.cpp
+++ b/storage/src/tests/distributor/removeoperationtest.cpp
@@ -3,7 +3,7 @@
 #include <iomanip>
 #include <tests/distributor/distributor_stripe_test_util.h>
 #include <vespa/document/test/make_document_bucket.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storage/distributor/operations/external/removeoperation.h>
 #include <vespa/storageapi/message/persistence.h>
diff --git a/storage/src/tests/distributor/splitbuckettest.cpp b/storage/src/tests/distributor/splitbuckettest.cpp
index d9052c36db3..4c7500f723b 100644
--- a/storage/src/tests/distributor/splitbuckettest.cpp
+++ b/storage/src/tests/distributor/splitbuckettest.cpp
@@ -3,7 +3,7 @@
 #include <tests/distributor/distributor_stripe_test_util.h>
 #include <vespa/document/base/documentid.h>
 #include <vespa/document/test/make_document_bucket.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/idealstatemanager.h>
 #include <vespa/storage/distributor/operation_sequencer.h>
 #include <vespa/storage/distributor/operations/idealstate/splitoperation.h>
diff --git a/storage/src/tests/distributor/statecheckerstest.cpp b/storage/src/tests/distributor/statecheckerstest.cpp
index a8924d98604..a3ac0bed5b5 100644
--- a/storage/src/tests/distributor/statecheckerstest.cpp
+++ b/storage/src/tests/distributor/statecheckerstest.cpp
@@ -6,7 +6,7 @@
 #include <vespa/document/test/make_bucket_space.h>
 #include <vespa/document/test/make_document_bucket.h>
 #include <vespa/storage/distributor/bucketdbupdater.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_bucket_space.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storage/distributor/operations/idealstate/mergeoperation.h>
diff --git a/storage/src/tests/distributor/statoperationtest.cpp b/storage/src/tests/distributor/statoperationtest.cpp
index 4148b9df114..a8276487d32 100644
--- a/storage/src/tests/distributor/statoperationtest.cpp
+++ b/storage/src/tests/distributor/statoperationtest.cpp
@@ -2,7 +2,7 @@
 
 #include <tests/distributor/distributor_stripe_test_util.h>
 #include <vespa/document/test/make_document_bucket.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_bucket_space.h>
 #include <vespa/storage/distributor/operations/external/statbucketlistoperation.h>
 #include <vespa/storage/distributor/operations/external/statbucketoperation.h>
diff --git a/storage/src/tests/distributor/top_level_distributor_test.cpp b/storage/src/tests/distributor/top_level_distributor_test.cpp
index a8ef6d990f0..348a964dd53 100644
--- a/storage/src/tests/distributor/top_level_distributor_test.cpp
+++ b/storage/src/tests/distributor/top_level_distributor_test.cpp
@@ -11,7 +11,7 @@
 #include <vespa/document/test/make_document_bucket.h>
 #include <vespa/document/test/make_bucket_space.h>
 #include <vespa/storage/config/config-stor-distributormanager.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storage/distributor/distributor_status.h>
 #include <vespa/storage/distributor/distributor_bucket_space.h>
@@ -98,7 +98,7 @@ struct TopLevelDistributorTest : Test, TopLevelDistributorTestUtil {
         return _distributor->_status_to_do;
     }
 
-    Distributor::MetricUpdateHook distributor_metric_update_hook() {
+    TopLevelDistributor::MetricUpdateHook distributor_metric_update_hook() {
         return _distributor->_metricUpdateHook;
     }
 
diff --git a/storage/src/tests/distributor/top_level_distributor_test_util.cpp b/storage/src/tests/distributor/top_level_distributor_test_util.cpp
index 3fe801ab000..2fe35b74e4f 100644
--- a/storage/src/tests/distributor/top_level_distributor_test_util.cpp
+++ b/storage/src/tests/distributor/top_level_distributor_test_util.cpp
@@ -3,7 +3,7 @@
 #include <vespa/config-stor-distribution.h>
 #include <vespa/document/test/make_bucket_space.h>
 #include <vespa/document/test/make_document_bucket.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_bucket_space.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storage/distributor/distributor_stripe_component.h>
@@ -34,7 +34,7 @@ TopLevelDistributorTestUtil::create_links()
     _node.reset(new TestDistributorApp(_config.getConfigId()));
     _thread_pool = framework::TickingThreadPool::createDefault("distributor");
     _stripe_pool = DistributorStripePool::make_non_threaded_pool_for_testing();
-    _distributor.reset(new Distributor(
+    _distributor.reset(new TopLevelDistributor(
             _node->getComponentRegister(),
             _node->node_identity(),
             *_thread_pool,
diff --git a/storage/src/tests/distributor/top_level_distributor_test_util.h b/storage/src/tests/distributor/top_level_distributor_test_util.h
index 134b88b3567..156f679993a 100644
--- a/storage/src/tests/distributor/top_level_distributor_test_util.h
+++ b/storage/src/tests/distributor/top_level_distributor_test_util.h
@@ -17,7 +17,7 @@ namespace framework { struct TickingThreadPool; }
 
 namespace distributor {
 
-class Distributor;
+class TopLevelDistributor;
 class DistributorMetricSet;
 class DistributorNodeContext;
 class DistributorStripe;
@@ -106,7 +106,7 @@ protected:
     std::unique_ptr<TestDistributorApp> _node;
     std::unique_ptr<framework::TickingThreadPool> _thread_pool;
     std::unique_ptr<DistributorStripePool> _stripe_pool;
-    std::unique_ptr<Distributor> _distributor;
+    std::unique_ptr<TopLevelDistributor> _distributor;
     std::unique_ptr<storage::DistributorComponent> _component;
     DistributorMessageSenderStub _sender;
     DistributorMessageSenderStub _sender_down;
diff --git a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
index 99e9a84af0c..bf13dc47261 100644
--- a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
+++ b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
@@ -7,7 +7,7 @@
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/test/make_document_bucket.h>
 #include <vespa/document/update/arithmeticvalueupdate.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storage/distributor/externaloperationhandler.h>
 #include <vespa/storage/distributor/operations/external/twophaseupdateoperation.h>
diff --git a/storage/src/tests/distributor/updateoperationtest.cpp b/storage/src/tests/distributor/updateoperationtest.cpp
index a246a2054ac..99bb1aa7787 100644
--- a/storage/src/tests/distributor/updateoperationtest.cpp
+++ b/storage/src/tests/distributor/updateoperationtest.cpp
@@ -6,7 +6,7 @@
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/test/make_document_bucket.h>
 #include <vespa/document/update/documentupdate.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storage/distributor/operations/external/updateoperation.h>
 #include <vespa/storageapi/message/bucket.h>
diff --git a/storage/src/tests/distributor/visitoroperationtest.cpp b/storage/src/tests/distributor/visitoroperationtest.cpp
index a1342086c29..4ab18acef10 100644
--- a/storage/src/tests/distributor/visitoroperationtest.cpp
+++ b/storage/src/tests/distributor/visitoroperationtest.cpp
@@ -3,7 +3,7 @@
 #include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/document/test/make_bucket_space.h>
 #include <vespa/storage/common/reindexing_constants.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_stripe.h>
 #include <vespa/storage/distributor/distributormetricsset.h>
 #include <vespa/storage/distributor/operations/external/visitoroperation.h>
diff --git a/storage/src/vespa/storage/distributor/CMakeLists.txt b/storage/src/vespa/storage/distributor/CMakeLists.txt
index eba76c91af0..02e7055aaab 100644
--- a/storage/src/vespa/storage/distributor/CMakeLists.txt
+++ b/storage/src/vespa/storage/distributor/CMakeLists.txt
@@ -13,7 +13,6 @@ vespa_add_library(storage_distributor
     bucketlistmerger.cpp
     clusterinformation.cpp
     crypto_uuid_generator.cpp
-    distributor.cpp
     distributor_bucket_space.cpp
     distributor_bucket_space_repo.cpp
     distributor_component.cpp
@@ -52,6 +51,7 @@ vespa_add_library(storage_distributor
     statusreporterdelegate.cpp
     stripe_bucket_db_updater.cpp
     throttlingoperationstarter.cpp
+    top_level_distributor.cpp
     update_metric_set.cpp
     visitormetricsset.cpp
     $<TARGET_OBJECTS:storage_distributoroperation>
diff --git a/storage/src/vespa/storage/distributor/bucketdbupdater.cpp b/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
index 112b9e8fd8a..bdb8de7b9fe 100644
--- a/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
+++ b/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
@@ -4,7 +4,7 @@
 #include "bucket_db_prune_elision.h"
 #include "bucket_space_distribution_configs.h"
 #include "bucket_space_distribution_context.h"
-#include "distributor.h"
+#include "top_level_distributor.h"
 #include "distributor_bucket_space.h"
 #include "distributormetricsset.h"
 #include "simpleclusterinformation.h"
diff --git a/storage/src/vespa/storage/distributor/distributor_stripe.h b/storage/src/vespa/storage/distributor/distributor_stripe.h
index e8dd4a1f3a7..5426d311558 100644
--- a/storage/src/vespa/storage/distributor/distributor_stripe.h
+++ b/storage/src/vespa/storage/distributor/distributor_stripe.h
@@ -195,7 +195,7 @@ public:
 
 private:
     // TODO STRIPE: reduce number of friends. DistributorStripe too popular for its own good.
-    friend class Distributor;
+    friend class TopLevelDistributor;
     friend class DistributorStripeTestUtil;
     friend class DistributorTestUtil;
     friend class LegacyBucketDBUpdaterTest;
diff --git a/storage/src/vespa/storage/distributor/externaloperationhandler.cpp b/storage/src/vespa/storage/distributor/externaloperationhandler.cpp
index 2bc779aa47e..3292f942678 100644
--- a/storage/src/vespa/storage/distributor/externaloperationhandler.cpp
+++ b/storage/src/vespa/storage/distributor/externaloperationhandler.cpp
@@ -2,7 +2,7 @@
 
 #include "bucket_space_distribution_context.h"
 #include "crypto_uuid_generator.h"
-#include "distributor.h"
+#include "top_level_distributor.h"
 #include "distributor_bucket_space.h"
 #include "distributor_bucket_space_repo.h"
 #include "externaloperationhandler.h"
diff --git a/storage/src/vespa/storage/distributor/externaloperationhandler.h b/storage/src/vespa/storage/distributor/externaloperationhandler.h
index fc1aa00ea65..790a7ca06dc 100644
--- a/storage/src/vespa/storage/distributor/externaloperationhandler.h
+++ b/storage/src/vespa/storage/distributor/externaloperationhandler.h
@@ -16,7 +16,7 @@ namespace storage { class PersistenceOperationMetricSet; }
 namespace storage::distributor {
 
 class DistributorMetricSet;
-class Distributor;
+class TopLevelDistributor;
 class MaintenanceOperationGenerator;
 class DirectDispatchSender;
 class SequencingHandle;
diff --git a/storage/src/vespa/storage/distributor/idealstatemanager.cpp b/storage/src/vespa/storage/distributor/idealstatemanager.cpp
index 65e018765fe..124f75ec169 100644
--- a/storage/src/vespa/storage/distributor/idealstatemanager.cpp
+++ b/storage/src/vespa/storage/distributor/idealstatemanager.cpp
@@ -2,7 +2,7 @@
 
 #include "idealstatemanager.h"
 #include "statecheckers.h"
-#include "distributor.h"
+#include "top_level_distributor.h"
 #include "idealstatemetricsset.h"
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/storage/storageserver/storagemetricsset.h>
diff --git a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp
index 7679d4bc0e5..f61eb1956b5 100644
--- a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp
@@ -3,7 +3,7 @@
 #include "visitoroperation.h"
 #include <vespa/storage/common/reindexing_constants.h>
 #include <vespa/storage/storageserver/storagemetricsset.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_bucket_space.h>
 #include <vespa/storage/distributor/bucketownership.h>
 #include <vespa/storage/distributor/operations/external/visitororder.h>
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/garbagecollectionoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/garbagecollectionoperation.cpp
index f611968b481..33339efab5b 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/garbagecollectionoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/garbagecollectionoperation.cpp
@@ -3,7 +3,7 @@
 #include "garbagecollectionoperation.h"
 #include <vespa/storage/distributor/idealstatemanager.h>
 #include <vespa/storage/distributor/idealstatemetricsset.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_bucket_space.h>
 #include <vespa/storageapi/message/removelocation.h>
 
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/removebucketoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/removebucketoperation.cpp
index f6458bc0522..4d50f8bbeb8 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/removebucketoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/removebucketoperation.cpp
@@ -2,7 +2,7 @@
 
 #include "removebucketoperation.h"
 #include <vespa/storage/distributor/idealstatemanager.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_bucket_space.h>
 
 #include <vespa/log/log.h>
diff --git a/storage/src/vespa/storage/distributor/stripe_bucket_db_updater.cpp b/storage/src/vespa/storage/distributor/stripe_bucket_db_updater.cpp
index 95272752ace..b3ee60727a3 100644
--- a/storage/src/vespa/storage/distributor/stripe_bucket_db_updater.cpp
+++ b/storage/src/vespa/storage/distributor/stripe_bucket_db_updater.cpp
@@ -3,7 +3,7 @@
 #include "stripe_bucket_db_updater.h"
 #include "bucket_db_prune_elision.h"
 #include "bucket_space_distribution_context.h"
-#include "distributor.h"
+#include "top_level_distributor.h"
 #include "distributor_bucket_space.h"
 #include "distributormetricsset.h"
 #include "pending_bucket_space_db_transition.h"
diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/top_level_distributor.cpp
index 36b12ed483f..378a26dcc70 100644
--- a/storage/src/vespa/storage/distributor/distributor.cpp
+++ b/storage/src/vespa/storage/distributor/top_level_distributor.cpp
@@ -3,7 +3,7 @@
 #include "blockingoperationstarter.h"
 #include "bucket_space_distribution_configs.h"
 #include "bucketdbupdater.h"
-#include "distributor.h"
+#include "top_level_distributor.h"
 #include "distributor_bucket_space.h"
 #include "distributor_status.h"
 #include "distributor_stripe.h"
@@ -48,14 +48,14 @@ namespace storage::distributor {
  *      - these are already thread safe
  *  - status aggregation
  */
-Distributor::Distributor(DistributorComponentRegister& compReg,
-                         const NodeIdentity& node_identity,
-                         framework::TickingThreadPool& threadPool,
-                         DistributorStripePool& stripe_pool,
-                         DoneInitializeHandler& doneInitHandler,
-                         uint32_t num_distributor_stripes,
-                         HostInfo& hostInfoReporterRegistrar,
-                         ChainedMessageSender* messageSender)
+TopLevelDistributor::TopLevelDistributor(DistributorComponentRegister& compReg,
+                                         const NodeIdentity& node_identity,
+                                         framework::TickingThreadPool& threadPool,
+                                         DistributorStripePool& stripe_pool,
+                                         DoneInitializeHandler& doneInitHandler,
+                                         uint32_t num_distributor_stripes,
+                                         HostInfo& hostInfoReporterRegistrar,
+                                         ChainedMessageSender* messageSender)
     : StorageLink("distributor"),
       framework::StatusReporter("distributor", "Distributor"),
       _comp_reg(compReg),
@@ -134,14 +134,14 @@ Distributor::Distributor(DistributorComponentRegister& compReg,
     propagateDefaultDistribution(_component.getDistribution());
 };
 
-Distributor::~Distributor()
+TopLevelDistributor::~TopLevelDistributor()
 {
     // XXX: why is there no _component.unregisterMetricUpdateHook()?
     closeNextLink();
 }
 
 DistributorMetricSet&
-Distributor::getMetrics()
+TopLevelDistributor::getMetrics()
 {
     return _use_legacy_mode ? *_metrics : _total_metrics->bucket_db_updater_metrics();
 }
@@ -150,49 +150,49 @@ Distributor::getMetrics()
 //   All functions below that assert on _use_legacy_mode are only currently used by tests
 
 bool
-Distributor::isInRecoveryMode() const noexcept {
+TopLevelDistributor::isInRecoveryMode() const noexcept {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->isInRecoveryMode();
 }
 
 const PendingMessageTracker&
-Distributor::getPendingMessageTracker() const {
+TopLevelDistributor::getPendingMessageTracker() const {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->getPendingMessageTracker();
 }
 
 PendingMessageTracker&
-Distributor::getPendingMessageTracker() {
+TopLevelDistributor::getPendingMessageTracker() {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->getPendingMessageTracker();
 }
 
 DistributorBucketSpaceRepo&
-Distributor::getBucketSpaceRepo() noexcept {
+TopLevelDistributor::getBucketSpaceRepo() noexcept {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->getBucketSpaceRepo();
 }
 
 const DistributorBucketSpaceRepo&
-Distributor::getBucketSpaceRepo() const noexcept {
+TopLevelDistributor::getBucketSpaceRepo() const noexcept {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->getBucketSpaceRepo();
 }
 
 DistributorBucketSpaceRepo&
-Distributor::getReadOnlyBucketSpaceRepo() noexcept {
+TopLevelDistributor::getReadOnlyBucketSpaceRepo() noexcept {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->getReadOnlyBucketSpaceRepo();
 }
 
 const DistributorBucketSpaceRepo&
-Distributor::getReadyOnlyBucketSpaceRepo() const noexcept {
+TopLevelDistributor::getReadyOnlyBucketSpaceRepo() const noexcept {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->getReadOnlyBucketSpaceRepo();;
 }
 
 storage::distributor::DistributorStripeComponent&
-Distributor::distributor_component() noexcept {
+TopLevelDistributor::distributor_component() noexcept {
     assert(_use_legacy_mode); // TODO STRIPE
     // TODO STRIPE We need to grab the stripe's component since tests like to access
     //             these things uncomfortably directly.
@@ -200,61 +200,61 @@ Distributor::distributor_component() noexcept {
 }
 
 StripeBucketDBUpdater&
-Distributor::bucket_db_updater() {
+TopLevelDistributor::bucket_db_updater() {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->bucket_db_updater();
 }
 
 const StripeBucketDBUpdater&
-Distributor::bucket_db_updater() const {
+TopLevelDistributor::bucket_db_updater() const {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->bucket_db_updater();
 }
 
 IdealStateManager&
-Distributor::ideal_state_manager() {
+TopLevelDistributor::ideal_state_manager() {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->ideal_state_manager();
 }
 
 const IdealStateManager&
-Distributor::ideal_state_manager() const {
+TopLevelDistributor::ideal_state_manager() const {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->ideal_state_manager();
 }
 
 ExternalOperationHandler&
-Distributor::external_operation_handler() {
+TopLevelDistributor::external_operation_handler() {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->external_operation_handler();
 }
 
 const ExternalOperationHandler&
-Distributor::external_operation_handler() const {
+TopLevelDistributor::external_operation_handler() const {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->external_operation_handler();
 }
 
 BucketDBMetricUpdater&
-Distributor::bucket_db_metric_updater() const noexcept {
+TopLevelDistributor::bucket_db_metric_updater() const noexcept {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->_bucketDBMetricUpdater;
 }
 
 const DistributorConfiguration&
-Distributor::getConfig() const {
+TopLevelDistributor::getConfig() const {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->getConfig();
 }
 
 std::chrono::steady_clock::duration
-Distributor::db_memory_sample_interval() const noexcept {
+TopLevelDistributor::db_memory_sample_interval() const noexcept {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->db_memory_sample_interval();
 }
 
 void
-Distributor::setNodeStateUp()
+TopLevelDistributor::setNodeStateUp()
 {
     NodeStateUpdater::Lock::SP lock(_component.getStateUpdater().grabStateChangeLock());
     lib::NodeState ns(*_component.getStateUpdater().getReportedNodeState());
@@ -263,7 +263,7 @@ Distributor::setNodeStateUp()
 }
 
 void
-Distributor::onOpen()
+TopLevelDistributor::onOpen()
 {
     LOG(debug, "Distributor::onOpen invoked");
     setNodeStateUp();
@@ -280,7 +280,7 @@ Distributor::onOpen()
     }
 }
 
-void Distributor::onClose() {
+void TopLevelDistributor::onClose() {
     // Note: In a running system this function is called by the main thread in StorageApp as part of shutdown.
     // The distributor and stripe thread pools are already stopped at this point.
     LOG(debug, "Distributor::onClose invoked");
@@ -302,7 +302,7 @@ void Distributor::onClose() {
 }
 
 void
-Distributor::start_stripe_pool()
+TopLevelDistributor::start_stripe_pool()
 {
     if (!_use_legacy_mode) {
         std::vector<TickableStripe*> pool_stripes;
@@ -314,7 +314,7 @@ Distributor::start_stripe_pool()
 }
 
 void
-Distributor::sendUp(const std::shared_ptr<api::StorageMessage>& msg)
+TopLevelDistributor::sendUp(const std::shared_ptr<api::StorageMessage>& msg)
 {
     if (_messageSender) {
         _messageSender->sendUp(msg);
@@ -324,7 +324,7 @@ Distributor::sendUp(const std::shared_ptr<api::StorageMessage>& msg)
 }
 
 void
-Distributor::sendDown(const std::shared_ptr<api::StorageMessage>& msg)
+TopLevelDistributor::sendDown(const std::shared_ptr<api::StorageMessage>& msg)
 {
     if (_messageSender) {
         _messageSender->sendDown(msg);
@@ -378,14 +378,14 @@ get_bucket_id_for_striping(const api::StorageMessage& msg, const DistributorNode
 }
 
 uint32_t
-Distributor::random_stripe_idx()
+TopLevelDistributor::random_stripe_idx()
 {
     std::lock_guard lock(_random_stripe_gen_mutex);
     return _random_stripe_gen.nextUint32() % _stripes.size();
 }
 
 uint32_t
-Distributor::stripe_of_bucket_id(const document::BucketId& bucket_id, const api::StorageMessage& msg)
+TopLevelDistributor::stripe_of_bucket_id(const document::BucketId& bucket_id, const api::StorageMessage& msg)
 {
     if (!bucket_id.isSet()) {
         LOG(error, "Message (%s) has a bucket id (%s) that is not set. Cannot route to stripe",
@@ -403,7 +403,7 @@ Distributor::stripe_of_bucket_id(const document::BucketId& bucket_id, const api:
 }
 
 bool
-Distributor::onDown(const std::shared_ptr<api::StorageMessage>& msg)
+TopLevelDistributor::onDown(const std::shared_ptr<api::StorageMessage>& msg)
 {
     // TODO STRIPE can we route both requests and responses that are BucketCommand|Reply based on their bucket alone?
     //   that covers most operations already...
@@ -427,7 +427,7 @@ Distributor::onDown(const std::shared_ptr<api::StorageMessage>& msg)
 }
 
 bool
-Distributor::handleReply(const std::shared_ptr<api::StorageReply>& reply)
+TopLevelDistributor::handleReply(const std::shared_ptr<api::StorageReply>& reply)
 {
     // TODO STRIPE this is used by tests. Do we need to invoke top-level BucketDBUpdater for any of them?
     assert(_use_legacy_mode);
@@ -436,32 +436,32 @@ Distributor::handleReply(const std::shared_ptr<api::StorageReply>& reply)
 
 // TODO STRIPE we need to reintroduce the top-level message queue...
 bool
-Distributor::handleMessage(const std::shared_ptr<api::StorageMessage>& msg)
+TopLevelDistributor::handleMessage(const std::shared_ptr<api::StorageMessage>& msg)
 {
     assert(_use_legacy_mode); // TODO STRIPE
     return _stripe->handleMessage(msg);
 }
 
 const DistributorConfiguration&
-Distributor::config() const
+TopLevelDistributor::config() const
 {
     return *_total_config;
 }
 
 void
-Distributor::sendCommand(const std::shared_ptr<api::StorageCommand>& cmd)
+TopLevelDistributor::sendCommand(const std::shared_ptr<api::StorageCommand>& cmd)
 {
     sendUp(cmd);
 }
 
 void
-Distributor::sendReply(const std::shared_ptr<api::StorageReply>& reply)
+TopLevelDistributor::sendReply(const std::shared_ptr<api::StorageReply>& reply)
 {
     sendUp(reply);
 }
 
 const lib::ClusterStateBundle&
-Distributor::getClusterStateBundle() const
+TopLevelDistributor::getClusterStateBundle() const
 {
     assert(_use_legacy_mode); // TODO STRIPE
     // TODO STRIPE must offer a single unifying state across stripes
@@ -469,7 +469,7 @@ Distributor::getClusterStateBundle() const
 }
 
 void
-Distributor::enableClusterStateBundle(const lib::ClusterStateBundle& state)
+TopLevelDistributor::enableClusterStateBundle(const lib::ClusterStateBundle& state)
 {
     assert(_use_legacy_mode); // TODO STRIPE
     // TODO STRIPE make test injection/force-function
@@ -477,7 +477,7 @@ Distributor::enableClusterStateBundle(const lib::ClusterStateBundle& state)
 }
 
 void
-Distributor::storageDistributionChanged()
+TopLevelDistributor::storageDistributionChanged()
 {
     if (!_use_legacy_mode) {
         if (!_distribution || (*_component.getDistribution() != *_distribution)) {
@@ -496,7 +496,7 @@ Distributor::storageDistributionChanged()
 }
 
 void
-Distributor::enableNextDistribution()
+TopLevelDistributor::enableNextDistribution()
 {
     if (!_use_legacy_mode) {
         if (_next_distribution) {
@@ -513,7 +513,7 @@ Distributor::enableNextDistribution()
 // TODO STRIPE only used by tests to directly inject new distribution config
 //   - actually, also by ctor
 void
-Distributor::propagateDefaultDistribution(
+TopLevelDistributor::propagateDefaultDistribution(
         std::shared_ptr<const lib::Distribution> distribution)
 {
     // TODO STRIPE cannot directly access stripe when not in legacy mode!
@@ -530,7 +530,7 @@ Distributor::propagateDefaultDistribution(
 }
 
 std::unordered_map<uint16_t, uint32_t>
-Distributor::getMinReplica() const
+TopLevelDistributor::getMinReplica() const
 {
     if (_use_legacy_mode) {
         return _stripe->getMinReplica();
@@ -544,7 +544,7 @@ Distributor::getMinReplica() const
 }
 
 BucketSpacesStatsProvider::PerNodeBucketSpacesStats
-Distributor::getBucketSpacesStats() const
+TopLevelDistributor::getBucketSpacesStats() const
 {
     if (_use_legacy_mode) {
         return _stripe->getBucketSpacesStats();
@@ -558,7 +558,7 @@ Distributor::getBucketSpacesStats() const
 }
 
 SimpleMaintenanceScanner::PendingMaintenanceStats
-Distributor::pending_maintenance_stats() const {
+TopLevelDistributor::pending_maintenance_stats() const {
     if (_use_legacy_mode) {
         return _stripe->pending_maintenance_stats();
     } else {
@@ -571,7 +571,7 @@ Distributor::pending_maintenance_stats() const {
 }
 
 void
-Distributor::propagateInternalScanMetricsToExternal()
+TopLevelDistributor::propagateInternalScanMetricsToExternal()
 {
     if (_use_legacy_mode) {
         _stripe->propagateInternalScanMetricsToExternal();
@@ -585,14 +585,14 @@ Distributor::propagateInternalScanMetricsToExternal()
 }
 
 void
-Distributor::scanAllBuckets()
+TopLevelDistributor::scanAllBuckets()
 {
     assert(_use_legacy_mode); // TODO STRIPE
     _stripe->scanAllBuckets();
 }
 
 void
-Distributor::dispatch_to_main_distributor_thread_queue(const std::shared_ptr<api::StorageMessage>& msg)
+TopLevelDistributor::dispatch_to_main_distributor_thread_queue(const std::shared_ptr<api::StorageMessage>& msg)
 {
     MBUS_TRACE(msg->getTrace(), 9, "Distributor: Added to main thread message queue");
     framework::TickingLockGuard guard(_threadPool.freezeCriticalTicks());
@@ -601,7 +601,7 @@ Distributor::dispatch_to_main_distributor_thread_queue(const std::shared_ptr<api
 }
 
 void
-Distributor::fetch_external_messages()
+TopLevelDistributor::fetch_external_messages()
 {
     assert(!_use_legacy_mode);
     assert(_fetched_messages.empty());
@@ -609,7 +609,7 @@ Distributor::fetch_external_messages()
 }
 
 void
-Distributor::process_fetched_external_messages()
+TopLevelDistributor::process_fetched_external_messages()
 {
     assert(!_use_legacy_mode);
     for (auto& msg : _fetched_messages) {
@@ -626,7 +626,7 @@ Distributor::process_fetched_external_messages()
 }
 
 framework::ThreadWaitInfo
-Distributor::doCriticalTick(framework::ThreadIndex idx)
+TopLevelDistributor::doCriticalTick(framework::ThreadIndex idx)
 {
     _tickResult = framework::ThreadWaitInfo::NO_MORE_CRITICAL_WORK_KNOWN;
     if (!_use_legacy_mode) {
@@ -644,7 +644,7 @@ Distributor::doCriticalTick(framework::ThreadIndex idx)
 }
 
 framework::ThreadWaitInfo
-Distributor::doNonCriticalTick(framework::ThreadIndex idx)
+TopLevelDistributor::doNonCriticalTick(framework::ThreadIndex idx)
 {
     if (_use_legacy_mode) {
         _stripe->doNonCriticalTick(idx);
@@ -660,7 +660,7 @@ Distributor::doNonCriticalTick(framework::ThreadIndex idx)
 }
 
 void
-Distributor::enableNextConfig() // TODO STRIPE rename to enable_next_config_if_changed()?
+TopLevelDistributor::enableNextConfig() // TODO STRIPE rename to enable_next_config_if_changed()?
 {
     // Only lazily trigger a config propagation and internal update if something has _actually changed_.
     if (_component.internal_config_generation() != _current_internal_config_generation) {
@@ -683,7 +683,7 @@ Distributor::enableNextConfig() // TODO STRIPE rename to enable_next_config_if_c
 
 
 void
-Distributor::notify_stripe_wants_to_send_host_info(uint16_t stripe_index)
+TopLevelDistributor::notify_stripe_wants_to_send_host_info(uint16_t stripe_index)
 {
     LOG(debug, "Stripe %u has signalled an intent to send host info out-of-band", stripe_index);
     std::lock_guard lock(_stripe_scan_notify_mutex);
@@ -697,7 +697,7 @@ Distributor::notify_stripe_wants_to_send_host_info(uint16_t stripe_index)
 }
 
 bool
-Distributor::may_send_host_info_on_behalf_of_stripes([[maybe_unused]] std::lock_guard<std::mutex>& held_lock) noexcept
+TopLevelDistributor::may_send_host_info_on_behalf_of_stripes([[maybe_unused]] std::lock_guard<std::mutex>& held_lock) noexcept
 {
     bool any_stripe_wants_to_send = false;
     for (const auto& stats : _stripe_scan_stats) {
@@ -714,7 +714,7 @@ Distributor::may_send_host_info_on_behalf_of_stripes([[maybe_unused]] std::lock_
 }
 
 void
-Distributor::send_host_info_if_appropriate()
+TopLevelDistributor::send_host_info_if_appropriate()
 {
     const auto now = _component.getClock().getMonotonicTime();
     std::lock_guard lock(_stripe_scan_notify_mutex);
@@ -732,7 +732,7 @@ Distributor::send_host_info_if_appropriate()
 }
 
 void
-Distributor::fetch_status_requests()
+TopLevelDistributor::fetch_status_requests()
 {
     if (_fetched_status_requests.empty()) {
         _fetched_status_requests.swap(_status_to_do);
@@ -740,7 +740,7 @@ Distributor::fetch_status_requests()
 }
 
 void
-Distributor::handle_status_requests()
+TopLevelDistributor::handle_status_requests()
 {
     for (auto& s : _fetched_status_requests) {
         s->getReporter().reportStatus(s->getStream(), s->getPath());
@@ -753,19 +753,19 @@ Distributor::handle_status_requests()
 }
 
 void
-Distributor::signal_work_was_done()
+TopLevelDistributor::signal_work_was_done()
 {
     _tickResult = framework::ThreadWaitInfo::MORE_WORK_ENQUEUED;
 }
 
 bool
-Distributor::work_was_done() const noexcept
+TopLevelDistributor::work_was_done() const noexcept
 {
     return !_tickResult.waitWanted();
 }
 
 vespalib::string
-Distributor::getReportContentType(const framework::HttpUrlPath& path) const
+TopLevelDistributor::getReportContentType(const framework::HttpUrlPath& path) const
 {
     assert(!_use_legacy_mode);
     if (path.hasAttribute("page")) {
@@ -780,15 +780,15 @@ Distributor::getReportContentType(const framework::HttpUrlPath& path) const
 }
 
 std::string
-Distributor::getActiveIdealStateOperations() const
+TopLevelDistributor::getActiveIdealStateOperations() const
 {
     assert(_use_legacy_mode);
     return _stripe->getActiveIdealStateOperations();
 }
 
 bool
-Distributor::reportStatus(std::ostream& out,
-                          const framework::HttpUrlPath& path) const
+TopLevelDistributor::reportStatus(std::ostream& out,
+                                  const framework::HttpUrlPath& path) const
 {
     assert(!_use_legacy_mode);
     if (!path.hasAttribute("page") || path.getAttribute("page") == "buckets") {
@@ -827,7 +827,7 @@ Distributor::reportStatus(std::ostream& out,
 }
 
 bool
-Distributor::handleStatusRequest(const DelegatedStatusRequest& request) const
+TopLevelDistributor::handleStatusRequest(const DelegatedStatusRequest& request) const
 {
     assert(!_use_legacy_mode);
     auto wrappedRequest = std::make_shared<DistributorStatus>(request);
diff --git a/storage/src/vespa/storage/distributor/distributor.h b/storage/src/vespa/storage/distributor/top_level_distributor.h
index ad19af7a656..cd44252f4b0 100644
--- a/storage/src/vespa/storage/distributor/distributor.h
+++ b/storage/src/vespa/storage/distributor/top_level_distributor.h
@@ -52,7 +52,7 @@ class OwnershipTransferSafeTimePointCalculator;
 class SimpleMaintenanceScanner;
 class ThrottlingOperationStarter;
 
-class Distributor final
+class TopLevelDistributor final
     : public StorageLink,
       public DistributorInterface,
       public StatusDelegator,
@@ -63,16 +63,16 @@ class Distributor final
       public StripeHostInfoNotifier
 {
 public:
-    Distributor(DistributorComponentRegister&,
-                const NodeIdentity& node_identity,
-                framework::TickingThreadPool&,
-                DistributorStripePool& stripe_pool,
-                DoneInitializeHandler&,
-                uint32_t num_distributor_stripes,
-                HostInfo& hostInfoReporterRegistrar,
-                ChainedMessageSender* = nullptr);
+    TopLevelDistributor(DistributorComponentRegister&,
+                        const NodeIdentity& node_identity,
+                        framework::TickingThreadPool&,
+                        DistributorStripePool& stripe_pool,
+                        DoneInitializeHandler&,
+                        uint32_t num_distributor_stripes,
+                        HostInfo& hostInfoReporterRegistrar,
+                        ChainedMessageSender* = nullptr);
 
-    ~Distributor() override;
+    ~TopLevelDistributor() override;
 
     void onOpen() override;
     void onClose() override;
@@ -113,7 +113,7 @@ public:
     class MetricUpdateHook : public framework::MetricUpdateHook
     {
     public:
-        MetricUpdateHook(Distributor& self)
+        MetricUpdateHook(TopLevelDistributor& self)
             : _self(self)
         {
         }
@@ -123,7 +123,7 @@ public:
         }
 
     private:
-        Distributor& _self;
+        TopLevelDistributor& _self;
     };
 
 private:
diff --git a/storage/src/vespa/storage/storageserver/distributornode.cpp b/storage/src/vespa/storage/storageserver/distributornode.cpp
index 30e9f3097f3..0d129ffdb28 100644
--- a/storage/src/vespa/storage/storageserver/distributornode.cpp
+++ b/storage/src/vespa/storage/storageserver/distributornode.cpp
@@ -7,7 +7,7 @@
 #include "statemanager.h"
 #include <vespa/storage/common/hostreporter/hostinfo.h>
 #include <vespa/storage/common/i_storage_chain_builder.h>
-#include <vespa/storage/distributor/distributor.h>
+#include <vespa/storage/distributor/top_level_distributor.h>
 #include <vespa/storage/distributor/distributor_stripe_pool.h>
 #include <vespa/vespalib/util/exceptions.h>
 
@@ -103,7 +103,7 @@ DistributorNode::createChain(IStorageChainBuilder &builder)
     // Distributor instance registers a host info reporter with the state
     // manager, which is safe since the lifetime of said state manager
     // extends to the end of the process.
-    builder.add(std::make_unique<storage::distributor::Distributor>
+    builder.add(std::make_unique<storage::distributor::TopLevelDistributor>
                 (dcr, *_node_identity, *_threadPool, *_stripe_pool, getDoneInitializeHandler(),
                  _num_distributor_stripes,
                  stateManager->getHostInfo()));