Rename MultiValueMapping2 to MultiValueMapping.

23 files changed, 94 insertions, 94 deletions

diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt
index 313ada3f239..d8467148ae2 100644
--- a/searchlib/CMakeLists.txt
+++ b/searchlib/CMakeLists.txt
@@ -82,7 +82,7 @@ vespa_define_module(
     src/tests/attribute/enumstore
     src/tests/attribute/extendattributes
     src/tests/attribute/guard
-    src/tests/attribute/multi_value_mapping2
+    src/tests/attribute/multi_value_mapping
     src/tests/attribute/postinglist
     src/tests/attribute/postinglistattribute
     src/tests/attribute/searchable
diff --git a/searchlib/src/tests/attribute/multi_value_mapping/CMakeLists.txt b/searchlib/src/tests/attribute/multi_value_mapping/CMakeLists.txt
new file mode 100644
index 00000000000..c1b2072bc72
--- /dev/null
+++ b/searchlib/src/tests/attribute/multi_value_mapping/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(searchlib_multi_value_mapping_test_app TEST
+    SOURCES
+    multi_value_mapping_test.cpp
+    DEPENDS
+    searchlib
+)
+vespa_add_test(NAME searchlib_multi_value_mapping_test_app COMMAND searchlib_multi_value_mapping_test_app)
diff --git a/searchlib/src/tests/attribute/multi_value_mapping/DESC b/searchlib/src/tests/attribute/multi_value_mapping/DESC
new file mode 100644
index 00000000000..44c27ec9926
--- /dev/null
+++ b/searchlib/src/tests/attribute/multi_value_mapping/DESC
@@ -0,0 +1 @@
+This is a test for the MultivalueMapping class.
diff --git a/searchlib/src/tests/attribute/multi_value_mapping/FILES b/searchlib/src/tests/attribute/multi_value_mapping/FILES
new file mode 100644
index 00000000000..e6874376bb9
--- /dev/null
+++ b/searchlib/src/tests/attribute/multi_value_mapping/FILES
@@ -0,0 +1 @@
+multi_value_mapping_test.cpp
diff --git a/searchlib/src/tests/attribute/multi_value_mapping2/multi_value_mapping2_test.cpp b/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp
index a2d3a3a82ef..89ca125c45e 100644
--- a/searchlib/src/tests/attribute/multi_value_mapping2/multi_value_mapping2_test.cpp
+++ b/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp
@@ -1,10 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/fastos.h>
 #include <vespa/log/log.h>
-LOG_SETUP("multivaluemapping2_test");
+LOG_SETUP("multivaluemapping_test");
 #include <vespa/vespalib/testkit/test_kit.h>
-#include <vespa/searchlib/attribute/multi_value_mapping2.h>
-#include <vespa/searchlib/attribute/multi_value_mapping2.hpp>
+#include <vespa/searchlib/attribute/multi_value_mapping.h>
+#include <vespa/searchlib/attribute/multi_value_mapping.hpp>
 #include <vespa/searchlib/attribute/not_implemented_attribute.h>
 #include <vespa/vespalib/util/generationhandler.h>
 #include <vespa/vespalib/test/insertion_operators.h>
@@ -63,7 +63,7 @@ template <typename EntryT>
 class Fixture
 {
 protected:
-    using MvMapping = search::attribute::MultiValueMapping2<EntryT>;
+    using MvMapping = search::attribute::MultiValueMapping<EntryT>;
     MvMapping _mvMapping;
     MyAttribute<MvMapping> _attr;
     using RefType = typename MvMapping::RefType;
diff --git a/searchlib/src/tests/attribute/multi_value_mapping2/CMakeLists.txt b/searchlib/src/tests/attribute/multi_value_mapping2/CMakeLists.txt
deleted file mode 100644
index 3d450a93e06..00000000000
--- a/searchlib/src/tests/attribute/multi_value_mapping2/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_multi_value_mapping2_test_app TEST
-    SOURCES
-    multi_value_mapping2_test.cpp
-    DEPENDS
-    searchlib
-)
-vespa_add_test(NAME searchlib_multi_value_mapping2_test_app COMMAND searchlib_multi_value_mapping2_test_app)
diff --git a/searchlib/src/tests/attribute/multi_value_mapping2/DESC b/searchlib/src/tests/attribute/multi_value_mapping2/DESC
deleted file mode 100644
index ef382c63998..00000000000
--- a/searchlib/src/tests/attribute/multi_value_mapping2/DESC
+++ /dev/null
@@ -1 +0,0 @@
-This is a test for the MultivalueMapping2 class.
diff --git a/searchlib/src/tests/attribute/multi_value_mapping2/FILES b/searchlib/src/tests/attribute/multi_value_mapping2/FILES
deleted file mode 100644
index a2355329b3d..00000000000
--- a/searchlib/src/tests/attribute/multi_value_mapping2/FILES
+++ /dev/null
@@ -1 +0,0 @@
-multi_value_mapping2_test.cpp
diff --git a/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt b/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt
index a44fbf7025c..fce87a89d42 100644
--- a/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt
@@ -51,8 +51,8 @@ vespa_add_library(searchlib_attribute OBJECT
     loadednumericvalue.cpp
     loadedstringvalue.cpp
     loadedvalue.cpp
-    multi_value_mapping2.cpp
-    multi_value_mapping2_base.cpp
+    multi_value_mapping.cpp
+    multi_value_mapping_base.cpp
     multienumattribute.cpp
     multienumattributesaver.cpp
     multinumericattribute.cpp
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.h b/searchlib/src/vespa/searchlib/attribute/attributevector.h
index a4839a1a382..259b72037d1 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.h
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.h
@@ -56,7 +56,7 @@ namespace search {
         class IPostingListAttributeBase;
         class Interlock;
         class InterlockGuard;
-        class MultiValueMapping2Base;
+        class MultiValueMappingBase;
     }
 }
 
@@ -727,7 +727,7 @@ public:
     SearchContext::UP getSearch(const QueryPacketT &searchSpec, const SearchContext::Params & params) const;
     virtual SearchContext::UP getSearch(QueryTermSimple::UP term, const SearchContext::Params & params) const = 0;
     virtual const EnumStoreBase *getEnumStoreBase() const { return nullptr; }
-    virtual const attribute::MultiValueMapping2Base *getMultiValueBase() const { return nullptr; }
+    virtual const attribute::MultiValueMappingBase *getMultiValueBase() const { return nullptr; }
 private:
     void divideByZeroWarning();
     virtual bool applyWeight(DocId doc, const FieldValue &fv, const ArithmeticValueUpdate &wAdjust);
diff --git a/searchlib/src/vespa/searchlib/attribute/load_utils.cpp b/searchlib/src/vespa/searchlib/attribute/load_utils.cpp
index f33b6dc5385..dbd9817d9e4 100644
--- a/searchlib/src/vespa/searchlib/attribute/load_utils.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/load_utils.cpp
@@ -5,7 +5,7 @@
 #include "multivalue.h"
 #include "enumstorebase.h"
 #include "loadedenumvalue.h"
-#include "multi_value_mapping2.h"
+#include "multi_value_mapping.h"
 
 using search::multivalue::Value;
 using search::multivalue::WeightedValue;
@@ -14,9 +14,9 @@ namespace search {
 namespace attribute {
 
 #define INSTANTIATE_ARRAY(ValueType, Saver) \
-template uint32_t loadFromEnumeratedMultiValue(MultiValueMapping2<Value<ValueType>> &, AttributeVector::ReaderBase &, vespalib::ConstArrayRef<ValueType>, Saver)
+template uint32_t loadFromEnumeratedMultiValue(MultiValueMapping<Value<ValueType>> &, AttributeVector::ReaderBase &, vespalib::ConstArrayRef<ValueType>, Saver)
 #define INSTANTIATE_WSET(ValueType, Saver) \
-template uint32_t loadFromEnumeratedMultiValue(MultiValueMapping2<WeightedValue<ValueType>> &, AttributeVector::ReaderBase &, vespalib::ConstArrayRef<ValueType>, Saver)
+template uint32_t loadFromEnumeratedMultiValue(MultiValueMapping<WeightedValue<ValueType>> &, AttributeVector::ReaderBase &, vespalib::ConstArrayRef<ValueType>, Saver)
 #define INSTANTIATE_SINGLE(ValueType, Saver) \
 template void loadFromEnumeratedSingleValue(RcuVectorBase<ValueType> &, vespalib::GenerationHolder &, AttributeVector::ReaderBase &, vespalib::ConstArrayRef<ValueType>, Saver)
 
diff --git a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.cpp b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.cpp
new file mode 100644
index 00000000000..d6f1459f504
--- /dev/null
+++ b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.cpp
@@ -0,0 +1,32 @@
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include <vespa/fastos/fastos.h>
+#include "multi_value_mapping.h"
+#include "multi_value_mapping.hpp"
+#include "multivalue.h"
+#include "enumstorebase.h"
+#include "attributevector.h"
+
+using search::multivalue::Value;
+using search::multivalue::WeightedValue;
+
+namespace search {
+namespace attribute {
+
+template class MultiValueMapping<Value<EnumStoreIndex>>;
+template class MultiValueMapping<WeightedValue<EnumStoreIndex>>;
+template class MultiValueMapping<Value<int8_t>>;
+template class MultiValueMapping<WeightedValue<int8_t>>;
+template class MultiValueMapping<Value<int16_t>>;
+template class MultiValueMapping<WeightedValue<int16_t>>;
+template class MultiValueMapping<Value<int32_t>>;
+template class MultiValueMapping<WeightedValue<int32_t>>;
+template class MultiValueMapping<Value<int64_t>>;
+template class MultiValueMapping<WeightedValue<int64_t>>;
+template class MultiValueMapping<Value<float>>;
+template class MultiValueMapping<WeightedValue<float>>;
+template class MultiValueMapping<Value<double>>;
+template class MultiValueMapping<WeightedValue<double>>;
+
+} // namespace search::attribute
+} // namespace search
diff --git a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping2.h b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.h
index 2ddc09bb166..8c374d37de8 100644
--- a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping2.h
+++ b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "multi_value_mapping2_base.h"
+#include "multi_value_mapping_base.h"
 #include <vespa/searchlib/datastore/array_store.h>
 #include <vespa/searchlib/common/address_space.h>
 
@@ -13,7 +13,7 @@ namespace attribute {
  * Class for mapping from from document id to an array of values.
  */
 template <typename EntryT, typename RefT = datastore::EntryRefT<19> >
-class MultiValueMapping2 : public MultiValueMapping2Base
+class MultiValueMapping : public MultiValueMappingBase
 {
 public:
     using MultiValueType = EntryT;
@@ -25,9 +25,9 @@ private:
 
     ArrayStore _store;
 public:
-    MultiValueMapping2(const datastore::ArrayStoreConfig &storeCfg,
+    MultiValueMapping(const datastore::ArrayStoreConfig &storeCfg,
                        const GrowStrategy &gs = GrowStrategy());
-    virtual ~MultiValueMapping2();
+    virtual ~MultiValueMapping();
     ConstArrayRef get(uint32_t docId) const { return _store.get(_indices[docId]); }
     ConstArrayRef getDataForIdx(EntryRef idx) const { return _store.get(idx); }
     void set(uint32_t docId, ConstArrayRef values);
diff --git a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping2.hpp b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.hpp
index 0c6d5651cff..084c74a288a 100644
--- a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping2.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.hpp
@@ -8,20 +8,20 @@ namespace search {
 namespace attribute {
 
 template <typename EntryT, typename RefT>
-MultiValueMapping2<EntryT,RefT>::MultiValueMapping2(const datastore::ArrayStoreConfig &storeCfg, const GrowStrategy &gs)
-    : MultiValueMapping2Base(gs, _store.getGenerationHolder()),
+MultiValueMapping<EntryT,RefT>::MultiValueMapping(const datastore::ArrayStoreConfig &storeCfg, const GrowStrategy &gs)
+    : MultiValueMappingBase(gs, _store.getGenerationHolder()),
       _store(storeCfg)
 {
 }
 
 template <typename EntryT, typename RefT>
-MultiValueMapping2<EntryT,RefT>::~MultiValueMapping2()
+MultiValueMapping<EntryT,RefT>::~MultiValueMapping()
 {
 }
 
 template <typename EntryT, typename RefT>
 void
-MultiValueMapping2<EntryT,RefT>::set(uint32_t docId, ConstArrayRef values)
+MultiValueMapping<EntryT,RefT>::set(uint32_t docId, ConstArrayRef values)
 {
     _indices.ensure_size(docId + 1);
     EntryRef oldRef(_indices[docId]);
@@ -33,7 +33,7 @@ MultiValueMapping2<EntryT,RefT>::set(uint32_t docId, ConstArrayRef values)
 
 template <typename EntryT, typename RefT>
 void
-MultiValueMapping2<EntryT,RefT>::replace(uint32_t docId, ConstArrayRef values)
+MultiValueMapping<EntryT,RefT>::replace(uint32_t docId, ConstArrayRef values)
 {
     ConstArrayRef oldValues = _store.get(_indices[docId]);
     assert(oldValues.size() == values.size());
@@ -46,7 +46,7 @@ MultiValueMapping2<EntryT,RefT>::replace(uint32_t docId, ConstArrayRef values)
 
 template <typename EntryT, typename RefT>
 void
-MultiValueMapping2<EntryT,RefT>::compactWorst(bool compactMemory, bool compactAddressSpace)
+MultiValueMapping<EntryT,RefT>::compactWorst(bool compactMemory, bool compactAddressSpace)
 {
     datastore::ICompactionContext::UP compactionContext(_store.compactWorst(compactMemory, compactAddressSpace));
     if (compactionContext) {
@@ -57,20 +57,20 @@ MultiValueMapping2<EntryT,RefT>::compactWorst(bool compactMemory, bool compactAd
 
 template <typename EntryT, typename RefT>
 MemoryUsage
-MultiValueMapping2<EntryT,RefT>::getArrayStoreMemoryUsage() const
+MultiValueMapping<EntryT,RefT>::getArrayStoreMemoryUsage() const
 {
     return _store.getMemoryUsage();
 }
 
 template <typename EntryT, typename RefT>
 AddressSpace
-MultiValueMapping2<EntryT, RefT>::getAddressSpaceUsage() const {
+MultiValueMapping<EntryT, RefT>::getAddressSpaceUsage() const {
     return _store.addressSpaceUsage();
 }
 
 template <typename EntryT, typename RefT>
 datastore::ArrayStoreConfig
-MultiValueMapping2<EntryT, RefT>::optimizedConfigForHugePage(size_t maxSmallArraySize,
+MultiValueMapping<EntryT, RefT>::optimizedConfigForHugePage(size_t maxSmallArraySize,
                                                              size_t hugePageSize,
                                                              size_t smallPageSize,
                                                              size_t minNumArraysForNewBuffer)
diff --git a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping2.cpp b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping2.cpp
deleted file mode 100644
index f80aa301429..00000000000
--- a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping2.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include <vespa/fastos/fastos.h>
-#include "multi_value_mapping2.h"
-#include "multi_value_mapping2.hpp"
-#include "multivalue.h"
-#include "enumstorebase.h"
-#include "attributevector.h"
-
-using search::multivalue::Value;
-using search::multivalue::WeightedValue;
-
-namespace search {
-namespace attribute {
-
-template class MultiValueMapping2<Value<EnumStoreIndex>>;
-template class MultiValueMapping2<WeightedValue<EnumStoreIndex>>;
-template class MultiValueMapping2<Value<int8_t>>;
-template class MultiValueMapping2<WeightedValue<int8_t>>;
-template class MultiValueMapping2<Value<int16_t>>;
-template class MultiValueMapping2<WeightedValue<int16_t>>;
-template class MultiValueMapping2<Value<int32_t>>;
-template class MultiValueMapping2<WeightedValue<int32_t>>;
-template class MultiValueMapping2<Value<int64_t>>;
-template class MultiValueMapping2<WeightedValue<int64_t>>;
-template class MultiValueMapping2<Value<float>>;
-template class MultiValueMapping2<WeightedValue<float>>;
-template class MultiValueMapping2<Value<double>>;
-template class MultiValueMapping2<WeightedValue<double>>;
-
-} // namespace search::attribute
-} // namespace search
diff --git a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping2_base.cpp b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping_base.cpp
index 98d9cab6521..8ad7a868bb1 100644
--- a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping2_base.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping_base.cpp
@@ -1,7 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fastos/fastos.h>
-#include "multi_value_mapping2_base.h"
+#include "multi_value_mapping_base.h"
 #include <vespa/searchcommon/common/compaction_strategy.h>
 
 namespace search {
@@ -15,7 +15,7 @@ constexpr size_t DEAD_CLUSTERS_SLACK = 0x10000u;
 
 }
 
-MultiValueMapping2Base::MultiValueMapping2Base(const GrowStrategy &gs,
+MultiValueMappingBase::MultiValueMappingBase(const GrowStrategy &gs,
                                                vespalib::GenerationHolder &genHolder)
     : _indices(gs, genHolder),
       _totalValues(0u),
@@ -24,18 +24,18 @@ MultiValueMapping2Base::MultiValueMapping2Base(const GrowStrategy &gs,
 {
 }
 
-MultiValueMapping2Base::~MultiValueMapping2Base()
+MultiValueMappingBase::~MultiValueMappingBase()
 {
 }
 
-MultiValueMapping2Base::RefCopyVector
-MultiValueMapping2Base::getRefCopy(uint32_t size) const {
+MultiValueMappingBase::RefCopyVector
+MultiValueMappingBase::getRefCopy(uint32_t size) const {
     assert(size <= _indices.size());
     return RefCopyVector(&_indices[0], &_indices[0] + size);
 }
 
 void
-MultiValueMapping2Base::addDoc(uint32_t & docId)
+MultiValueMappingBase::addDoc(uint32_t & docId)
 {
     uint32_t retval = _indices.size();
     _indices.push_back(EntryRef());
@@ -43,14 +43,14 @@ MultiValueMapping2Base::addDoc(uint32_t & docId)
 }
 
 void
-MultiValueMapping2Base::shrink(uint32_t docIdLimit)
+MultiValueMappingBase::shrink(uint32_t docIdLimit)
 {
     assert(docIdLimit < _indices.size());
     _indices.shrink(docIdLimit);
 }
 
 void
-MultiValueMapping2Base::clearDocs(uint32_t lidLow, uint32_t lidLimit, std::function<void(uint32_t)> clearDoc)
+MultiValueMappingBase::clearDocs(uint32_t lidLow, uint32_t lidLimit, std::function<void(uint32_t)> clearDoc)
 {
     assert(lidLow <= lidLimit);
     assert(lidLimit <= _indices.size());
@@ -62,7 +62,7 @@ MultiValueMapping2Base::clearDocs(uint32_t lidLow, uint32_t lidLimit, std::funct
 }
 
 MemoryUsage
-MultiValueMapping2Base::getMemoryUsage() const
+MultiValueMappingBase::getMemoryUsage() const
 {
     MemoryUsage retval = getArrayStoreMemoryUsage();
     retval.merge(_indices.getMemoryUsage());
@@ -70,7 +70,7 @@ MultiValueMapping2Base::getMemoryUsage() const
 }
 
 MemoryUsage
-MultiValueMapping2Base::updateStat()
+MultiValueMappingBase::updateStat()
 {
     _cachedArrayStoreAddressSpaceUsage = getAddressSpaceUsage();
     MemoryUsage retval = getArrayStoreMemoryUsage();
@@ -80,7 +80,7 @@ MultiValueMapping2Base::updateStat()
 }
 
 bool
-MultiValueMapping2Base::considerCompact(const CompactionStrategy &compactionStrategy)
+MultiValueMappingBase::considerCompact(const CompactionStrategy &compactionStrategy)
 {
     size_t usedBytes = _cachedArrayStoreMemoryUsage.usedBytes();
     size_t deadBytes = _cachedArrayStoreMemoryUsage.deadBytes();
diff --git a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping2_base.h b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping_base.h
index 5ae1f0e7baa..d930d6a35d2 100644
--- a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping2_base.h
+++ b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping_base.h
@@ -17,7 +17,7 @@ namespace attribute {
 /**
  * Base class for mapping from from document id to an array of values.
  */
-class MultiValueMapping2Base
+class MultiValueMappingBase
 {
 public:
     using EntryRef = datastore::EntryRef;
@@ -29,8 +29,8 @@ protected:
     MemoryUsage _cachedArrayStoreMemoryUsage;
     AddressSpace _cachedArrayStoreAddressSpaceUsage;
 
-    MultiValueMapping2Base(const GrowStrategy &gs, vespalib::GenerationHolder &genHolder);
-    virtual ~MultiValueMapping2Base();
+    MultiValueMappingBase(const GrowStrategy &gs, vespalib::GenerationHolder &genHolder);
+    virtual ~MultiValueMappingBase();
 
     void updateValueCount(size_t oldValues, size_t newValues) {
         _totalValues += newValues - oldValues;
diff --git a/searchlib/src/vespa/searchlib/attribute/multienumattributesaver.h b/searchlib/src/vespa/searchlib/attribute/multienumattributesaver.h
index 960d3ea388f..fc8f3576165 100644
--- a/searchlib/src/vespa/searchlib/attribute/multienumattributesaver.h
+++ b/searchlib/src/vespa/searchlib/attribute/multienumattributesaver.h
@@ -21,7 +21,7 @@ class MultiValueEnumAttributeSaver : public MultiValueAttributeSaver
     using ValueType = typename MultiValueType::ValueType;
     using GenerationHandler = vespalib::GenerationHandler;
     using Parent::_frozenIndices;
-    using MultiValueMapping = attribute::MultiValueMapping2<MultiValueType>;
+    using MultiValueMapping = attribute::MultiValueMapping<MultiValueType>;
 
     const MultiValueMapping &_mvMapping;
     EnumAttributeSaver      _enumSaver;
diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericattributesaver.h b/searchlib/src/vespa/searchlib/attribute/multinumericattributesaver.h
index 990001bb4c3..9b786ea5769 100644
--- a/searchlib/src/vespa/searchlib/attribute/multinumericattributesaver.h
+++ b/searchlib/src/vespa/searchlib/attribute/multinumericattributesaver.h
@@ -20,7 +20,7 @@ class MultiValueNumericAttributeSaver : public MultiValueAttributeSaver
     using ValueType = typename MultiValueType::ValueType;
     using GenerationHandler = vespalib::GenerationHandler;
     using Parent::_frozenIndices;
-    using MultiValueMapping = attribute::MultiValueMapping2<MultiValueType>;
+    using MultiValueMapping = attribute::MultiValueMapping<MultiValueType>;
 
     const MultiValueMapping &_mvMapping;
 public:
diff --git a/searchlib/src/vespa/searchlib/attribute/multistringattribute.h b/searchlib/src/vespa/searchlib/attribute/multistringattribute.h
index 71857ec05d0..eeebf6c1841 100644
--- a/searchlib/src/vespa/searchlib/attribute/multistringattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/multistringattribute.h
@@ -6,7 +6,7 @@
 #include <vespa/searchlib/attribute/enumattribute.h>
 #include <vespa/searchlib/attribute/enumstore.h>
 #include <vespa/searchlib/attribute/multienumattribute.h>
-#include <vespa/searchlib/attribute/multi_value_mapping2.h>
+#include <vespa/searchlib/attribute/multi_value_mapping.h>
 #include "enumhintsearchcontext.h"
 #include "multivalue.h"
 
diff --git a/searchlib/src/vespa/searchlib/attribute/multivalueattribute.h b/searchlib/src/vespa/searchlib/attribute/multivalueattribute.h
index c7429f8bc08..a7da86b3eae 100644
--- a/searchlib/src/vespa/searchlib/attribute/multivalueattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/multivalueattribute.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "multi_value_mapping2.h"
+#include "multi_value_mapping.h"
 #include <vespa/vespalib/stllike/string.h>
 #include "attributevector.h"
 
@@ -24,7 +24,7 @@ protected:
     typedef typename B::ChangeVector::const_iterator            ChangeVectorIterator;
 
     using MultiValueType = M;
-    using MultiValueMapping = attribute::MultiValueMapping2<MultiValueType>;
+    using MultiValueMapping = attribute::MultiValueMapping<MultiValueType>;
     typedef typename MultiValueType::ValueType            ValueType;
     typedef std::vector<MultiValueType>                   ValueVector;
     using MultiValueArrayRef = vespalib::ConstArrayRef<MultiValueType>;
@@ -58,7 +58,7 @@ public:
 
     virtual bool addDoc(DocId & doc);
     virtual uint32_t getValueCount(DocId doc) const;
-    virtual const attribute::MultiValueMapping2Base *getMultiValueBase() const override {
+    virtual const attribute::MultiValueMappingBase *getMultiValueBase() const override {
         return &getMultiValueMapping();
     }
 
diff --git a/searchlib/src/vespa/searchlib/attribute/multivalueattributesaver.h b/searchlib/src/vespa/searchlib/attribute/multivalueattributesaver.h
index bcf7d0df177..e8b792cbb75 100644
--- a/searchlib/src/vespa/searchlib/attribute/multivalueattributesaver.h
+++ b/searchlib/src/vespa/searchlib/attribute/multivalueattributesaver.h
@@ -4,7 +4,7 @@
 
 #include "attributesaver.h"
 #include "iattributesavetarget.h"
-#include "multi_value_mapping2.h"
+#include "multi_value_mapping.h"
 
 namespace search {
 
@@ -15,7 +15,7 @@ class MultiValueAttributeSaver : public AttributeSaver
 {
 protected:
     using GenerationHandler = vespalib::GenerationHandler;
-    using MvMappingBase = attribute::MultiValueMapping2Base;
+    using MvMappingBase = attribute::MultiValueMappingBase;
     using RefCopyVector = MvMappingBase::RefCopyVector;
     RefCopyVector _frozenIndices;
 
diff --git a/searchlib/src/vespa/searchlib/attribute/postingchange.cpp b/searchlib/src/vespa/searchlib/attribute/postingchange.cpp
index f39bef2a8fc..9156c25c383 100644
--- a/searchlib/src/vespa/searchlib/attribute/postingchange.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/postingchange.cpp
@@ -3,7 +3,7 @@
 #include <vespa/fastos/fastos.h>
 #include "postingchange.h"
 #include "multivalue.h"
-#include "multi_value_mapping2.h"
+#include "multi_value_mapping.h"
 #include "postinglistattribute.h"
 #include <vespa/searchlib/common/bitvector.h>
 #include <map>
@@ -345,19 +345,19 @@ typedef EnumStoreBase::Index EnumIndex;
 typedef multivalue::WeightedValue<EnumIndex> WeightedIndex; 
 typedef multivalue::Value<EnumIndex> ValueIndex; 
 
-using WeightedMultiValueMapping2 = attribute::MultiValueMapping2<WeightedIndex>;
-using ValueMultiValueMapping2 = attribute::MultiValueMapping2<ValueIndex>;
+using WeightedMultiValueMapping = attribute::MultiValueMapping<WeightedIndex>;
+using ValueMultiValueMapping = attribute::MultiValueMapping<ValueIndex>;
 typedef std::vector<std::pair<uint32_t, std::vector<WeightedIndex>>> DocIndicesWeighted;
 typedef std::vector<std::pair<uint32_t, std::vector<ValueIndex>>> DocIndicesValue;
 
 template WeightedPostingChangeMap PostingChangeComputerT<WeightedIndex, WeightedPostingChangeMap>
-             ::compute<WeightedMultiValueMapping2>(const WeightedMultiValueMapping2 &,
+             ::compute<WeightedMultiValueMapping>(const WeightedMultiValueMapping &,
                                                    const DocIndicesWeighted &,
                                                    const EnumStoreComparator &,
                                                    const EnumIndexMapper &);
 
 template WeightedPostingChangeMap PostingChangeComputerT<ValueIndex, WeightedPostingChangeMap>
-             ::compute<ValueMultiValueMapping2>(const ValueMultiValueMapping2 &,
+             ::compute<ValueMultiValueMapping>(const ValueMultiValueMapping &,
                                                 const DocIndicesValue &,
                                                 const EnumStoreComparator &,
                                                 const EnumIndexMapper &);