Rename ActiveDiskIndexes to DiskIndexes.

Rename IndexDiskDirActiveState to IndexDiskDirState.

13 files changed, 83 insertions, 83 deletions

diff --git a/searchcorespi/CMakeLists.txt b/searchcorespi/CMakeLists.txt
index 1029619150a..0bbaa813752 100644
--- a/searchcorespi/CMakeLists.txt
+++ b/searchcorespi/CMakeLists.txt
@@ -20,6 +20,6 @@ vespa_define_module(
     src/vespa/searchcorespi/index
 
     TESTS
-    src/tests/index/active_disk_indexes
+    src/tests/index/disk_indexes
     src/tests/index/index_disk_layout
 )
diff --git a/searchcorespi/src/tests/index/active_disk_indexes/CMakeLists.txt b/searchcorespi/src/tests/index/active_disk_indexes/CMakeLists.txt
deleted file mode 100644
index e10ada381bf..00000000000
--- a/searchcorespi/src/tests/index/active_disk_indexes/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchcorespi_active_disk_indexes_test_app
-    SOURCES
-    active_disk_indexes_test.cpp
-    DEPENDS
-    searchcorespi
-    GTest::GTest
-)
-vespa_add_test(NAME searchcorespi_active_disk_indexes_test_app COMMAND searchcorespi_active_disk_indexes_test_app)
diff --git a/searchcorespi/src/tests/index/disk_indexes/CMakeLists.txt b/searchcorespi/src/tests/index/disk_indexes/CMakeLists.txt
new file mode 100644
index 00000000000..81b6bb0e8a9
--- /dev/null
+++ b/searchcorespi/src/tests/index/disk_indexes/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(searchcorespi_disk_indexes_test_app
+    SOURCES
+    disk_indexes_test.cpp
+    DEPENDS
+    searchcorespi
+    GTest::GTest
+)
+vespa_add_test(NAME searchcorespi_disk_indexes_test_app COMMAND searchcorespi_disk_indexes_test_app)
diff --git a/searchcorespi/src/tests/index/active_disk_indexes/active_disk_indexes_test.cpp b/searchcorespi/src/tests/index/disk_indexes/disk_indexes_test.cpp
index 8e8e35ed194..d22ad499316 100644
--- a/searchcorespi/src/tests/index/active_disk_indexes/active_disk_indexes_test.cpp
+++ b/searchcorespi/src/tests/index/disk_indexes/disk_indexes_test.cpp
@@ -1,6 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/searchcorespi/index/activediskindexes.h>
+#include <vespa/searchcorespi/index/disk_indexes.h>
 #include <vespa/searchcorespi/index/index_disk_dir.h>
 #include <vespa/searchcorespi/index/indexdisklayout.h>
 #include <vespa/vespalib/io/fileutil.h>
