diff --git a/libs/grok/build.gradle b/libs/grok/build.gradle
index c9a9c681b17..c4cf520503c 100644
--- a/libs/grok/build.gradle
+++ b/libs/grok/build.gradle
@@ -23,7 +23,7 @@ dependencies {
   api 'org.jruby.jcodings:jcodings:1.0.44'
 
   testImplementation(project(":test:framework")) {
-    exclude group: 'org.elasticsearch', module: 'elasticsearch-grok'
+    exclude group: 'org.opensearch', module: 'opensearch-grok'
   }
 }
 
diff --git a/libs/grok/src/main/java/org/elasticsearch/grok/FloatConsumer.java b/libs/grok/src/main/java/org/opensearch/grok/FloatConsumer.java
similarity index 96%
rename from libs/grok/src/main/java/org/elasticsearch/grok/FloatConsumer.java
rename to libs/grok/src/main/java/org/opensearch/grok/FloatConsumer.java
index 7cf86103f0a..085077f0f5c 100644
--- a/libs/grok/src/main/java/org/elasticsearch/grok/FloatConsumer.java
+++ b/libs/grok/src/main/java/org/opensearch/grok/FloatConsumer.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.grok;
+package org.opensearch.grok;
 
 import java.util.function.Consumer;
 
diff --git a/libs/grok/src/main/java/org/elasticsearch/grok/Grok.java b/libs/grok/src/main/java/org/opensearch/grok/Grok.java
similarity index 99%
rename from libs/grok/src/main/java/org/elasticsearch/grok/Grok.java
rename to libs/grok/src/main/java/org/opensearch/grok/Grok.java
index f14c24ab691..781dc1f8dca 100644
--- a/libs/grok/src/main/java/org/elasticsearch/grok/Grok.java
+++ b/libs/grok/src/main/java/org/opensearch/grok/Grok.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.grok;
+package org.opensearch.grok;
 
 import org.jcodings.specific.UTF8Encoding;
 import org.joni.Matcher;
