diff --git a/modules/analysis-common/build.gradle b/modules/analysis-common/build.gradle
index bce1057214526..3cae9c00d7982 100644
--- a/modules/analysis-common/build.gradle
+++ b/modules/analysis-common/build.gradle
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.yaml-rest-test'
-apply plugin: 'elasticsearch.internal-cluster-test'
+apply plugin: 'opensearch.yaml-rest-test'
+apply plugin: 'opensearch.internal-cluster-test'
 
 esplugin {
-  description 'Adds "built in" analyzers to Elasticsearch.'
-  classname 'org.elasticsearch.analysis.common.CommonAnalysisPlugin'
+  description 'Adds "built in" analyzers to OpenSearch.'
+  classname 'org.opensearch.analysis.common.CommonAnalysisPlugin'
   extendedPlugins = ['lang-painless']
 }
 
diff --git a/modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/QueryStringWithAnalyzersIT.java b/modules/analysis-common/src/internalClusterTest/java/org/opensearch/analysis/common/QueryStringWithAnalyzersIT.java
similarity index 98%
rename from modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/QueryStringWithAnalyzersIT.java
rename to modules/analysis-common/src/internalClusterTest/java/org/opensearch/analysis/common/QueryStringWithAnalyzersIT.java
index 37a04f8199d44..7016a311cb297 100644
--- a/modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/QueryStringWithAnalyzersIT.java
+++ b/modules/analysis-common/src/internalClusterTest/java/org/opensearch/analysis/common/QueryStringWithAnalyzersIT.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.common.settings.Settings;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ASCIIFoldingTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ASCIIFoldingTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactory.java
index 24fed9ae5ab2a..90677597c6cc9 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ASCIIFoldingTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/AbstractCompoundWordTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AbstractCompoundWordTokenFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/AbstractCompoundWordTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/AbstractCompoundWordTokenFilterFactory.java
index f061ff4dc22d1..7cf0bccb7045b 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/AbstractCompoundWordTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AbstractCompoundWordTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.compound.CompoundWordTokenFilterBase;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/AnalysisPainlessExtension.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPainlessExtension.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/AnalysisPainlessExtension.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPainlessExtension.java
index 85abec4ce915c..c85ba06b602ae 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/AnalysisPainlessExtension.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPainlessExtension.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.elasticsearch.painless.spi.PainlessExtension;
 import org.elasticsearch.painless.spi.Whitelist;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/AnalysisPredicateScript.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPredicateScript.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/AnalysisPredicateScript.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPredicateScript.java
index 5d8c491efc585..3ad5f908a75d3 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/AnalysisPredicateScript.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPredicateScript.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.lucene.analysis.tokenattributes.KeywordAttribute;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ApostropheFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ApostropheFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ApostropheFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ApostropheFilterFactory.java
index a0de5507d109c..fe80351964b64 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ApostropheFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ApostropheFilterFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tr.ApostropheFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ArabicAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ArabicAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicAnalyzerProvider.java
index f5e1d882d2b8d..9ea1930c682a4 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ArabicAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.ar.ArabicAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ArabicNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicNormalizationFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ArabicNormalizationFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicNormalizationFilterFactory.java
index 08783a89307bd..330ed4b9ce47e 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ArabicNormalizationFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicNormalizationFilterFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.ar.ArabicNormalizationFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ArabicStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicStemTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ArabicStemTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicStemTokenFilterFactory.java
index 16f156a817b94..d0c2ba0370211 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ArabicStemTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicStemTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.ar.ArabicStemFilter;
@@ -36,4 +36,4 @@ public class ArabicStemTokenFilterFactory extends AbstractTokenFilterFactory {
     public TokenStream create(TokenStream tokenStream) {
         return new ArabicStemFilter(tokenStream);
     }
-}
\ No newline at end of file
+}
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ArmenianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArmenianAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ArmenianAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArmenianAnalyzerProvider.java
index d066aed14eeaf..44b5b28a14703 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ArmenianAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArmenianAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.hy.ArmenianAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BasqueAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BasqueAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BasqueAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/BasqueAnalyzerProvider.java
index 8fe32a697f756..472993ee61f12 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BasqueAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BasqueAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.eu.BasqueAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BengaliAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BengaliAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BengaliAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/BengaliAnalyzerProvider.java
index 5696d0a604555..c6506e073b955 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BengaliAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BengaliAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.bn.BengaliAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BengaliNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BengaliNormalizationFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BengaliNormalizationFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/BengaliNormalizationFilterFactory.java
index 00b35aa3cdc80..4c5a7142769cd 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BengaliNormalizationFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BengaliNormalizationFilterFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.bn.BengaliNormalizationFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BrazilianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BrazilianAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BrazilianAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/BrazilianAnalyzerProvider.java
index 07399a2263dcc..bc4ad6d5107e9 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BrazilianAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BrazilianAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.br.BrazilianAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BrazilianStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BrazilianStemTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BrazilianStemTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/BrazilianStemTokenFilterFactory.java
index 6084a1abad94d..f4f3d0763edbe 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BrazilianStemTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BrazilianStemTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.br.BrazilianStemFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BulgarianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BulgarianAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BulgarianAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/BulgarianAnalyzerProvider.java
index a6b1cb97a1b5c..4ae6050997a8a 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/BulgarianAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BulgarianAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.bg.BulgarianAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CJKBigramFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKBigramFilterFactory.java
similarity index 99%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CJKBigramFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKBigramFilterFactory.java
index 8422a519bf682..6cb8690e99dc3 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CJKBigramFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKBigramFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.cjk.CJKBigramFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CJKWidthFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKWidthFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CJKWidthFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKWidthFilterFactory.java
index f7d02c49c6592..d7d5ec8a5cfd4 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CJKWidthFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKWidthFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.cjk.CJKWidthFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CatalanAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CatalanAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CatalanAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/CatalanAnalyzerProvider.java
index db229ffb4924a..099de6287ba83 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CatalanAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CatalanAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.ca.CatalanAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CharGroupTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CharGroupTokenizerFactory.java
similarity index 99%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CharGroupTokenizerFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/CharGroupTokenizerFactory.java
index a31609fc2867a..b61a837c69a7f 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CharGroupTokenizerFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CharGroupTokenizerFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.util.CharTokenizer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CharMatcher.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CharMatcher.java
similarity index 99%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CharMatcher.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/CharMatcher.java
index 3d8bb8d275394..8d2f15da5d504 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CharMatcher.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CharMatcher.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ChineseAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ChineseAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ChineseAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ChineseAnalyzerProvider.java
index 2259560bcbc7d..0e5e7353d94f8 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ChineseAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ChineseAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.en.EnglishAnalyzer;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CjkAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CjkAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CjkAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/CjkAnalyzerProvider.java
index ea6530fe8812e..e6b003b61f565 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CjkAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CjkAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.cjk.CJKAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ClassicFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ClassicFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicFilterFactory.java
index 141112a0176c0..88e932b96dfec 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ClassicFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicFilterFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.standard.ClassicFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ClassicTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicTokenizerFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ClassicTokenizerFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicTokenizerFactory.java
index d522f09c39c5f..baa975e62aa3e 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ClassicTokenizerFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicTokenizerFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.standard.ClassicTokenizer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CommonAnalysisPlugin.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java
similarity index 99%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CommonAnalysisPlugin.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java
index 8f42459ca6b76..ff323d218c1bd 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CommonAnalysisPlugin.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.CharArraySet;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CommonGramsTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CommonGramsTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactory.java
index b83081aa237b5..357d05f494cb2 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CommonGramsTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.TokenStream;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CzechAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CzechAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CzechAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/CzechAnalyzerProvider.java
index c14c2d57a3afa..bd40e8d735d87 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CzechAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CzechAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.cz.CzechAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CzechStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CzechStemTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CzechStemTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/CzechStemTokenFilterFactory.java
index 96f6554591ffc..9871fff21cb40 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/CzechStemTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CzechStemTokenFilterFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.cz.CzechStemFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DanishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DanishAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DanishAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/DanishAnalyzerProvider.java
index e3f024693c2d7..cd347263c4091 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DanishAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DanishAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.da.DanishAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DecimalDigitFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DecimalDigitFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DecimalDigitFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/DecimalDigitFilterFactory.java
index 9af9f11796cf0..6caf46e5262c6 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DecimalDigitFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DecimalDigitFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.core.DecimalDigitFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DelimitedPayloadTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DelimitedPayloadTokenFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DelimitedPayloadTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/DelimitedPayloadTokenFilterFactory.java
index e4c299d172ce5..50ce216de5d35 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DelimitedPayloadTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DelimitedPayloadTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.payloads.DelimitedPayloadTokenFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DictionaryCompoundWordTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DictionaryCompoundWordTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DictionaryCompoundWordTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/DictionaryCompoundWordTokenFilterFactory.java
index e9e690e0b0197..0cc1330c6645d 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DictionaryCompoundWordTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DictionaryCompoundWordTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.compound.DictionaryCompoundWordTokenFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DutchAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DutchAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DutchAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/DutchAnalyzerProvider.java
index 70ab2a5ea62f1..48aeba493a94d 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DutchAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DutchAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.nl.DutchAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DutchStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DutchStemTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DutchStemTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/DutchStemTokenFilterFactory.java
index 1596ce77fdd0c..ea5ca7364dcb3 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/DutchStemTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DutchStemTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.TokenStream;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/EdgeNGramTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/EdgeNGramTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactory.java
index 1de8c486d8874..0894daa79c535 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/EdgeNGramTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/EdgeNGramTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EdgeNGramTokenizerFactory.java
similarity index 94%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/EdgeNGramTokenizerFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/EdgeNGramTokenizerFactory.java
index f67238334f113..88238f220a988 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/EdgeNGramTokenizerFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EdgeNGramTokenizerFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.ngram.EdgeNGramTokenizer;
@@ -27,7 +27,7 @@
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.analysis.AbstractTokenizerFactory;
 
