diff --git a/server/src/main/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilter.java b/server/src/main/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilter.java
index 3265ab8addc..86e8dcadb5b 100644
--- a/server/src/main/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilter.java
+++ b/server/src/main/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilter.java
@@ -24,7 +24,7 @@ import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
import org.apache.lucene.util.BytesRef;
-import org.elasticsearch.common.hash.MurmurHash3;
+import org.opensearch.common.hash.MurmurHash3;
import java.io.IOException;
import java.util.ArrayList;
@@ -34,14 +34,14 @@ import java.util.ArrayList;
* have a minimum length - 6 is a good heuristic as it avoids filtering common
* idioms/phrases but detects longer sections that are typical of cut+paste
* copies of text.
- *
+ *
*
* Internally each token is hashed/moduloed into a single byte (so 256 possible
* values for each token) and then recorded in a trie of seen byte sequences
* using a {@link DuplicateByteSequenceSpotter}. This trie is passed into the
* TokenFilter constructor so a single object can be reused across multiple
* documents.
- *
+ *
*
* The emitDuplicates setting controls if duplicate tokens are filtered from
* results or are output (the {@link DuplicateSequenceAttribute} attribute can
@@ -57,7 +57,7 @@ public class DeDuplicatingTokenFilter extends FilteringTokenFilter {
}
/**
- *
+ *
* @param in
* The input token stream
* @param byteStreamDuplicateSpotter
@@ -110,9 +110,9 @@ public class DeDuplicatingTokenFilter extends FilteringTokenFilter {
}
public void loadAllTokens() throws IOException {
- // TODO consider changing this implementation to emit tokens as-we-go
- // rather than buffering all. However this array is perhaps not the
- // bulk of memory usage (in practice the dupSequenceSpotter requires
+ // TODO consider changing this implementation to emit tokens as-we-go
+ // rather than buffering all. However this array is perhaps not the
+ // bulk of memory usage (in practice the dupSequenceSpotter requires
// ~5x the original content size in its internal tree ).
allTokens = new ArrayList(256);
@@ -198,4 +198,4 @@ public class DeDuplicatingTokenFilter extends FilteringTokenFilter {
}
}
-}
\ No newline at end of file
+}
diff --git a/server/src/main/java/org/apache/lucene/index/ShuffleForcedMergePolicy.java b/server/src/main/java/org/apache/lucene/index/ShuffleForcedMergePolicy.java
index b69523d83e7..277c35e40cc 100644
--- a/server/src/main/java/org/apache/lucene/index/ShuffleForcedMergePolicy.java
+++ b/server/src/main/java/org/apache/lucene/index/ShuffleForcedMergePolicy.java
@@ -19,7 +19,7 @@
package org.apache.lucene.index;
-import org.elasticsearch.common.lucene.Lucene;
+import org.opensearch.common.lucene.Lucene;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/server/src/main/java/org/apache/lucene/queries/BinaryDocValuesRangeQuery.java b/server/src/main/java/org/apache/lucene/queries/BinaryDocValuesRangeQuery.java
index 0c3de3b7ed2..b7afe385f75 100644
--- a/server/src/main/java/org/apache/lucene/queries/BinaryDocValuesRangeQuery.java
+++ b/server/src/main/java/org/apache/lucene/queries/BinaryDocValuesRangeQuery.java
@@ -32,7 +32,7 @@ import org.apache.lucene.search.TwoPhaseIterator;
import org.apache.lucene.search.Weight;
import org.apache.lucene.store.ByteArrayDataInput;
import org.apache.lucene.util.BytesRef;
-import org.elasticsearch.index.mapper.RangeType;
+import org.opensearch.index.mapper.RangeType;
import java.io.IOException;
import java.util.Objects;
diff --git a/server/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java b/server/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java
index 2d70ed8b90a..94135754361 100644
--- a/server/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java
+++ b/server/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java
@@ -20,7 +20,7 @@
package org.apache.lucene.queries;
import org.apache.lucene.search.BooleanClause.Occur;
-import org.elasticsearch.common.lucene.search.Queries;
+import org.opensearch.common.lucene.search.Queries;
/**
* Extended version of {@link CommonTermsQuery} that allows to pass in a
diff --git a/server/src/main/java/org/apache/lucene/queries/SearchAfterSortedDocQuery.java b/server/src/main/java/org/apache/lucene/queries/SearchAfterSortedDocQuery.java
index 6497739c48c..c3a36507afc 100644
--- a/server/src/main/java/org/apache/lucene/queries/SearchAfterSortedDocQuery.java
+++ b/server/src/main/java/org/apache/lucene/queries/SearchAfterSortedDocQuery.java
@@ -33,7 +33,7 @@ import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.Weight;
-import org.elasticsearch.common.lucene.Lucene;
+import org.opensearch.common.lucene.Lucene;
import java.io.IOException;
import java.util.Arrays;
diff --git a/server/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java b/server/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java
index 9c0e6dfba91..00d3eed9c1d 100644
--- a/server/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java
+++ b/server/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java
@@ -26,7 +26,7 @@ import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TopFieldDocs;
import org.apache.lucene.search.TotalHits;
import org.apache.lucene.util.PriorityQueue;
-import org.elasticsearch.common.util.CollectionUtils;
+import org.opensearch.common.util.CollectionUtils;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/server/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java b/server/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java
index a9da3b342fb..7f0391e517b 100644
--- a/server/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java
+++ b/server/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java
@@ -29,9 +29,9 @@ import org.apache.lucene.index.SortedNumericDocValues;
import org.apache.lucene.index.SortedSetDocValues;
import org.apache.lucene.search.Scorable;
import org.apache.lucene.util.BytesRef;
-import org.elasticsearch.index.fielddata.AbstractNumericDocValues;
-import org.elasticsearch.index.fielddata.AbstractSortedDocValues;
-import org.elasticsearch.index.mapper.MappedFieldType;
+import org.opensearch.index.fielddata.AbstractNumericDocValues;
+import org.opensearch.index.fielddata.AbstractSortedDocValues;
+import org.opensearch.index.mapper.MappedFieldType;
import java.io.IOException;
import java.util.Collection;
diff --git a/server/src/main/java/org/apache/lucene/search/grouping/CollapsingTopDocsCollector.java b/server/src/main/java/org/apache/lucene/search/grouping/CollapsingTopDocsCollector.java
index 90ed8773abd..d5cccadb320 100644
--- a/server/src/main/java/org/apache/lucene/search/grouping/CollapsingTopDocsCollector.java
+++ b/server/src/main/java/org/apache/lucene/search/grouping/CollapsingTopDocsCollector.java
@@ -25,7 +25,7 @@ import org.apache.lucene.search.ScoreMode;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TotalHits;
-import org.elasticsearch.index.mapper.MappedFieldType;
+import org.opensearch.index.mapper.MappedFieldType;
import java.io.IOException;
import java.util.Collection;
diff --git a/server/src/main/java/org/apache/lucene/search/uhighlight/CustomPassageFormatter.java b/server/src/main/java/org/apache/lucene/search/uhighlight/CustomPassageFormatter.java
index 723c30f10dc..2ea925a9745 100644
--- a/server/src/main/java/org/apache/lucene/search/uhighlight/CustomPassageFormatter.java
+++ b/server/src/main/java/org/apache/lucene/search/uhighlight/CustomPassageFormatter.java
@@ -20,7 +20,7 @@
package org.apache.lucene.search.uhighlight;
import org.apache.lucene.search.highlight.Encoder;
-import org.elasticsearch.search.fetch.subphase.highlight.HighlightUtils;
+import org.opensearch.search.fetch.subphase.highlight.HighlightUtils;
/**
* Custom passage formatter that allows us to:
diff --git a/server/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java b/server/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java
index 3a2693a2d42..c3f92e91d5d 100644
--- a/server/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java
+++ b/server/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java
@@ -31,10 +31,10 @@ import org.apache.lucene.search.spans.SpanOrQuery;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.util.BytesRef;
-import org.elasticsearch.common.CheckedSupplier;
-import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.lucene.search.MultiPhrasePrefixQuery;
-import org.elasticsearch.index.IndexSettings;
+import org.opensearch.common.CheckedSupplier;
+import org.opensearch.common.Nullable;
+import org.opensearch.common.lucene.search.MultiPhrasePrefixQuery;
+import org.opensearch.index.IndexSettings;
import java.io.IOException;
import java.text.BreakIterator;
diff --git a/server/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java b/server/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java
index a4791e85ef3..e55b144dc01 100644
--- a/server/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java
+++ b/server/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java
@@ -30,9 +30,9 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.SynonymQuery;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
-import org.elasticsearch.common.lucene.search.MultiPhrasePrefixQuery;
-import org.elasticsearch.common.lucene.search.function.FunctionScoreQuery;
-import org.elasticsearch.index.search.ESToParentBlockJoinQuery;
+import org.opensearch.common.lucene.search.MultiPhrasePrefixQuery;
+import org.opensearch.common.lucene.search.function.FunctionScoreQuery;
+import org.opensearch.index.search.ESToParentBlockJoinQuery;
import java.io.IOException;
import java.util.Collection;