@@ -291,7 +291,7 @@ public final class Grok {
     }
 
     /**
-     * Load built-in patterns. 
+     * Load built-in patterns.
      */
     private static Map<String, String> loadBuiltinPatterns() {
         String[] patternNames = new String[] {
diff --git a/libs/grok/src/main/java/org/elasticsearch/grok/GrokCaptureConfig.java b/libs/grok/src/main/java/org/opensearch/grok/GrokCaptureConfig.java
similarity index 99%
rename from libs/grok/src/main/java/org/elasticsearch/grok/GrokCaptureConfig.java
rename to libs/grok/src/main/java/org/opensearch/grok/GrokCaptureConfig.java
index fbdb162bbd3..0f5bbf5cbdf 100644
--- a/libs/grok/src/main/java/org/elasticsearch/grok/GrokCaptureConfig.java
+++ b/libs/grok/src/main/java/org/opensearch/grok/GrokCaptureConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.grok;
+package org.opensearch.grok;
 
 import org.joni.NameEntry;
 
diff --git a/libs/grok/src/main/java/org/elasticsearch/grok/GrokCaptureExtracter.java b/libs/grok/src/main/java/org/opensearch/grok/GrokCaptureExtracter.java
similarity index 98%
rename from libs/grok/src/main/java/org/elasticsearch/grok/GrokCaptureExtracter.java
rename to libs/grok/src/main/java/org/opensearch/grok/GrokCaptureExtracter.java
index a9fe892d66a..d70ee73b01d 100644
--- a/libs/grok/src/main/java/org/elasticsearch/grok/GrokCaptureExtracter.java
+++ b/libs/grok/src/main/java/org/opensearch/grok/GrokCaptureExtracter.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.grok;
+package org.opensearch.grok;
 
 import org.joni.Region;
 
diff --git a/libs/grok/src/main/java/org/elasticsearch/grok/GrokCaptureType.java b/libs/grok/src/main/java/org/opensearch/grok/GrokCaptureType.java
similarity index 97%
rename from libs/grok/src/main/java/org/elasticsearch/grok/GrokCaptureType.java
rename to libs/grok/src/main/java/org/opensearch/grok/GrokCaptureType.java
index ffd6664719a..f7b9face8b9 100644
--- a/libs/grok/src/main/java/org/elasticsearch/grok/GrokCaptureType.java
+++ b/libs/grok/src/main/java/org/opensearch/grok/GrokCaptureType.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.grok;
+package org.opensearch.grok;
 
-import org.elasticsearch.grok.GrokCaptureConfig.NativeExtracterMap;
+import org.opensearch.grok.GrokCaptureConfig.NativeExtracterMap;
 import org.joni.Region;
 
 import java.nio.charset.StandardCharsets;
diff --git a/libs/grok/src/main/java/org/elasticsearch/grok/MatcherWatchdog.java b/libs/grok/src/main/java/org/opensearch/grok/MatcherWatchdog.java
similarity index 99%
rename from libs/grok/src/main/java/org/elasticsearch/grok/MatcherWatchdog.java
rename to libs/grok/src/main/java/org/opensearch/grok/MatcherWatchdog.java
index 89b09f021fc..078b522267e 100644
--- a/libs/grok/src/main/java/org/elasticsearch/grok/MatcherWatchdog.java
+++ b/libs/grok/src/main/java/org/opensearch/grok/MatcherWatchdog.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.grok;
+package org.opensearch.grok;
 
 import org.joni.Matcher;
 
diff --git a/libs/grok/src/test/java/org/elasticsearch/grok/GrokTests.java b/libs/grok/src/test/java/org/opensearch/grok/GrokTests.java
similarity index 98%
rename from libs/grok/src/test/java/org/elasticsearch/grok/GrokTests.java
rename to libs/grok/src/test/java/org/opensearch/grok/GrokTests.java
index fe0a5422201..aa6b16c02e2 100644
--- a/libs/grok/src/test/java/org/elasticsearch/grok/GrokTests.java
+++ b/libs/grok/src/test/java/org/opensearch/grok/GrokTests.java
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.grok;
+package org.opensearch.grok;
 
-import org.elasticsearch.grok.GrokCaptureConfig.NativeExtracterMap;
+import org.opensearch.grok.GrokCaptureConfig.NativeExtracterMap;
 import org.elasticsearch.test.ESTestCase;
 
 import java.nio.charset.StandardCharsets;
@@ -38,12 +38,12 @@ import java.util.function.Function;
 import java.util.function.IntConsumer;
 import java.util.function.LongConsumer;
 
-import static org.elasticsearch.grok.GrokCaptureType.BOOLEAN;
-import static org.elasticsearch.grok.GrokCaptureType.DOUBLE;
-import static org.elasticsearch.grok.GrokCaptureType.FLOAT;
-import static org.elasticsearch.grok.GrokCaptureType.INTEGER;
-import static org.elasticsearch.grok.GrokCaptureType.LONG;
-import static org.elasticsearch.grok.GrokCaptureType.STRING;
+import static org.opensearch.grok.GrokCaptureType.BOOLEAN;
+import static org.opensearch.grok.GrokCaptureType.DOUBLE;
+import static org.opensearch.grok.GrokCaptureType.FLOAT;
+import static org.opensearch.grok.GrokCaptureType.INTEGER;
+import static org.opensearch.grok.GrokCaptureType.LONG;
+import static org.opensearch.grok.GrokCaptureType.STRING;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
diff --git a/libs/grok/src/test/java/org/elasticsearch/grok/MatcherWatchdogTests.java b/libs/grok/src/test/java/org/opensearch/grok/MatcherWatchdogTests.java
similarity index 99%
rename from libs/grok/src/test/java/org/elasticsearch/grok/MatcherWatchdogTests.java
rename to libs/grok/src/test/java/org/opensearch/grok/MatcherWatchdogTests.java
index 845df322cf3..d3f45dca23e 100644
--- a/libs/grok/src/test/java/org/elasticsearch/grok/MatcherWatchdogTests.java
+++ b/libs/grok/src/test/java/org/opensearch/grok/MatcherWatchdogTests.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.grok;
+package org.opensearch.grok;
 
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GrokProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GrokProcessor.java
index 027d76db191..764cc358d8d 100644
--- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GrokProcessor.java
+++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GrokProcessor.java
@@ -21,8 +21,8 @@ package org.opensearch.ingest.common;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.elasticsearch.grok.Grok;
-import org.elasticsearch.grok.MatcherWatchdog;
+import org.opensearch.grok.Grok;
+import org.opensearch.grok.MatcherWatchdog;
 import org.elasticsearch.ingest.AbstractProcessor;
 import org.elasticsearch.ingest.ConfigurationUtils;
 import org.elasticsearch.ingest.IngestDocument;
diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GrokProcessorGetAction.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GrokProcessorGetAction.java
index e5b97246414..560dad99138 100644
--- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GrokProcessorGetAction.java
+++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GrokProcessorGetAction.java
@@ -32,7 +32,7 @@ import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.grok.Grok;
+import org.opensearch.grok.Grok;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonPlugin.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonPlugin.java
index ab8dbd095ba..6d2c7c024c2 100644
--- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonPlugin.java
+++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonPlugin.java
@@ -29,8 +29,8 @@ import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsFilter;
 import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.grok.Grok;
-import org.elasticsearch.grok.MatcherWatchdog;
+import org.opensearch.grok.Grok;
+import org.opensearch.grok.MatcherWatchdog;
 import org.elasticsearch.ingest.DropProcessor;
 import org.elasticsearch.ingest.PipelineProcessor;
 import org.elasticsearch.ingest.Processor;
diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorFactoryTests.java
index 65da200717f..ab578ebd5f6 100644
--- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorFactoryTests.java
+++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorFactoryTests.java
@@ -20,7 +20,7 @@
 package org.opensearch.ingest.common;
 
 import org.elasticsearch.OpenSearchParseException;
-import org.elasticsearch.grok.MatcherWatchdog;
+import org.opensearch.grok.MatcherWatchdog;
 import org.elasticsearch.test.ESTestCase;
 
 import java.util.Collections;
diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorTests.java
index f4194b98c92..f741cdf52c7 100644
--- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorTests.java
+++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorTests.java
@@ -19,7 +19,7 @@
 
 package org.opensearch.ingest.common;
 
-import org.elasticsearch.grok.MatcherWatchdog;
+import org.opensearch.grok.MatcherWatchdog;
 import org.elasticsearch.ingest.IngestDocument;
 import org.elasticsearch.ingest.RandomDocumentPicks;
 import org.elasticsearch.test.ESTestCase;