-import static org.elasticsearch.analysis.common.NGramTokenizerFactory.parseTokenChars;
+import static org.opensearch.analysis.common.NGramTokenizerFactory.parseTokenChars;
 
 public class EdgeNGramTokenizerFactory extends AbstractTokenizerFactory {
 
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ElisionTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ElisionTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ElisionTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ElisionTokenFilterFactory.java
index 39d042caa8c25..fc2a55bea4137 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ElisionTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ElisionTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.TokenStream;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/EnglishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EnglishAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/EnglishAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/EnglishAnalyzerProvider.java
index b14a83dbf7c4f..2f7316ed91bc5 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/EnglishAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EnglishAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.en.EnglishAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/EstonianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EstonianAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/EstonianAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/EstonianAnalyzerProvider.java
index f5f6585c35c8b..4b10bcb31f51e 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/EstonianAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EstonianAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.et.EstonianAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FingerprintAnalyzer.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FingerprintAnalyzer.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FingerprintAnalyzer.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/FingerprintAnalyzer.java
index d37239304cd2b..4280e5fc44bde 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FingerprintAnalyzer.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FingerprintAnalyzer.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.CharArraySet;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FingerprintAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FingerprintAnalyzerProvider.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FingerprintAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/FingerprintAnalyzerProvider.java
index f54b04bf30931..52e4f9cb8ff5e 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FingerprintAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FingerprintAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.CharArraySet;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FingerprintTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FingerprintTokenFilterFactory.java
similarity index 91%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FingerprintTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/FingerprintTokenFilterFactory.java
index cbdb0a11ce9a3..1201a7213bd4a 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FingerprintTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FingerprintTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.miscellaneous.FingerprintFilter;
@@ -29,8 +29,8 @@
 import org.elasticsearch.index.analysis.AbstractTokenFilterFactory;
 import org.elasticsearch.index.analysis.TokenFilterFactory;
 
-import static org.elasticsearch.analysis.common.FingerprintAnalyzerProvider.DEFAULT_MAX_OUTPUT_SIZE;
-import static org.elasticsearch.analysis.common.FingerprintAnalyzerProvider.MAX_OUTPUT_SIZE;
+import static org.opensearch.analysis.common.FingerprintAnalyzerProvider.DEFAULT_MAX_OUTPUT_SIZE;
+import static org.opensearch.analysis.common.FingerprintAnalyzerProvider.MAX_OUTPUT_SIZE;
 
 public class FingerprintTokenFilterFactory extends AbstractTokenFilterFactory {
 
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FinnishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FinnishAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FinnishAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/FinnishAnalyzerProvider.java
index ec18a71a12541..601dbc328ea3c 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FinnishAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FinnishAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.fi.FinnishAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FlattenGraphTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FlattenGraphTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactory.java
index e59c23e4a6c4f..e2c7efa7d9e9c 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FlattenGraphTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.core.FlattenGraphFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FrenchAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FrenchAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FrenchAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/FrenchAnalyzerProvider.java
index caee3618afbfc..8c9317ce61313 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FrenchAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FrenchAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.fr.FrenchAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FrenchStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FrenchStemTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FrenchStemTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/FrenchStemTokenFilterFactory.java
index e68a7f98c202c..26386735cc6c1 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/FrenchStemTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FrenchStemTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.TokenStream;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/GalicianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GalicianAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/GalicianAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/GalicianAnalyzerProvider.java
index 23f8da7b8dded..a5700be226276 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/GalicianAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GalicianAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.gl.GalicianAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/GermanAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/GermanAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanAnalyzerProvider.java
index cf96f50845f22..800b85cb9d43f 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/GermanAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.de.GermanAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/GermanNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanNormalizationFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/GermanNormalizationFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanNormalizationFilterFactory.java
index 98748ac2c71b8..ece4249d79225 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/GermanNormalizationFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanNormalizationFilterFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.de.GermanNormalizationFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/GermanStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanStemTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/GermanStemTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanStemTokenFilterFactory.java
index 919f55c13b56f..a7cc9148c0884 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/GermanStemTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanStemTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.TokenStream;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/GreekAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GreekAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/GreekAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/GreekAnalyzerProvider.java
index 2c237f7fe3cd0..b9855406ae313 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/GreekAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GreekAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.el.GreekAnalyzer;
 import org.elasticsearch.common.settings.Settings;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/HindiAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/HindiAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiAnalyzerProvider.java
index 2f4d50c4c76b4..c26e169a60f2e 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/HindiAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.hi.HindiAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/HindiNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiNormalizationFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/HindiNormalizationFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiNormalizationFilterFactory.java
index e31fa03610540..94e809fe1dd67 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/HindiNormalizationFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiNormalizationFilterFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.hi.HindiNormalizationFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/HtmlStripCharFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HtmlStripCharFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/HtmlStripCharFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/HtmlStripCharFilterFactory.java
index 760c1c79ba4cd..084a3ef11e53d 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/HtmlStripCharFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HtmlStripCharFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.charfilter.HTMLStripCharFilter;
 import org.elasticsearch.common.settings.Settings;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/HungarianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HungarianAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/HungarianAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/HungarianAnalyzerProvider.java
index 55ade50a1c95a..298e5aac39c1b 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/HungarianAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HungarianAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.hu.HungarianAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/HyphenationCompoundWordTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HyphenationCompoundWordTokenFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/HyphenationCompoundWordTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/HyphenationCompoundWordTokenFilterFactory.java
index b24eb2c4fbc4d..3e1e06c4d2431 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/HyphenationCompoundWordTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HyphenationCompoundWordTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.compound.HyphenationCompoundWordTokenFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/IndicNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IndicNormalizationFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/IndicNormalizationFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/IndicNormalizationFilterFactory.java
index 155e81717a651..ce7c543be1465 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/IndicNormalizationFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IndicNormalizationFilterFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.in.IndicNormalizationFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/IndonesianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IndonesianAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/IndonesianAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/IndonesianAnalyzerProvider.java
index 583268165f243..a7e054c191b89 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/IndonesianAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IndonesianAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.id.IndonesianAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/IrishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IrishAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/IrishAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/IrishAnalyzerProvider.java
index 515121a3a6ae4..a9cd7bcc2dc01 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/IrishAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IrishAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.ga.IrishAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ItalianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ItalianAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ItalianAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ItalianAnalyzerProvider.java
index a3c6a178672f3..6ea528f042eeb 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ItalianAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ItalianAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.it.ItalianAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KStemTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KStemTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/KStemTokenFilterFactory.java
index 2100e02fb61ad..f43452c3f2dac 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KStemTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KStemTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.en.KStemFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KeepTypesFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepTypesFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KeepTypesFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepTypesFilterFactory.java
index f0b069c76a757..0428f1ea3087b 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KeepTypesFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepTypesFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.core.TypeTokenFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KeepWordFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepWordFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KeepWordFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepWordFilterFactory.java
index e89219da4d971..da781ef416781 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KeepWordFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepWordFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.TokenStream;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KeywordMarkerTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeywordMarkerTokenFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KeywordMarkerTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeywordMarkerTokenFilterFactory.java
index b32f9ad4b63c9..fc28d0ffef2ef 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KeywordMarkerTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeywordMarkerTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.TokenStream;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KeywordTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeywordTokenizerFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KeywordTokenizerFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeywordTokenizerFactory.java
index a63947a0fe35e..5eb3349c3ac5d 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KeywordTokenizerFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeywordTokenizerFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.core.KeywordTokenizer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LatvianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LatvianAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LatvianAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/LatvianAnalyzerProvider.java
index d57f47923d1a1..50140fd5ac01a 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LatvianAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LatvianAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.lv.LatvianAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java
index a3866d31a8338..825b92b07f9a9 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.elasticsearch.Version;
 import org.elasticsearch.common.logging.DeprecationLogger;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LengthTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LengthTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LengthTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/LengthTokenFilterFactory.java
index 477886d702b8e..47573dd90483f 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LengthTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LengthTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.miscellaneous.LengthFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LetterTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LetterTokenizerFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LetterTokenizerFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/LetterTokenizerFactory.java
index 658f840bf8a97..a359480a9efed 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LetterTokenizerFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LetterTokenizerFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.core.LetterTokenizer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LimitTokenCountFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LimitTokenCountFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LimitTokenCountFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/LimitTokenCountFilterFactory.java
index 5e6b70f90dd66..716119cd4261e 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LimitTokenCountFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LimitTokenCountFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.miscellaneous.LimitTokenCountFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LithuanianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LithuanianAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LithuanianAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/LithuanianAnalyzerProvider.java
index b6db45d41744d..a50e56d30c6ca 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LithuanianAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LithuanianAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.lt.LithuanianAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LowerCaseTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LowerCaseTokenFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LowerCaseTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/LowerCaseTokenFilterFactory.java
index 7a4f67b55727b..d426d8c1111ba 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/LowerCaseTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LowerCaseTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.LowerCaseFilter;
 import org.apache.lucene.analysis.TokenStream;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MappingCharFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MappingCharFilterFactory.java
similarity index 99%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MappingCharFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/MappingCharFilterFactory.java
index c2b361428efe4..475c36f0fe851 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MappingCharFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MappingCharFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.charfilter.MappingCharFilter;
 import org.apache.lucene.analysis.charfilter.NormalizeCharMap;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MinHashTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MinHashTokenFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MinHashTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/MinHashTokenFilterFactory.java
index bc3f96c087efe..1dfd4ea7fcd87 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MinHashTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MinHashTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.minhash.MinHashFilterFactory;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MultiplexerTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MultiplexerTokenFilterFactory.java
similarity index 99%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MultiplexerTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/MultiplexerTokenFilterFactory.java
index cc41882cfc6a0..9075ba34ab7e3 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/MultiplexerTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MultiplexerTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenFilter;
 import org.apache.lucene.analysis.TokenStream;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/NGramTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/NGramTokenFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/NGramTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/NGramTokenFilterFactory.java
index 5d282b0c32a10..7ea1c4820dfcd 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/NGramTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/NGramTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.ngram.NGramTokenFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/NGramTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/NGramTokenizerFactory.java
similarity index 99%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/NGramTokenizerFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/NGramTokenizerFactory.java
index 86327a0cc1c49..5b0b3f8667a73 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/NGramTokenizerFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/NGramTokenizerFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.ngram.NGramTokenizer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/NorwegianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/NorwegianAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/NorwegianAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/NorwegianAnalyzerProvider.java
index 65463710aae07..2586177c0d446 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/NorwegianAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/NorwegianAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.no.NorwegianAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ESSolrSynonymParser.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/OpenSearchSolrSynonymParser.java
similarity index 89%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ESSolrSynonymParser.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/OpenSearchSolrSynonymParser.java
index 256e05982c67d..e519da0022b38 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ESSolrSynonymParser.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/OpenSearchSolrSynonymParser.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
@@ -28,12 +28,12 @@
 
 import java.io.IOException;
 
-public class ESSolrSynonymParser extends SolrSynonymParser {
-    private static final Logger logger = LogManager.getLogger(ESSolrSynonymParser.class);
+public class OpenSearchSolrSynonymParser extends SolrSynonymParser {
+    private static final Logger logger = LogManager.getLogger(OpenSearchSolrSynonymParser.class);
 
     private final boolean lenient;
 
-    public ESSolrSynonymParser(boolean dedup, boolean expand, boolean lenient, Analyzer analyzer) {
+    public OpenSearchSolrSynonymParser(boolean dedup, boolean expand, boolean lenient, Analyzer analyzer) {
         super(dedup, expand, analyzer);
         this.lenient = lenient;
     }
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ESWordnetSynonymParser.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/OpenSearchWordnetSynonymParser.java
similarity index 88%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ESWordnetSynonymParser.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/OpenSearchWordnetSynonymParser.java
index 1e09011af675c..b7a2db25043bc 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ESWordnetSynonymParser.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/OpenSearchWordnetSynonymParser.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
@@ -28,12 +28,12 @@
 
 import java.io.IOException;
 
-public class ESWordnetSynonymParser extends WordnetSynonymParser {
-    private static final Logger logger = LogManager.getLogger(ESWordnetSynonymParser.class);
+public class OpenSearchWordnetSynonymParser extends WordnetSynonymParser {
+    private static final Logger logger = LogManager.getLogger(OpenSearchWordnetSynonymParser.class);
 
     private final boolean lenient;
 
-    public ESWordnetSynonymParser(boolean dedup, boolean expand, boolean lenient, Analyzer analyzer) {
+    public OpenSearchWordnetSynonymParser(boolean dedup, boolean expand, boolean lenient, Analyzer analyzer) {
         super(dedup, expand, analyzer);
         this.lenient = lenient;
     }
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PathHierarchyTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PathHierarchyTokenizerFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactory.java
index 5b010390bf3e6..1e83b673a04a6 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PathHierarchyTokenizerFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.path.PathHierarchyTokenizer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternAnalyzer.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternAnalyzer.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternAnalyzer.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternAnalyzer.java
index 6fe1ac16525c8..4320388da7231 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternAnalyzer.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternAnalyzer.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.CharArraySet;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternAnalyzerProvider.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternAnalyzerProvider.java
index 9fe478ddb7377..fb13ebdf2c4b1 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.CharArraySet;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternCaptureGroupTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternCaptureGroupTokenFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternCaptureGroupTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternCaptureGroupTokenFilterFactory.java
index 7e69e44ffff24..f3abb3dd28696 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternCaptureGroupTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternCaptureGroupTokenFilterFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 
 import org.apache.lucene.analysis.TokenFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternReplaceCharFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceCharFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternReplaceCharFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceCharFilterFactory.java
index a9708f0beda82..0621a6266428a 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternReplaceCharFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceCharFilterFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.pattern.PatternReplaceCharFilter;
 import org.elasticsearch.common.Strings;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternReplaceTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceTokenFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternReplaceTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceTokenFilterFactory.java
index a503ad61cce6b..2e7b9db3d9f83 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternReplaceTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.pattern.PatternReplaceFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternTokenizerFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternTokenizerFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternTokenizerFactory.java
index 2abb4e8ed0e49..c06690dc3260b 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PatternTokenizerFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternTokenizerFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.pattern.PatternTokenizer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PersianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PersianAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PersianAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/PersianAnalyzerProvider.java
index 2cca6bbe09b24..a7522c821e5b4 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PersianAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PersianAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.fa.PersianAnalyzer;
 import org.elasticsearch.common.settings.Settings;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PersianNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PersianNormalizationFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PersianNormalizationFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/PersianNormalizationFilterFactory.java
index 44a20690cee6a..6ce61d989445f 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PersianNormalizationFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PersianNormalizationFilterFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.fa.PersianNormalizationFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PorterStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PorterStemTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PorterStemTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/PorterStemTokenFilterFactory.java
index 94f7271116b37..3415384b87497 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PorterStemTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PorterStemTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.en.PorterStemFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PortugueseAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PortugueseAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PortugueseAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/PortugueseAnalyzerProvider.java
index 9bf27c8da763c..a3743094a3b2d 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PortugueseAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PortugueseAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.pt.PortugueseAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PredicateTokenFilterScriptFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PredicateTokenFilterScriptFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PredicateTokenFilterScriptFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/PredicateTokenFilterScriptFactory.java
index 0e8a2a489fb6e..cddbfe39fe614 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/PredicateTokenFilterScriptFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PredicateTokenFilterScriptFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.FilteringTokenFilter;
 import org.apache.lucene.analysis.TokenStream;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/RemoveDuplicatesTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RemoveDuplicatesTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/RemoveDuplicatesTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/RemoveDuplicatesTokenFilterFactory.java
index a136c5573121e..ed201bf40c98d 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/RemoveDuplicatesTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RemoveDuplicatesTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.miscellaneous.RemoveDuplicatesTokenFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ReverseTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ReverseTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ReverseTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ReverseTokenFilterFactory.java
index 125e1e496b99e..12d56de50af03 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ReverseTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ReverseTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.reverse.ReverseStringFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/RomanianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RomanianAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/RomanianAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/RomanianAnalyzerProvider.java
index a71344a2bdb85..0133cb64d7391 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/RomanianAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RomanianAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.ro.RomanianAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/RussianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RussianAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/RussianAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/RussianAnalyzerProvider.java
index 4d015ae3578e6..267277567417b 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/RussianAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RussianAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.ru.RussianAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/RussianStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RussianStemTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/RussianStemTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/RussianStemTokenFilterFactory.java
index 24bb509530c1b..d8e701f28a8a4 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/RussianStemTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RussianStemTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.snowball.SnowballFilter;
@@ -36,4 +36,4 @@ public RussianStemTokenFilterFactory(IndexSettings indexSettings, Environment en
     public TokenStream create(TokenStream tokenStream) {
         return new SnowballFilter(tokenStream, "Russian");
     }
-}
\ No newline at end of file
+}
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ScandinavianFoldingFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScandinavianFoldingFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ScandinavianFoldingFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScandinavianFoldingFilterFactory.java
index ce948fa9f8d87..e9e5ccce98781 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ScandinavianFoldingFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScandinavianFoldingFilterFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.miscellaneous.ScandinavianFoldingFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ScandinavianNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScandinavianNormalizationFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ScandinavianNormalizationFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScandinavianNormalizationFilterFactory.java
index b5ad4daae81b1..59db5cf0a2dbd 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ScandinavianNormalizationFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScandinavianNormalizationFilterFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.miscellaneous.ScandinavianNormalizationFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ScriptedConditionTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterFactory.java
similarity index 99%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ScriptedConditionTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterFactory.java
index 4e6b9ef110634..590f4cc783635 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ScriptedConditionTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.miscellaneous.ConditionalTokenFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SerbianNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SerbianNormalizationFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SerbianNormalizationFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/SerbianNormalizationFilterFactory.java
index 39c0b065f1fca..0b8b20892ba6a 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SerbianNormalizationFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SerbianNormalizationFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.sr.SerbianNormalizationFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SimplePatternSplitTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SimplePatternSplitTokenizerFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SimplePatternSplitTokenizerFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/SimplePatternSplitTokenizerFactory.java
index 2c68b7ba2f7ad..de723e0a20ecb 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SimplePatternSplitTokenizerFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SimplePatternSplitTokenizerFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.pattern.SimplePatternSplitTokenizer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SimplePatternTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SimplePatternTokenizerFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SimplePatternTokenizerFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/SimplePatternTokenizerFactory.java
index a2148a61a2bb8..45c2da794e91e 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SimplePatternTokenizerFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SimplePatternTokenizerFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.pattern.SimplePatternTokenizer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SnowballAnalyzer.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballAnalyzer.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SnowballAnalyzer.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballAnalyzer.java
index 74e6bbcc65c2a..bfe77ef0f6099 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SnowballAnalyzer.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballAnalyzer.java
@@ -1,5 +1,3 @@
-package org.elasticsearch.analysis.common;
-
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -19,6 +17,8 @@
  * under the License.
  */
 
+package org.opensearch.analysis.common;
+
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.LowerCaseFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SnowballAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballAnalyzerProvider.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SnowballAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballAnalyzerProvider.java
index 6eec01570a881..81be798d61bed 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SnowballAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballAnalyzerProvider.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.de.GermanAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SnowballTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SnowballTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballTokenFilterFactory.java
index 5aff07e8fedcc..b3d554cb533c4 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SnowballTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballTokenFilterFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.snowball.SnowballFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SoraniAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SoraniAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniAnalyzerProvider.java
index 1391e924bbc21..5e870b1f5cad8 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SoraniAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.ckb.SoraniAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SoraniNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniNormalizationFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SoraniNormalizationFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniNormalizationFilterFactory.java
index ba6732aca9b91..32e2650fc0419 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SoraniNormalizationFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniNormalizationFilterFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.ckb.SoraniNormalizationFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SpanishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SpanishAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SpanishAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/SpanishAnalyzerProvider.java
index 558a7e764f650..7a40107daab40 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SpanishAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SpanishAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.es.SpanishAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/StandardHtmlStripAnalyzer.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StandardHtmlStripAnalyzer.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/StandardHtmlStripAnalyzer.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/StandardHtmlStripAnalyzer.java
index a35a0ea2a4a0b..4d08b6b136ef7 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/StandardHtmlStripAnalyzer.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StandardHtmlStripAnalyzer.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.LowerCaseFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/StandardHtmlStripAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StandardHtmlStripAnalyzerProvider.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/StandardHtmlStripAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/StandardHtmlStripAnalyzerProvider.java
index be8dd658a64a3..a32c99c87a81f 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/StandardHtmlStripAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StandardHtmlStripAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.elasticsearch.Version;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/StemmerOverrideTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/StemmerOverrideTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactory.java
index 9e3aa6a7b798a..d3d617190d0e5 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/StemmerOverrideTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/StemmerTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StemmerTokenFilterFactory.java
similarity index 99%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/StemmerTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/StemmerTokenFilterFactory.java
index da38b35ed15b3..71bcecbd90920 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/StemmerTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StemmerTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.ar.ArabicStemFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SwedishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SwedishAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SwedishAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/SwedishAnalyzerProvider.java
index bf01e63e625e5..d60842cb35102 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SwedishAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SwedishAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.sv.SwedishAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SynonymGraphTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SynonymGraphTokenFilterFactory.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SynonymGraphTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/SynonymGraphTokenFilterFactory.java
index 672c4377da1fa..48c7e63f4f1a2 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SynonymGraphTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SynonymGraphTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SynonymTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SynonymTokenFilterFactory.java
similarity index 94%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SynonymTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/SynonymTokenFilterFactory.java
index 62189a1d7f34a..46fd5c3859d0c 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SynonymTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SynonymTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
@@ -125,11 +125,11 @@ SynonymMap buildSynonyms(Analyzer analyzer, Reader rules) {
         try {
             SynonymMap.Builder parser;
             if ("wordnet".equalsIgnoreCase(format)) {
-                parser = new ESWordnetSynonymParser(true, expand, lenient, analyzer);
-                ((ESWordnetSynonymParser) parser).parse(rules);
+                parser = new OpenSearchWordnetSynonymParser(true, expand, lenient, analyzer);
+                ((OpenSearchWordnetSynonymParser) parser).parse(rules);
             } else {
-                parser = new ESSolrSynonymParser(true, expand, lenient, analyzer);
-                ((ESSolrSynonymParser) parser).parse(rules);
+                parser = new OpenSearchSolrSynonymParser(true, expand, lenient, analyzer);
+                ((OpenSearchSolrSynonymParser) parser).parse(rules);
             }
             return parser.build();
         } catch (Exception e) {
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ThaiAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ThaiAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiAnalyzerProvider.java
index 7f9543904d9fc..c6299230dfea5 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ThaiAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.th.ThaiAnalyzer;
 import org.elasticsearch.common.settings.Settings;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ThaiTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiTokenizerFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ThaiTokenizerFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiTokenizerFactory.java
index 04fbe949bb08e..307c18aaabacc 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/ThaiTokenizerFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiTokenizerFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.th.ThaiTokenizer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/TrimTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TrimTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/TrimTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/TrimTokenFilterFactory.java
index 1ff1f94046812..e5df458a0b7fa 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/TrimTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TrimTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.miscellaneous.TrimFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/TruncateTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TruncateTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/TruncateTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/TruncateTokenFilterFactory.java
index 823119646642f..5cff255b93a04 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/TruncateTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TruncateTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.miscellaneous.TruncateTokenFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/TurkishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TurkishAnalyzerProvider.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/TurkishAnalyzerProvider.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/TurkishAnalyzerProvider.java
index ecf9d082e7017..9018e3336be78 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/TurkishAnalyzerProvider.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TurkishAnalyzerProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.tr.TurkishAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/UAX29URLEmailTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UAX29URLEmailTokenizerFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/UAX29URLEmailTokenizerFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/UAX29URLEmailTokenizerFactory.java
index 19a0f500cd9e7..662fdbde6d60c 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/UAX29URLEmailTokenizerFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UAX29URLEmailTokenizerFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/UniqueTokenFilter.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UniqueTokenFilter.java
similarity index 98%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/UniqueTokenFilter.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/UniqueTokenFilter.java
index ae2b03f532976..7b77418efa041 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/UniqueTokenFilter.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UniqueTokenFilter.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.TokenFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/UniqueTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UniqueTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/UniqueTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/UniqueTokenFilterFactory.java
index 120947f5fe871..036ecefdf4ec8 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/UniqueTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UniqueTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.elasticsearch.common.settings.Settings;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/UpperCaseTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UpperCaseTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/UpperCaseTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/UpperCaseTokenFilterFactory.java
index 2c172d40ff199..4de858ae902c4 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/UpperCaseTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UpperCaseTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.core.UpperCaseFilter;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WhitespaceTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WhitespaceTokenizerFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WhitespaceTokenizerFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/WhitespaceTokenizerFactory.java
index 9b962675830e2..592614e056db7 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WhitespaceTokenizerFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WhitespaceTokenizerFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java
index e381ad05dad02..5f709e007e360 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.TokenStream;
@@ -45,7 +45,7 @@
 import static org.apache.lucene.analysis.miscellaneous.WordDelimiterGraphFilter.SPLIT_ON_CASE_CHANGE;
 import static org.apache.lucene.analysis.miscellaneous.WordDelimiterGraphFilter.SPLIT_ON_NUMERICS;
 import static org.apache.lucene.analysis.miscellaneous.WordDelimiterGraphFilter.STEM_ENGLISH_POSSESSIVE;
-import static org.elasticsearch.analysis.common.WordDelimiterTokenFilterFactory.parseTypes;
+import static org.opensearch.analysis.common.WordDelimiterTokenFilterFactory.parseTypes;
 
 public class WordDelimiterGraphTokenFilterFactory extends AbstractTokenFilterFactory {
 
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WordDelimiterTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactory.java
similarity index 99%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WordDelimiterTokenFilterFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactory.java
index 97ccef9225586..4fe18abdb81f6 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/WordDelimiterTokenFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.TokenStream;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/XLowerCaseTokenizer.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/XLowerCaseTokenizer.java
similarity index 99%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/XLowerCaseTokenizer.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/XLowerCaseTokenizer.java
index 3f11c52858aa4..44998adeb4f02 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/XLowerCaseTokenizer.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/XLowerCaseTokenizer.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharacterUtils;
 import org.apache.lucene.analysis.Tokenizer;
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/XLowerCaseTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/XLowerCaseTokenizerFactory.java
similarity index 97%
rename from modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/XLowerCaseTokenizerFactory.java
rename to modules/analysis-common/src/main/java/org/opensearch/analysis/common/XLowerCaseTokenizerFactory.java
index f14a64487a9f3..35c77ca0811d4 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/XLowerCaseTokenizerFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/XLowerCaseTokenizerFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.elasticsearch.common.settings.Settings;
diff --git a/modules/analysis-common/src/main/resources/META-INF/services/org.elasticsearch.painless.spi.PainlessExtension b/modules/analysis-common/src/main/resources/META-INF/services/org.elasticsearch.painless.spi.PainlessExtension
index 44e98a3dd9c68..d31d93bd98b83 100644
--- a/modules/analysis-common/src/main/resources/META-INF/services/org.elasticsearch.painless.spi.PainlessExtension
+++ b/modules/analysis-common/src/main/resources/META-INF/services/org.elasticsearch.painless.spi.PainlessExtension
@@ -1 +1 @@
-org.elasticsearch.analysis.common.AnalysisPainlessExtension
\ No newline at end of file
+org.opensearch.analysis.common.AnalysisPainlessExtension
diff --git a/modules/analysis-common/src/main/resources/org/elasticsearch/analysis/common/painless_whitelist.txt b/modules/analysis-common/src/main/resources/org/opensearch/analysis/common/painless_whitelist.txt
similarity index 100%
rename from modules/analysis-common/src/main/resources/org/elasticsearch/analysis/common/painless_whitelist.txt
rename to modules/analysis-common/src/main/resources/org/opensearch/analysis/common/painless_whitelist.txt
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java
similarity index 98%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java
index 08d9050f7df95..ff5f798d3c505 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.core.WhitespaceTokenizer;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java
index ce6d0403c0738..6f7189dda1387 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 
 import org.apache.lucene.analysis.Tokenizer;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CJKFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java
similarity index 97%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CJKFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java
index b89994bdc6e88..9b81100229157 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CJKFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
@@ -33,7 +33,7 @@
 import java.io.StringReader;
 
 public class CJKFilterFactoryTests extends ESTokenStreamTestCase {
-    private static final String RESOURCE = "/org/elasticsearch/analysis/common/cjk_analysis.json";
+    private static final String RESOURCE = "/org/opensearch/analysis/common/cjk_analysis.json";
 
     private ESTestCase.TestAnalysis analysis;
 
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CharGroupTokenizerFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharGroupTokenizerFactoryTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CharGroupTokenizerFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharGroupTokenizerFactoryTests.java
index 43cdf274956b2..004b8a8fbfc3a 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CharGroupTokenizerFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharGroupTokenizerFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import com.carrotsearch.randomizedtesting.generators.RandomStrings;
 import org.apache.lucene.analysis.Tokenizer;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CharMatcherTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharMatcherTests.java
similarity index 98%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CharMatcherTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharMatcherTests.java
index 1427e5d84513f..ce379685fcc74 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CharMatcherTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharMatcherTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.elasticsearch.test.ESTestCase;
 
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisFactoryTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisFactoryTests.java
index 99e882c622085..5053588e9f81d 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.charfilter.HTMLStripCharFilterFactory;
 import org.apache.lucene.analysis.en.PorterStemFilterFactory;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisPluginTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisPluginTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisPluginTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisPluginTests.java
index d8283aab6d276..16172deb0d161 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisPluginTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisPluginTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.Tokenizer;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonGramsTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactoryTests.java
similarity index 98%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonGramsTokenFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactoryTests.java
index 2453ecd1e7f12..b63fbe72f55e8 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonGramsTokenFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.Tokenizer;
@@ -137,7 +137,7 @@ public void testSettings() throws IOException {
     }
 
     public void testCommonGramsAnalysis() throws IOException {
-        String json = "/org/elasticsearch/analysis/common/commongrams.json";
+        String json = "/org/opensearch/analysis/common/commongrams.json";
         Settings settings = Settings.builder()
                      .loadFromStream(json, getClass().getResourceAsStream(json), false)
                      .put(Environment.PATH_HOME_SETTING.getKey(), createHome())
@@ -224,7 +224,7 @@ public void testQueryModeSettings() throws IOException {
     }
 
     public void testQueryModeCommonGramsAnalysis() throws IOException {
-        String json = "/org/elasticsearch/analysis/common/commongrams_query_mode.json";
+        String json = "/org/opensearch/analysis/common/commongrams_query_mode.json";
         Settings settings = Settings.builder()
                 .loadFromStream(json, getClass().getResourceAsStream(json), false)
             .put(Environment.PATH_HOME_SETTING.getKey(), createHome())
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CompoundAnalysisTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java
similarity index 96%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CompoundAnalysisTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java
index d50e5d8bd5ba7..eb0719defc5c6 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CompoundAnalysisTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
@@ -97,7 +97,7 @@ public Map<String, AnalysisProvider<TokenFilterFactory>> getTokenFilters() {
     }
 
     private Settings getJsonSettings() throws IOException {
-        String json = "/org/elasticsearch/analysis/common/test1.json";
+        String json = "/org/opensearch/analysis/common/test1.json";
         return Settings.builder()
                 .loadFromStream(json, getClass().getResourceAsStream(json), false)
                 .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
@@ -106,7 +106,7 @@ private Settings getJsonSettings() throws IOException {
     }
 
     private Settings getYamlSettings() throws IOException {
-        String yaml = "/org/elasticsearch/analysis/common/test1.yml";
+        String yaml = "/org/opensearch/analysis/common/test1.yml";
         return Settings.builder()
                 .loadFromStream(yaml, getClass().getResourceAsStream(yaml), false)
                 .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/DisableGraphQueryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/DisableGraphQueryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java
index d1792e94f7331..41b9888fc70af 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/DisableGraphQueryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.Query;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java
similarity index 98%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java
index 9297dc0c811c4..b820c63584b09 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/EdgeNGramTokenizerTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/EdgeNGramTokenizerTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java
index db9196547b619..e0e848e55bab9 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/EdgeNGramTokenizerTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.elasticsearch.Version;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ElisionFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ElisionFilterFactoryTests.java
similarity index 97%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ElisionFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/ElisionFilterFactoryTests.java
index dbfd49d5649d5..337e5bbe0a9c7 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ElisionFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ElisionFilterFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/FingerprintAnalyzerTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/FingerprintAnalyzerTests.java
similarity index 98%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/FingerprintAnalyzerTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/FingerprintAnalyzerTests.java
index 0933f3bf13a43..ec0f49fc8cd75 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/FingerprintAnalyzerTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/FingerprintAnalyzerTests.java
@@ -1,5 +1,3 @@
-package org.elasticsearch.analysis.common;
-
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -19,6 +17,8 @@
  * under the License.
  */
 
+package org.opensearch.analysis.common;
+
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.CharArraySet;
 import org.elasticsearch.test.ESTokenStreamTestCase;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java
similarity index 98%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java
index fec7f73a697b1..2392841034b4b 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CannedTokenStream;
 import org.apache.lucene.analysis.Token;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/HighlighterWithAnalyzersTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/HighlighterWithAnalyzersTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java
index 8f58a074cf102..cf3095e24718d 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/HighlighterWithAnalyzersTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.common.settings.Settings;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/HtmlStripCharFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HtmlStripCharFilterFactoryTests.java
similarity index 98%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/HtmlStripCharFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/HtmlStripCharFilterFactoryTests.java
index a205279b47d65..56d798cc45d15 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/HtmlStripCharFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HtmlStripCharFilterFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/KeepFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepFilterFactoryTests.java
similarity index 97%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/KeepFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepFilterFactoryTests.java
index e9248c3d21289..96af08e195059 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/KeepFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepFilterFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.core.WhitespaceTokenizer;
@@ -35,7 +35,7 @@
 import static org.hamcrest.Matchers.instanceOf;
 
 public class KeepFilterFactoryTests extends ESTokenStreamTestCase {
-    private static final String RESOURCE = "/org/elasticsearch/analysis/common/keep_analysis.json";
+    private static final String RESOURCE = "/org/opensearch/analysis/common/keep_analysis.json";
 
     public void testLoadWithoutSettings() throws IOException {
         ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/KeepTypesFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/KeepTypesFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java
index d0c7723457ff3..7cd79482998dc 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/KeepTypesFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/KeywordMarkerFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeywordMarkerFilterFactoryTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/KeywordMarkerFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeywordMarkerFilterFactoryTests.java
index d0b72c50c42bc..7beeffb55caf8 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/KeywordMarkerFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeywordMarkerFilterFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.core.WhitespaceTokenizer;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/LimitTokenCountFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/LimitTokenCountFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java
index 93ae41f04ee86..ac062651dd4d2 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/LimitTokenCountFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.core.WhitespaceTokenizer;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/MassiveWordListTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MassiveWordListTests.java
similarity index 97%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/MassiveWordListTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/MassiveWordListTests.java
index f454e8c776c12..80e1af45726bb 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/MassiveWordListTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MassiveWordListTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.plugins.Plugin;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/MinHashFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java
similarity index 98%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/MinHashFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java
index 52879c6b7e7aa..78f02fbb88c22 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/MinHashFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.core.WhitespaceTokenizer;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/MultiplexerTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/MultiplexerTokenFilterTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java
index a9663c029a0ba..1f4ecafaa8d09 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/MultiplexerTokenFilterTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/NGramTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java
similarity index 98%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/NGramTokenFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java
index 4271b5aab60fa..26686f81094b9 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/NGramTokenFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/NGramTokenizerFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenizerFactoryTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/NGramTokenizerFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenizerFactoryTests.java
index f35269712b3cc..6534743079bd2 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/NGramTokenizerFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenizerFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ESSolrSynonymParserTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/OpenSearchSolrSynonymParserTests.java
similarity index 86%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ESSolrSynonymParserTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/OpenSearchSolrSynonymParserTests.java
index e6ed9b0385505..c1fee60f9b8ed 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ESSolrSynonymParserTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/OpenSearchSolrSynonymParserTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.StopFilter;
@@ -35,10 +35,10 @@
 
 import static org.hamcrest.Matchers.containsString;
 
-public class ESSolrSynonymParserTests extends ESTokenStreamTestCase {
+public class OpenSearchSolrSynonymParserTests extends ESTokenStreamTestCase {
 
     public void testLenientParser() throws IOException, ParseException {
-        ESSolrSynonymParser parser = new ESSolrSynonymParser(true, false, true, new StandardAnalyzer());
+        OpenSearchSolrSynonymParser parser = new OpenSearchSolrSynonymParser(true, false, true, new StandardAnalyzer());
         String rules =
             "&,and\n" +
             "come,advance,approach\n";
@@ -54,8 +54,8 @@ public void testLenientParser() throws IOException, ParseException {
     public void testLenientParserWithSomeIncorrectLines() throws IOException, ParseException {
         CharArraySet stopSet = new CharArraySet(1, true);
         stopSet.add("bar");
-        ESSolrSynonymParser parser =
-            new ESSolrSynonymParser(true, false, true, new StandardAnalyzer(stopSet));
+        OpenSearchSolrSynonymParser parser =
+            new OpenSearchSolrSynonymParser(true, false, true, new StandardAnalyzer(stopSet));
         String rules = "foo,bar,baz";
         StringReader rulesReader = new StringReader(rules);
         parser.parse(rulesReader);
@@ -67,7 +67,7 @@ public void testLenientParserWithSomeIncorrectLines() throws IOException, ParseE
     }
 
     public void testNonLenientParser() {
-        ESSolrSynonymParser parser = new ESSolrSynonymParser(true, false, false, new StandardAnalyzer());
+        OpenSearchSolrSynonymParser parser = new OpenSearchSolrSynonymParser(true, false, false, new StandardAnalyzer());
         String rules =
             "&,and=>and\n" +
             "come,advance,approach\n";
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ESWordnetSynonymParserTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/OpenSearchWordnetSynonymParserTests.java
similarity index 87%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ESWordnetSynonymParserTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/OpenSearchWordnetSynonymParserTests.java
index 18eaaedb5d071..fa4f9b24e3f91 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ESWordnetSynonymParserTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/OpenSearchWordnetSynonymParserTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.StopFilter;
@@ -35,10 +35,10 @@
 
 import static org.hamcrest.Matchers.containsString;
 
-public class ESWordnetSynonymParserTests extends ESTokenStreamTestCase {
+public class OpenSearchWordnetSynonymParserTests extends ESTokenStreamTestCase {
 
     public void testLenientParser() throws IOException, ParseException {
-        ESWordnetSynonymParser parser = new ESWordnetSynonymParser(true, false, true, new StandardAnalyzer());
+        OpenSearchWordnetSynonymParser parser = new OpenSearchWordnetSynonymParser(true, false, true, new StandardAnalyzer());
         String rules =
             "s(100000001,1,'&',a,1,0).\n" +
             "s(100000001,2,'and',a,1,0).\n" +
@@ -57,8 +57,8 @@ public void testLenientParser() throws IOException, ParseException {
     public void testLenientParserWithSomeIncorrectLines() throws IOException, ParseException {
         CharArraySet stopSet = new CharArraySet(1, true);
         stopSet.add("bar");
-        ESWordnetSynonymParser parser =
-            new ESWordnetSynonymParser(true, false, true, new StandardAnalyzer(stopSet));
+        OpenSearchWordnetSynonymParser parser =
+            new OpenSearchWordnetSynonymParser(true, false, true, new StandardAnalyzer(stopSet));
         String rules =
             "s(100000001,1,'foo',v,1,0).\n" +
             "s(100000001,2,'bar',v,1,0).\n" +
@@ -73,7 +73,7 @@ public void testLenientParserWithSomeIncorrectLines() throws IOException, ParseE
     }
 
     public void testNonLenientParser() {
-        ESWordnetSynonymParser parser = new ESWordnetSynonymParser(true, false, false, new StandardAnalyzer());
+        OpenSearchWordnetSynonymParser parser = new OpenSearchWordnetSynonymParser(true, false, false, new StandardAnalyzer());
         String rules =
             "s(100000001,1,'&',a,1,0).\n" +
             "s(100000001,2,'and',a,1,0).\n" +
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/PathHierarchyTokenizerFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactoryTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/PathHierarchyTokenizerFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactoryTests.java
index 0b545d3355201..d6b4dba35124e 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/PathHierarchyTokenizerFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import com.carrotsearch.randomizedtesting.generators.RandomPicks;
 
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/PatternAnalyzerTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternAnalyzerTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/PatternAnalyzerTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternAnalyzerTests.java
index 29122d7292168..660913ac8123d 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/PatternAnalyzerTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternAnalyzerTests.java
@@ -1,5 +1,3 @@
-package org.elasticsearch.analysis.common;
-
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -19,6 +17,8 @@
  * under the License.
  */
 
+package org.opensearch.analysis.common;
+
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.en.EnglishAnalyzer;
 import org.apache.lucene.util.BytesRef;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/PatternCaptureTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternCaptureTokenFilterTests.java
similarity index 96%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/PatternCaptureTokenFilterTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternCaptureTokenFilterTests.java
index 4aa1f95ec26e6..3dc2e3538ceb9 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/PatternCaptureTokenFilterTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternCaptureTokenFilterTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
@@ -34,7 +34,7 @@
 
 public class PatternCaptureTokenFilterTests extends ESTokenStreamTestCase {
     public void testPatternCaptureTokenFilter() throws Exception {
-        String json = "/org/elasticsearch/analysis/common/pattern_capture.json";
+        String json = "/org/opensearch/analysis/common/pattern_capture.json";
         Settings settings = Settings.builder()
                 .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
                 .loadFromStream(json, getClass().getResourceAsStream(json), false)
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/PredicateTokenScriptFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java
similarity index 98%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/PredicateTokenScriptFilterTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java
index 4f3bed403d559..7a6060d5ae8d9 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/PredicateTokenScriptFilterTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java
similarity index 98%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java
index 8180985416f52..e6b95b6458e43 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.CannedTokenStream;
 import org.apache.lucene.analysis.Token;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ScriptedConditionTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java
similarity index 98%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ScriptedConditionTokenFilterTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java
index 2b5be939e12e0..223b858e84725 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ScriptedConditionTokenFilterTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ShingleTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ShingleTokenFilterTests.java
similarity index 98%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ShingleTokenFilterTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/ShingleTokenFilterTests.java
index 02aeb7e41bccd..68d6bd47d7db8 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ShingleTokenFilterTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ShingleTokenFilterTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SnowballAnalyzerTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/SnowballAnalyzerTests.java
similarity index 97%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SnowballAnalyzerTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/SnowballAnalyzerTests.java
index 360d17ef0f4f3..6fe3d6f255d67 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SnowballAnalyzerTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/SnowballAnalyzerTests.java
@@ -1,5 +1,3 @@
-package org.elasticsearch.analysis.common;
-
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -19,6 +17,8 @@
  * under the License.
  */
 
+package org.opensearch.analysis.common;
+
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.en.EnglishAnalyzer;
 import org.elasticsearch.test.ESTokenStreamTestCase;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/StemmerOverrideTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactoryTests.java
similarity index 98%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/StemmerOverrideTokenFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactoryTests.java
index f1568315e444e..804b9aa32577b 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/StemmerOverrideTokenFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.core.WhitespaceTokenizer;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/StemmerTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/StemmerTokenFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java
index e91bc372e30d2..87d7ca49fb5f9 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/StemmerTokenFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/SynonymsAnalysisTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/SynonymsAnalysisTests.java
index aac0508b57818..8ff770e9332f4 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/SynonymsAnalysisTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
@@ -65,7 +65,7 @@ public void testSynonymsAnalysis() throws IOException {
         Files.copy(synonyms, config.resolve("synonyms.txt"));
         Files.copy(synonymsWordnet, config.resolve("synonyms_wordnet.txt"));
 
-        String json = "/org/elasticsearch/analysis/common/synonyms.json";
+        String json = "/org/opensearch/analysis/common/synonyms.json";
         Settings settings = Settings.builder().
             loadFromStream(json, getClass().getResourceAsStream(json), false)
                 .put(Environment.PATH_HOME_SETTING.getKey(), home)
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/TrimTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/TrimTokenFilterTests.java
similarity index 97%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/TrimTokenFilterTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/TrimTokenFilterTests.java
index 2ce9af2b391f0..fa2dac419e815 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/TrimTokenFilterTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/TrimTokenFilterTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.settings.Settings;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/UniqueTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/UniqueTokenFilterTests.java
similarity index 98%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/UniqueTokenFilterTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/UniqueTokenFilterTests.java
index f75822a13c43a..d71e6da883e68 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/UniqueTokenFilterTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/UniqueTokenFilterTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.MockTokenizer;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/WhitespaceTokenizerFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WhitespaceTokenizerFactoryTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/WhitespaceTokenizerFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/WhitespaceTokenizerFactoryTests.java
index 55211a3076cf2..d3b59bb7ad7d5 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/WhitespaceTokenizerFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WhitespaceTokenizerFactoryTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import com.carrotsearch.randomizedtesting.generators.RandomStrings;
 
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java
similarity index 99%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java
index a027781f022d0..1c0d2c52f8a91 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.core.WhitespaceTokenizer;
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java
similarity index 98%
rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java
rename to modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java
index 78c4f1485aa43..eec66ab181e7f 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 
 import org.apache.lucene.analysis.Tokenizer;
diff --git a/modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/cjk_analysis.json b/modules/analysis-common/src/test/resources/org/opensearch/analysis/common/cjk_analysis.json
similarity index 100%
rename from modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/cjk_analysis.json
rename to modules/analysis-common/src/test/resources/org/opensearch/analysis/common/cjk_analysis.json
diff --git a/modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/common_words.txt b/modules/analysis-common/src/test/resources/org/opensearch/analysis/common/common_words.txt
similarity index 100%
rename from modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/common_words.txt
rename to modules/analysis-common/src/test/resources/org/opensearch/analysis/common/common_words.txt
diff --git a/modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/commongrams.json b/modules/analysis-common/src/test/resources/org/opensearch/analysis/common/commongrams.json
similarity index 100%
rename from modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/commongrams.json
rename to modules/analysis-common/src/test/resources/org/opensearch/analysis/common/commongrams.json
diff --git a/modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/commongrams_query_mode.json b/modules/analysis-common/src/test/resources/org/opensearch/analysis/common/commongrams_query_mode.json
similarity index 100%
rename from modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/commongrams_query_mode.json
rename to modules/analysis-common/src/test/resources/org/opensearch/analysis/common/commongrams_query_mode.json
diff --git a/modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/keep_analysis.json b/modules/analysis-common/src/test/resources/org/opensearch/analysis/common/keep_analysis.json
similarity index 100%
rename from modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/keep_analysis.json
rename to modules/analysis-common/src/test/resources/org/opensearch/analysis/common/keep_analysis.json
diff --git a/modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/pattern_capture.json b/modules/analysis-common/src/test/resources/org/opensearch/analysis/common/pattern_capture.json
similarity index 100%
rename from modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/pattern_capture.json
rename to modules/analysis-common/src/test/resources/org/opensearch/analysis/common/pattern_capture.json
diff --git a/modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/synonyms.json b/modules/analysis-common/src/test/resources/org/opensearch/analysis/common/synonyms.json
similarity index 100%
rename from modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/synonyms.json
rename to modules/analysis-common/src/test/resources/org/opensearch/analysis/common/synonyms.json
diff --git a/modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/synonyms.txt b/modules/analysis-common/src/test/resources/org/opensearch/analysis/common/synonyms.txt
similarity index 100%
rename from modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/synonyms.txt
rename to modules/analysis-common/src/test/resources/org/opensearch/analysis/common/synonyms.txt
diff --git a/modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/synonyms_wordnet.txt b/modules/analysis-common/src/test/resources/org/opensearch/analysis/common/synonyms_wordnet.txt
similarity index 100%
rename from modules/analysis-common/src/test/resources/org/elasticsearch/analysis/common/synonyms_wordnet.txt
rename to modules/analysis-common/src/test/resources/org/opensearch/analysis/common/synonyms_wordnet.txt
diff --git a/modules/analysis-common/src/yamlRestTest/java/org/elasticsearch/analysis/common/CommonAnalysisClientYamlTestSuiteIT.java b/modules/analysis-common/src/yamlRestTest/java/org/opensearch/analysis/common/CommonAnalysisClientYamlTestSuiteIT.java
similarity index 97%
rename from modules/analysis-common/src/yamlRestTest/java/org/elasticsearch/analysis/common/CommonAnalysisClientYamlTestSuiteIT.java
rename to modules/analysis-common/src/yamlRestTest/java/org/opensearch/analysis/common/CommonAnalysisClientYamlTestSuiteIT.java
index b5d6bf23b3eda..8005fb1f8a29b 100644
--- a/modules/analysis-common/src/yamlRestTest/java/org/elasticsearch/analysis/common/CommonAnalysisClientYamlTestSuiteIT.java
+++ b/modules/analysis-common/src/yamlRestTest/java/org/opensearch/analysis/common/CommonAnalysisClientYamlTestSuiteIT.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.analysis.common;
+package org.opensearch.analysis.common;
 
 import com.carrotsearch.randomizedtesting.annotations.Name;
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;