1 files changed, 15 insertions, 15 deletions

diff --git a/searchcore/src/tests/proton/matching/handle_recorder/handle_recorder_test.cpp b/searchcore/src/tests/proton/matching/handle_recorder/handle_recorder_test.cpp
index b384f126f05..785d4887e72 100644
--- a/searchcore/src/tests/proton/matching/handle_recorder/handle_recorder_test.cpp
+++ b/searchcore/src/tests/proton/matching/handle_recorder/handle_recorder_test.cpp
@@ -17,8 +17,8 @@ using namespace proton::matching;
 using HandleMap = HandleRecorder::HandleMap;
 
 constexpr MatchDataDetails NormalMask = MatchDataDetails::Normal;
-constexpr MatchDataDetails CheapMask = MatchDataDetails::Cheap;
-constexpr MatchDataDetails BothMask = static_cast<MatchDataDetails>(static_cast<int>(NormalMask) | static_cast<int>(CheapMask));
+constexpr MatchDataDetails InterleavedMask = MatchDataDetails::Interleaved;
+constexpr MatchDataDetails BothMask = static_cast<MatchDataDetails>(static_cast<int>(NormalMask) | static_cast<int>(InterleavedMask));
 
 void
 register_normal_handle(TermFieldHandle handle)
@@ -27,22 +27,22 @@ register_normal_handle(TermFieldHandle handle)
 }
 
 void
-register_cheap_handle(TermFieldHandle handle)
+register_interleaved_features_handle(TermFieldHandle handle)
 {
-    HandleRecorder::register_handle(handle, MatchDataDetails::Cheap);
+    HandleRecorder::register_handle(handle, MatchDataDetails::Interleaved);
 }
 
-TEST(HandleRecorderTest, can_record_both_normal_and_cheap_handles)
+TEST(HandleRecorderTest, can_record_both_normal_and_interleaved_features_handles)
 {
     HandleRecorder recorder;
     {
         HandleRecorder::Binder binder(recorder);
         register_normal_handle(3);
-        register_cheap_handle(5);
+        register_interleaved_features_handle(5);
         register_normal_handle(7);
     }
-    EXPECT_EQ(HandleMap({{3, NormalMask}, {5, CheapMask}, {7, NormalMask}}), recorder.get_handles());
-    EXPECT_EQ("normal: [3,7], cheap: [5]", recorder.to_string());
+    EXPECT_EQ(HandleMap({{3, NormalMask}, {5, InterleavedMask}, {7, NormalMask}}), recorder.get_handles());
+    EXPECT_EQ("normal: [3,7], interleaved: [5]", recorder.to_string());
 }
 
 TEST(HandleRecorderTest, the_same_handle_can_be_in_both_normal_and_cheap_set)
@@ -51,7 +51,7 @@ TEST(HandleRecorderTest, the_same_handle_can_be_in_both_normal_and_cheap_set)
     {
         HandleRecorder::Binder binder(recorder);
         register_normal_handle(3);
-        register_cheap_handle(3);
+        register_interleaved_features_handle(3);
     }
     EXPECT_EQ(HandleMap({{3, BothMask}}), recorder.get_handles());
 }
@@ -59,11 +59,11 @@ TEST(HandleRecorderTest, the_same_handle_can_be_in_both_normal_and_cheap_set)
 namespace {
 
 void check_tagging(const TermFieldMatchData &tfmd, bool exp_not_needed,
-                   bool exp_needs_normal_features, bool exp_needs_cheap_features)
+                   bool exp_needs_normal_features, bool exp_needs_interleaved_features)
 {
     EXPECT_EQ(tfmd.isNotNeeded(), exp_not_needed);
     EXPECT_EQ(tfmd.needs_normal_features(), exp_needs_normal_features);
-    EXPECT_EQ(tfmd.needs_cheap_features(), exp_needs_cheap_features);
+    EXPECT_EQ(tfmd.needs_interleaved_features(), exp_needs_interleaved_features);
 }
 
 }
@@ -74,9 +74,9 @@ TEST(HandleRecorderTest, tagging_of_matchdata_works)
     {
         HandleRecorder::Binder binder(recorder);
         register_normal_handle(0);
-        register_cheap_handle(2);
+        register_interleaved_features_handle(2);
         register_normal_handle(3);
-        register_cheap_handle(3);
+        register_interleaved_features_handle(3);
     }
     auto md = MatchData::makeTestInstance(4, 4);
     recorder.tag_match_data(*md);
@@ -88,9 +88,9 @@ TEST(HandleRecorderTest, tagging_of_matchdata_works)
     {
         HandleRecorder::Binder binder(recorder2);
         register_normal_handle(0);
-        register_cheap_handle(0);
+        register_interleaved_features_handle(0);
         register_normal_handle(1);
-        register_cheap_handle(3);
+        register_interleaved_features_handle(3);
     }
     recorder2.tag_match_data(*md);
     check_tagging(*md->resolveTermField(0), false, true, true);