diff --git a/server/src/main/java/org/opensearch/common/logging/OpenSearchJsonLayout.java b/server/src/main/java/org/opensearch/common/logging/OpenSearchJsonLayout.java
index 07d42fa9f1158..893d7d1bf4b60 100644
--- a/server/src/main/java/org/opensearch/common/logging/OpenSearchJsonLayout.java
+++ b/server/src/main/java/org/opensearch/common/logging/OpenSearchJsonLayout.java
@@ -74,10 +74,10 @@ public class OpenSearchJsonLayout extends AbstractStringLayout {
 
     private final PatternLayout patternLayout;
 
-    protected OpenSearchJsonLayout(String typeName, Charset charset, String[] esmessagefields) {
+    protected OpenSearchJsonLayout(String typeName, Charset charset, String[] opensearchMessageFields) {
         super(charset);
         this.patternLayout = PatternLayout.newBuilder()
-                                          .withPattern(pattern(typeName, esmessagefields))
+                                          .withPattern(pattern(typeName, opensearchMessageFields))
                                           .withAlwaysWriteExceptions(false)
                                           .build();
     }
diff --git a/server/src/main/java/org/opensearch/common/logging/OpenSearchMessageFieldConverter.java b/server/src/main/java/org/opensearch/common/logging/OpenSearchMessageFieldConverter.java
index ff946fc681141..ec594b5049b0d 100644
--- a/server/src/main/java/org/opensearch/common/logging/OpenSearchMessageFieldConverter.java
+++ b/server/src/main/java/org/opensearch/common/logging/OpenSearchMessageFieldConverter.java
@@ -32,8 +32,8 @@
  * Pattern converter to populate ESMessageField in a pattern.
  * It will only populate these if the event have message of type <code>OpenSearchLogMessage</code>.
  */
-@Plugin(category = PatternConverter.CATEGORY, name = "ESMessageField")
-@ConverterKeys({"ESMessageField"})
+@Plugin(category = PatternConverter.CATEGORY, name = "OpenSearchMessageField")
+@ConverterKeys({"OpenSearchMessageField"})
 public final class OpenSearchMessageFieldConverter extends LogEventPatternConverter {
 
     private String key;