@@ -18,13 +18,13 @@ constexpr uint32_t block_size = 4_Ki;
 
 namespace searchcorespi::index {
 
-class ActiveDiskIndexesTest : public ::testing::Test,
-                              public ActiveDiskIndexes
+class DiskIndexesTest : public ::testing::Test,
+                              public DiskIndexes
 {
     IndexDiskLayout _layout;
 protected:
-    ActiveDiskIndexesTest();
-    ~ActiveDiskIndexesTest();
+    DiskIndexesTest();
+    ~DiskIndexesTest();
 
     static IndexDiskDir get_index_disk_dir(const vespalib::string& dir) {
         return IndexDiskLayout::get_index_disk_dir(dir);
@@ -35,16 +35,16 @@ protected:
     }
 };
 
-ActiveDiskIndexesTest::ActiveDiskIndexesTest()
+DiskIndexesTest::DiskIndexesTest()
     : ::testing::Test(),
-      ActiveDiskIndexes(),
+      DiskIndexes(),
       _layout(base_dir)
 {
 }
 
-ActiveDiskIndexesTest::~ActiveDiskIndexesTest() = default;
+DiskIndexesTest::~DiskIndexesTest() = default;
 
-TEST_F(ActiveDiskIndexesTest, simple_set_active_works)
+TEST_F(DiskIndexesTest, simple_set_active_works)
 {
     EXPECT_FALSE(isActive("index.flush.1"));
     setActive("index.flush.1", 0);
@@ -53,7 +53,7 @@ TEST_F(ActiveDiskIndexesTest, simple_set_active_works)
     EXPECT_FALSE(isActive("index.flush.1"));
 }
 
-TEST_F(ActiveDiskIndexesTest, nested_set_active_works)
+TEST_F(DiskIndexesTest, nested_set_active_works)
 {
     setActive("index.flush.1", 0);
     setActive("index.flush.1", 0);
@@ -64,13 +64,13 @@ TEST_F(ActiveDiskIndexesTest, nested_set_active_works)
     EXPECT_FALSE(isActive("index.flush.1"));
 }
 
-TEST_F(ActiveDiskIndexesTest, is_active_returns_false_for_bad_name)
+TEST_F(DiskIndexesTest, is_active_returns_false_for_bad_name)
 {
     EXPECT_FALSE(isActive("foo/bar/baz"));
     EXPECT_FALSE(isActive("index.flush.0"));
 }
 
-TEST_F(ActiveDiskIndexesTest, remove_works)
+TEST_F(DiskIndexesTest, remove_works)
 {
     EXPECT_TRUE(remove(IndexDiskDir()));
     auto fusion1 = get_index_disk_dir("index.fusion.1");
@@ -83,7 +83,7 @@ TEST_F(ActiveDiskIndexesTest, remove_works)
     EXPECT_TRUE(remove(fusion1));
 }
 
-TEST_F(ActiveDiskIndexesTest, basic_get_transient_size_works)
+TEST_F(DiskIndexesTest, basic_get_transient_size_works)
 {
     /*
      * When starting to use a new fusion index, we have a transient
@@ -128,7 +128,7 @@ TEST_F(ActiveDiskIndexesTest, basic_get_transient_size_works)
     }
 }
 
-TEST_F(ActiveDiskIndexesTest, get_transient_size_during_ongoing_fusion)
+TEST_F(DiskIndexesTest, get_transient_size_during_ongoing_fusion)
 {
     /*
      * During ongoing fusion, we have one ISearchableIndexCollection instance:
diff --git a/searchcorespi/src/vespa/searchcorespi/index/CMakeLists.txt b/searchcorespi/src/vespa/searchcorespi/index/CMakeLists.txt
index 1987304dc7e..3995eb836fd 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/CMakeLists.txt
+++ b/searchcorespi/src/vespa/searchcorespi/index/CMakeLists.txt
@@ -1,14 +1,14 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(searchcorespi_index OBJECT
     SOURCES
-    activediskindexes.cpp
     diskindexcleaner.cpp
+    disk_indexes.cpp
     disk_index_stats.cpp
     eventlogger.cpp
     fusionrunner.cpp
     iindexmanager.cpp
     iindexcollection.cpp
-    index_disk_dir_active_state.cpp
+    index_disk_dir_state.cpp
     index_manager_explorer.cpp
     index_manager_stats.cpp
     indexcollection.cpp
diff --git a/searchcorespi/src/vespa/searchcorespi/index/activediskindexes.cpp b/searchcorespi/src/vespa/searchcorespi/index/disk_indexes.cpp
index b2623d04b08..28f6a886d06 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/activediskindexes.cpp
+++ b/searchcorespi/src/vespa/searchcorespi/index/disk_indexes.cpp
@@ -1,9 +1,9 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include "activediskindexes.h"
+#include "disk_indexes.h"
 #include "indexdisklayout.h"
 #include "index_disk_dir.h"
-#include "index_disk_dir_active_state.h"
+#include "index_disk_dir_state.h"
 #include <vespa/searchlib/util/dirtraverse.h>
 #include <cassert>
 #include <vector>
@@ -12,23 +12,23 @@ using vespalib::string;
 
 namespace searchcorespi::index {
 
-ActiveDiskIndexes::ActiveDiskIndexes() = default;
-ActiveDiskIndexes::~ActiveDiskIndexes() = default;
+DiskIndexes::DiskIndexes() = default;
+DiskIndexes::~DiskIndexes() = default;
 
 void
-ActiveDiskIndexes::setActive(const string &index, uint64_t size_on_disk)
+DiskIndexes::setActive(const string &index, uint64_t size_on_disk)
 {
     auto index_disk_dir = IndexDiskLayout::get_index_disk_dir(index);
     assert(index_disk_dir.valid());
     std::lock_guard lock(_lock);
-    auto insres = _active.insert(std::make_pair(index_disk_dir, IndexDiskDirActiveState()));
+    auto insres = _active.insert(std::make_pair(index_disk_dir, IndexDiskDirState()));
     insres.first->second.activate();
     if (!insres.first->second.get_size_on_disk().has_value()) {
         insres.first->second.set_size_on_disk(size_on_disk);
     }
 }
 
-void ActiveDiskIndexes::notActive(const string & index) {
+void DiskIndexes::notActive(const string & index) {
     auto index_disk_dir = IndexDiskLayout::get_index_disk_dir(index);
     assert(index_disk_dir.valid());
     std::lock_guard lock(_lock);
@@ -41,7 +41,7 @@ void ActiveDiskIndexes::notActive(const string & index) {
     }
 }
 
-bool ActiveDiskIndexes::isActive(const string &index) const {
+bool DiskIndexes::isActive(const string &index) const {
     auto index_disk_dir = IndexDiskLayout::get_index_disk_dir(index);
     if (!index_disk_dir.valid()) {
         return false;
@@ -53,14 +53,14 @@ bool ActiveDiskIndexes::isActive(const string &index) const {
 
 
 void
-ActiveDiskIndexes::add_not_active(IndexDiskDir index_disk_dir)
+DiskIndexes::add_not_active(IndexDiskDir index_disk_dir)
 {
     std::lock_guard lock(_lock);
-    _active.insert(std::make_pair(index_disk_dir, IndexDiskDirActiveState()));
+    _active.insert(std::make_pair(index_disk_dir, IndexDiskDirState()));
 }
 
 bool
-ActiveDiskIndexes::remove(IndexDiskDir index_disk_dir)
+DiskIndexes::remove(IndexDiskDir index_disk_dir)
 {
     if (!index_disk_dir.valid()) {
         return true;
@@ -78,7 +78,7 @@ ActiveDiskIndexes::remove(IndexDiskDir index_disk_dir)
 }
 
 uint64_t
-ActiveDiskIndexes::get_transient_size(IndexDiskLayout& layout, IndexDiskDir index_disk_dir) const
+DiskIndexes::get_transient_size(IndexDiskLayout& layout, IndexDiskDir index_disk_dir) const
 {
     /*
      * Only report transient size related to a valid fusion index. This ensures
diff --git a/searchcorespi/src/vespa/searchcorespi/index/activediskindexes.h b/searchcorespi/src/vespa/searchcorespi/index/disk_indexes.h
index 4eed7ae47f9..844e1687ffb 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/activediskindexes.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/disk_indexes.h
@@ -10,23 +10,23 @@
 namespace searchcorespi::index {
 
 class IndexDiskDir;
-class IndexDiskDirActiveState;
+class IndexDiskDirState;
 class IndexDiskLayout;
 
 /**
  * Class used to keep track of the set of active disk indexes in an index maintainer.
  * The index directories are used as identifiers.
  */
-class ActiveDiskIndexes {
-    std::map<IndexDiskDir, IndexDiskDirActiveState> _active;
+class DiskIndexes {
+    std::map<IndexDiskDir, IndexDiskDirState> _active;
     mutable std::mutex _lock;
 
 public:
-    using SP = std::shared_ptr<ActiveDiskIndexes>;
-    ActiveDiskIndexes();
-    ~ActiveDiskIndexes();
-    ActiveDiskIndexes(const ActiveDiskIndexes &) = delete;
-    ActiveDiskIndexes & operator = (const ActiveDiskIndexes &) = delete;
+    using SP = std::shared_ptr<DiskIndexes>;
+    DiskIndexes();
+    ~DiskIndexes();
+    DiskIndexes(const DiskIndexes &) = delete;
+    DiskIndexes & operator = (const DiskIndexes &) = delete;
     void setActive(const vespalib::string & index, uint64_t size_on_disk);
     void notActive(const vespalib::string & index);
     bool isActive(const vespalib::string & index) const;
diff --git a/searchcorespi/src/vespa/searchcorespi/index/diskindexcleaner.cpp b/searchcorespi/src/vespa/searchcorespi/index/diskindexcleaner.cpp
index c1ee0b441c9..3bed7ea8ea7 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/diskindexcleaner.cpp
+++ b/searchcorespi/src/vespa/searchcorespi/index/diskindexcleaner.cpp
@@ -1,7 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "diskindexcleaner.h"
-#include "activediskindexes.h"
+#include "disk_indexes.h"
 #include "indexdisklayout.h"
 #include "index_disk_dir.h"
 #include <vespa/fastos/file.h>
@@ -82,13 +82,13 @@ bool isOldIndex(const string &index, uint32_t last_fusion_id) {
 }
 
 void removeOld(const string &base_dir, const vector<string> &indexes,
-               ActiveDiskIndexes &active_indexes, bool remove) {
+               DiskIndexes &disk_indexes, bool remove) {
     uint32_t last_fusion_id = findLastFusionId(base_dir, indexes);
     for (size_t i = 0; i < indexes.size(); ++i) {
         const string index_dir = base_dir + "/" + indexes[i];
         auto index_disk_dir = IndexDiskLayout::get_index_disk_dir(indexes[i]);
         if (isOldIndex(indexes[i], last_fusion_id) &&
-            active_indexes.remove(index_disk_dir)) {
+            disk_indexes.remove(index_disk_dir)) {
             if (remove) {
                 removeDir(index_dir);
             } else {
@@ -110,16 +110,16 @@ void removeInvalid(const string &base_dir, const vector<string> &indexes) {
 }  // namespace
 
 void DiskIndexCleaner::clean(const string &base_dir,
-                             ActiveDiskIndexes &active_indexes) {
+                             DiskIndexes &disk_indexes) {
     vector<string> indexes = readIndexes(base_dir);
-    removeOld(base_dir, indexes, active_indexes, false);
+    removeOld(base_dir, indexes, disk_indexes, false);
     removeInvalid(base_dir, indexes);
 }
 
 void DiskIndexCleaner::removeOldIndexes(
-        const string &base_dir, ActiveDiskIndexes &active_indexes) {
+        const string &base_dir, DiskIndexes &disk_indexes) {
     vector<string> indexes = readIndexes(base_dir);
-    removeOld(base_dir, indexes, active_indexes, true);
+    removeOld(base_dir, indexes, disk_indexes, true);
 }
 
 }
diff --git a/searchcorespi/src/vespa/searchcorespi/index/diskindexcleaner.h b/searchcorespi/src/vespa/searchcorespi/index/diskindexcleaner.h
index 50179087de6..cbd3a5aa94f 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/diskindexcleaner.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/diskindexcleaner.h
@@ -6,7 +6,7 @@
 
 namespace searchcorespi {
 namespace index {
-class ActiveDiskIndexes;
+class DiskIndexes;
 
 /**
  * Utility class used to clean and remove index directories.
@@ -16,9 +16,9 @@ struct DiskIndexCleaner {
      * Deletes all indexes with id lower than the most recent fusion id.
      */
     static void clean(const vespalib::string &index_dir,
-                      ActiveDiskIndexes& active_indexes);
+                      DiskIndexes& disk_indexes);
     static void removeOldIndexes(const vespalib::string &index_dir,
-                                 ActiveDiskIndexes& active_indexes);
+                                 DiskIndexes& disk_indexes);
 };
 
 }  // namespace index
diff --git a/searchcorespi/src/vespa/searchcorespi/index/index_disk_dir_active_state.cpp b/searchcorespi/src/vespa/searchcorespi/index/index_disk_dir_state.cpp
index 603971c866e..ffe33d704c8 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/index_disk_dir_active_state.cpp
+++ b/searchcorespi/src/vespa/searchcorespi/index/index_disk_dir_state.cpp
@@ -1,12 +1,12 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include "index_disk_dir_active_state.h"
+#include "index_disk_dir_state.h"
 #include <cassert>
 
 namespace searchcorespi::index {
 
 void
-IndexDiskDirActiveState::deactivate() noexcept
+IndexDiskDirState::deactivate() noexcept
 {
     assert(_active_count > 0u);
     --_active_count;
diff --git a/searchcorespi/src/vespa/searchcorespi/index/index_disk_dir_active_state.h b/searchcorespi/src/vespa/searchcorespi/index/index_disk_dir_state.h
index fb6b63bfb48..d8b790b3960 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/index_disk_dir_active_state.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/index_disk_dir_state.h
@@ -8,13 +8,13 @@
 namespace searchcorespi::index {
 
 /*
- * Class describing active state for a disk index directory.
+ * Class describing state for a disk index directory.
  */
-class IndexDiskDirActiveState {
+class IndexDiskDirState {
     uint32_t _active_count;
     std::optional<uint64_t> _size_on_disk;
 public:
-    IndexDiskDirActiveState()
+    IndexDiskDirState()
         : _active_count(0),
           _size_on_disk()
     {
diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp
index 43ecfe8e99d..afe5b573f21 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp
+++ b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp
@@ -91,18 +91,18 @@ private:
     IDiskIndex::SP                       _index;
     IndexDiskDir                         _index_disk_dir;
     IndexDiskLayout&                     _layout;
-    ActiveDiskIndexes&                   _active_indexes;
+    DiskIndexes&                         _disk_indexes;
 
 public:
     DiskIndexWithDestructorCallback(IDiskIndex::SP index,
                                     std::shared_ptr<IDestructorCallback> callback,
                                     IndexDiskLayout& layout,
-                                    ActiveDiskIndexes& active_indexes) noexcept
+                                    DiskIndexes& disk_indexes) noexcept
         : _callback(std::move(callback)),
           _index(std::move(index)),
           _index_disk_dir(IndexDiskLayout::get_index_disk_dir(_index->getIndexDir())),
           _layout(layout),
-          _active_indexes(active_indexes)
+          _disk_indexes(disk_indexes)
     {
     }
     ~DiskIndexWithDestructorCallback() override;
@@ -156,7 +156,7 @@ search::SearchableStats
 DiskIndexWithDestructorCallback::getSearchableStats() const
 {
     auto stats = _index->getSearchableStats();
-    uint64_t transient_size = _active_indexes.get_transient_size(_layout, _index_disk_dir);
+    uint64_t transient_size = _disk_indexes.get_transient_size(_layout, _index_disk_dir);
     stats.fusion_size_on_disk(transient_size);
     return stats;
 }
@@ -291,7 +291,7 @@ IndexMaintainer::updateActiveFusionPrunedSchema(const Schema &schema)
 void
 IndexMaintainer::deactivateDiskIndexes(vespalib::string indexDir)
 {
-    _active_indexes->notActive(indexDir);
+    _disk_indexes->notActive(indexDir);
     removeOldDiskIndexes();
 }
 
@@ -305,11 +305,11 @@ IndexMaintainer::loadDiskIndex(const string &indexDir)
     vespalib::Timer timer;
     auto index = _operations.loadDiskIndex(indexDir);
     auto stats = index->getSearchableStats();
-    _active_indexes->setActive(indexDir, stats.sizeOnDisk());
+    _disk_indexes->setActive(indexDir, stats.sizeOnDisk());
     auto retval = std::make_shared<DiskIndexWithDestructorCallback>(
             std::move(index),
             makeLambdaCallback([this, indexDir]() { deactivateDiskIndexes(indexDir); }),
-            _layout, *_active_indexes);
+            _layout, *_disk_indexes);
     if (LOG_WOULD_LOG(event)) {
         EventLogger::diskIndexLoadComplete(indexDir, vespalib::count_ms(timer.elapsed()));
     }
@@ -328,11 +328,11 @@ IndexMaintainer::reloadDiskIndex(const IDiskIndex &oldIndex)
     const IDiskIndex &wrappedDiskIndex = (dynamic_cast<const DiskIndexWithDestructorCallback &>(oldIndex)).getWrapped();
     auto index = _operations.reloadDiskIndex(wrappedDiskIndex);
     auto stats = index->getSearchableStats();
-    _active_indexes->setActive(indexDir, stats.sizeOnDisk());
+    _disk_indexes->setActive(indexDir, stats.sizeOnDisk());
     auto retval = std::make_shared<DiskIndexWithDestructorCallback>(
             std::move(index),
             makeLambdaCallback([this, indexDir]() { deactivateDiskIndexes(indexDir); }),
-            _layout, *_active_indexes);
+            _layout, *_disk_indexes);
     if (LOG_WOULD_LOG(event)) {
         EventLogger::diskIndexLoadComplete(indexDir, vespalib::count_ms(timer.elapsed()));
     }
@@ -869,7 +869,7 @@ IndexMaintainer::IndexMaintainer(const IndexMaintainerConfig &config,
                                  IIndexMaintainerOperations &operations)
     : _base_dir(config.getBaseDir()),
       _warmupConfig(config.getWarmup()),
-      _active_indexes(std::make_shared<ActiveDiskIndexes>()),
+      _disk_indexes(std::make_shared<DiskIndexes>()),
       _layout(config.getBaseDir()),
       _schema(config.getSchema()),
       _activeFusionSchema(),
@@ -902,7 +902,7 @@ IndexMaintainer::IndexMaintainer(const IndexMaintainerConfig &config,
 {
     // Called by document db init executor thread
     _changeGens.bumpPruneGen();
-    DiskIndexCleaner::clean(_base_dir, *_active_indexes);
+    DiskIndexCleaner::clean(_base_dir, *_disk_indexes);
     FusionSpec spec = IndexReadUtilities::readFusionSpec(_base_dir);
     _next_id = 1 + (spec.flush_ids.empty() ? spec.last_fusion_id : spec.flush_ids.back());
     _last_fusion_id = spec.last_fusion_id;
@@ -1041,21 +1041,21 @@ IndexMaintainer::doFusion(SerialNum serialNum, std::shared_ptr<search::IFlushTok
 namespace {
 
 class RemoveFusionIndexGuard {
-    ActiveDiskIndexes* _active_indexes;
+    DiskIndexes*       _disk_indexes;
     IndexDiskDir       _index_disk_dir;
 public:
-    RemoveFusionIndexGuard(ActiveDiskIndexes& active_indexes, IndexDiskDir index_disk_dir)
-        : _active_indexes(&active_indexes),
+    RemoveFusionIndexGuard(DiskIndexes& disk_indexes, IndexDiskDir index_disk_dir)
+        : _disk_indexes(&disk_indexes),
           _index_disk_dir(index_disk_dir)
     {
-        _active_indexes->add_not_active(index_disk_dir);
+        _disk_indexes->add_not_active(index_disk_dir);
     }
     ~RemoveFusionIndexGuard() {
-        if (_active_indexes != nullptr) {
-            (void) _active_indexes->remove(_index_disk_dir);
+        if (_disk_indexes != nullptr) {
+            (void) _disk_indexes->remove(_index_disk_dir);
         }
     }
-    void reset() { _active_indexes = nullptr; }
+    void reset() { _disk_indexes = nullptr; }
 };
 
 }
@@ -1081,7 +1081,7 @@ IndexMaintainer::runFusion(const FusionSpec &fusion_spec, std::shared_ptr<search
         serialNum = IndexReadUtilities::readSerialNum(lastFlushDir);
     }
     IndexDiskDir fusion_index_disk_dir(fusion_spec.flush_ids.back(), true);
-    RemoveFusionIndexGuard remove_fusion_index_guard(*_active_indexes, fusion_index_disk_dir);
+    RemoveFusionIndexGuard remove_fusion_index_guard(*_disk_indexes, fusion_index_disk_dir);
     FusionRunner fusion_runner(_base_dir, args._schema, tuneFileAttributes, _ctx.getFileHeaderContext());
     uint32_t new_fusion_id = fusion_runner.fuse(fusion_spec, serialNum, _operations, flush_token);
     bool ok = (new_fusion_id != 0);
@@ -1150,7 +1150,7 @@ void
 IndexMaintainer::removeOldDiskIndexes()
 {
     LockGuard slock(_remove_lock);
-    DiskIndexCleaner::removeOldIndexes(_base_dir, *_active_indexes);
+    DiskIndexCleaner::removeOldIndexes(_base_dir, *_disk_indexes);
 }
 
 IndexMaintainer::FlushStats
diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h
index 8213c02b90c..fa7a9145a3c 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "iindexmanager.h"
-#include "activediskindexes.h"
+#include "disk_indexes.h"
 #include "fusionspec.h"
 #include "idiskindex.h"
 #include "iindexmaintaineroperations.h"
@@ -76,7 +76,7 @@ class IndexMaintainer : public IIndexManager,
 
     const vespalib::string _base_dir;
     const WarmupConfig     _warmupConfig;
-    ActiveDiskIndexes::SP  _active_indexes;
+    DiskIndexes::SP        _disk_indexes;
     IndexDiskLayout        _layout;
     Schema                 _schema;             // Protected by SL + IUL
     Schema::SP             _activeFusionSchema; // Protected by SL + IUL