diff --git a/java-client/src/main/java/org/opensearch/client/json/ExternallyTaggedUnion.java b/java-client/src/main/java/org/opensearch/client/json/ExternallyTaggedUnion.java
index 2878c7e127..4d5b954539 100644
--- a/java-client/src/main/java/org/opensearch/client/json/ExternallyTaggedUnion.java
+++ b/java-client/src/main/java/org/opensearch/client/json/ExternallyTaggedUnion.java
@@ -49,7 +49,7 @@
 
 /**
  * Utilities for union types whose discriminant is not directly part of the structure, either as an enclosing property name or as
- * an inner property. This is used for Elasticsearch aggregation results and suggesters, using the {@code typed_keys} parameter that
+ * an inner property. This is used for OpenSearch aggregation results and suggesters, using the {@code typed_keys} parameter that
  * encodes a name+type in a single JSON property.
  *
  */
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ErrorResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ErrorResponse.java
index 0fe5d5ae2c..995c9afd89 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ErrorResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ErrorResponse.java
@@ -48,7 +48,7 @@
 // typedef: _types.ErrorResponseBase
 
 /**
- * The response returned by Elasticsearch when request execution did not
+ * The response returned by OpenSearch when request execution did not
  * succeed.
  *
  */
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/OpenSearchException.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/OpenSearchException.java
index e2addab959..21d3dfc172 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/OpenSearchException.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/OpenSearchException.java
@@ -33,7 +33,7 @@
 package org.opensearch.client.opensearch._types;
 
 /**
- * Exception thrown by API client methods when Elasticsearch could not accept or
+ * Exception thrown by API client methods when OpenSearch could not accept or
  * process a request.
  * <p>
  * The {@link #error()} contains the error's type and reason along with
@@ -50,7 +50,7 @@ public OpenSearchException(ErrorResponse response) {
     }
 
     /**
-     * The error response sent by Elasticsearch
+     * The error response sent by OpenSearch
      */
     public ErrorResponse response() {
         return this.response;
@@ -64,7 +64,7 @@ public ErrorCause error() {
     }
 
     /**
-     * Status code returned by Elasticsearch. Shortcut for
+     * Status code returned by OpenSearch. Shortcut for
      * {@code response().status()}.
      */
     public int status() {
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterNodes.java b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterNodes.java
index b957b6fbc2..b574410de9 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterNodes.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/cluster/stats/ClusterNodes.java
@@ -161,7 +161,7 @@ public final ClusterOperatingSystem os() {
     }
 
     /**
-     * Required - Contains statistics about Elasticsearch distributions installed on
+     * Required - Contains statistics about OpenSearch distributions installed on
      * selected nodes.
      * <p>
      * API name: {@code packaging_types}
@@ -190,7 +190,7 @@ public final ClusterProcess process() {
     }
 
     /**
-     * Required - Array of Elasticsearch versions used on selected nodes.
+     * Required - Array of OpenSearch versions used on selected nodes.
      * <p>
      * API name: {@code versions}
      */
@@ -446,7 +446,7 @@ public final Builder os(Function<ClusterOperatingSystem.Builder, ObjectBuilder<C
         }
 
         /**
-         * Required - Contains statistics about Elasticsearch distributions installed on
+         * Required - Contains statistics about OpenSearch distributions installed on
          * selected nodes.
          * <p>
          * API name: {@code packaging_types}
@@ -459,7 +459,7 @@ public final Builder packagingTypes(List<NodePackagingType> list) {
         }
 
         /**
-         * Required - Contains statistics about Elasticsearch distributions installed on
+         * Required - Contains statistics about OpenSearch distributions installed on
          * selected nodes.
          * <p>
          * API name: {@code packaging_types}
@@ -472,7 +472,7 @@ public final Builder packagingTypes(NodePackagingType value, NodePackagingType..
         }
 
         /**
-         * Required - Contains statistics about Elasticsearch distributions installed on
+         * Required - Contains statistics about OpenSearch distributions installed on
          * selected nodes.
          * <p>
          * API name: {@code packaging_types}
@@ -541,7 +541,7 @@ public final Builder process(Function<ClusterProcess.Builder, ObjectBuilder<Clus
         }
 
         /**
-         * Required - Array of Elasticsearch versions used on selected nodes.
+         * Required - Array of OpenSearch versions used on selected nodes.
          * <p>
          * API name: {@code versions}
          * <p>
@@ -553,7 +553,7 @@ public final Builder versions(List<String> list) {
         }
 
         /**
-         * Required - Array of Elasticsearch versions used on selected nodes.
+         * Required - Array of OpenSearch versions used on selected nodes.
          * <p>
          * API name: {@code versions}
          * <p>
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetRequest.java
index 32b1132125..2a04947f04 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetRequest.java
@@ -180,7 +180,7 @@ public final Boolean realtime() {
     }
 
     /**
-     * If true, Elasticsearch refreshes the affected shards to make this operation
+     * If true, OpenSearch refreshes the affected shards to make this operation
      * visible to search. If false, do nothing with refreshes.
      * <p>
      * API name: {@code refresh}
@@ -382,7 +382,7 @@ public final Builder realtime(@Nullable Boolean value) {
         }
 
         /**
-         * If true, Elasticsearch refreshes the affected shards to make this operation
+         * If true, OpenSearch refreshes the affected shards to make this operation
          * visible to search. If false, do nothing with refreshes.
          * <p>
          * API name: {@code refresh}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetSourceRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetSourceRequest.java
index e83a8a7f99..157c0001b0 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/GetSourceRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/GetSourceRequest.java
@@ -179,7 +179,7 @@ public final Boolean realtime() {
     }
 
     /**
-     * If true, Elasticsearch refreshes the affected shards to make this operation
+     * If true, OpenSearch refreshes the affected shards to make this operation
      * visible to search. If false, do nothing with refreshes.
      * <p>
      * API name: {@code refresh}
@@ -379,7 +379,7 @@ public final Builder realtime(@Nullable Boolean value) {
         }
 
         /**
-         * If true, Elasticsearch refreshes the affected shards to make this operation
+         * If true, OpenSearch refreshes the affected shards to make this operation
          * visible to search. If false, do nothing with refreshes.
          * <p>
          * API name: {@code refresh}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchRequest.java
index cccf3e522a..852415b0a2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchRequest.java
@@ -763,7 +763,7 @@ public final Suggester suggest() {
 
     /**
      * Maximum number of documents to collect for each shard. If a query reaches
-     * this limit, Elasticsearch terminates the query early. Elasticsearch collects
+     * this limit, OpenSearch terminates the query early. OpenSearch collects
      * documents before sorting. Defaults to 0, which does not terminate query
      * execution early.
      * <p>
@@ -2027,7 +2027,7 @@ public final Builder suggest(Function<Suggester.Builder, ObjectBuilder<Suggester
 
         /**
          * Maximum number of documents to collect for each shard. If a query reaches
-         * this limit, Elasticsearch terminates the query early. Elasticsearch collects
+         * this limit, OpenSearch terminates the query early. OpenSearch collects
          * documents before sorting. Defaults to 0, which does not terminate query
          * execution early.
          * <p>
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateRequest.java
index 1c426e18f4..5b95213b55 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/UpdateRequest.java
@@ -248,7 +248,7 @@ public final String lang() {
     }
 
     /**
-     * If 'true', Elasticsearch refreshes the affected shards to make this operation
+     * If 'true', OpenSearch refreshes the affected shards to make this operation
      * visible to search, if 'wait_for' then wait for a refresh to make this
      * operation visible to search, if 'false' do nothing with refreshes.
      * <p>
@@ -312,7 +312,7 @@ public final Boolean scriptedUpsert() {
 
     /**
      * Period to wait for dynamic mapping updates and active shards. This guarantees
-     * Elasticsearch waits for at least the timeout before failing. The actual wait
+     * OpenSearch waits for at least the timeout before failing. The actual wait
      * time could be longer, particularly when multiple waits occur.
      * <p>
      * API name: {@code timeout}
@@ -565,7 +565,7 @@ public final Builder<TDocument, TPartialDocument> lang(@Nullable String value) {
         }
 
         /**
-         * If 'true', Elasticsearch refreshes the affected shards to make this operation
+         * If 'true', OpenSearch refreshes the affected shards to make this operation
          * visible to search, if 'wait_for' then wait for a refresh to make this
          * operation visible to search, if 'false' do nothing with refreshes.
          * <p>
@@ -638,7 +638,7 @@ public final Builder<TDocument, TPartialDocument> scriptedUpsert(@Nullable Boole
 
         /**
          * Period to wait for dynamic mapping updates and active shards. This guarantees
-         * Elasticsearch waits for at least the timeout before failing. The actual wait
+         * OpenSearch waits for at least the timeout before failing. The actual wait
          * time could be longer, particularly when multiple waits occur.
          * <p>
          * API name: {@code timeout}
@@ -650,7 +650,7 @@ public final Builder<TDocument, TPartialDocument> timeout(@Nullable Time value)
 
         /**
          * Period to wait for dynamic mapping updates and active shards. This guarantees
-         * Elasticsearch waits for at least the timeout before failing. The actual wait
+         * OpenSearch waits for at least the timeout before failing. The actual wait
          * time could be longer, particularly when multiple waits occur.
          * <p>
          * API name: {@code timeout}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingRequest.java
index a3ba45706d..04d43ff12f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutMappingRequest.java
@@ -160,7 +160,7 @@ public final FieldNamesField fieldNames() {
 
     /**
      * A mapping type can have custom meta data associated with it. These are not
-     * used at all by Elasticsearch, but can be used to store application-specific
+     * used at all by OpenSearch, but can be used to store application-specific
      * metadata.
      * <p>
      * API name: {@code _meta}
@@ -513,7 +513,7 @@ public final Builder fieldNames(Function<FieldNamesField.Builder, ObjectBuilder<
 
         /**
          * A mapping type can have custom meta data associated with it. These are not
-         * used at all by Elasticsearch, but can be used to store application-specific
+         * used at all by OpenSearch, but can be used to store application-specific
          * metadata.
          * <p>
          * API name: {@code _meta}
@@ -527,7 +527,7 @@ public final Builder meta(Map<String, JsonData> map) {
 
         /**
          * A mapping type can have custom meta data associated with it. These are not
-         * used at all by Elasticsearch, but can be used to store application-specific
+         * used at all by OpenSearch, but can be used to store application-specific
          * metadata.
          * <p>
          * API name: {@code _meta}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateRequest.java
index 9ba6e65283..6c7f8991e8 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/PutTemplateRequest.java
@@ -199,7 +199,7 @@ public final String name() {
     }
 
     /**
-     * Order in which Elasticsearch applies this template if index matches multiple
+     * Order in which OpenSearch applies this template if index matches multiple
      * templates.
      * <p>
      * Templates with lower 'order' values are merged first. Templates with higher
@@ -231,7 +231,7 @@ public final Time timeout() {
 
     /**
      * Version number used to manage index templates externally. This number is not
-     * automatically generated by Elasticsearch.
+     * automatically generated by OpenSearch.
      * <p>
      * API name: {@code version}
      */
@@ -497,7 +497,7 @@ public final Builder name(String value) {
         }
 
         /**
-         * Order in which Elasticsearch applies this template if index matches multiple
+         * Order in which OpenSearch applies this template if index matches multiple
          * templates.
          * <p>
          * Templates with lower 'order' values are merged first. Templates with higher
@@ -551,7 +551,7 @@ public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
 
         /**
          * Version number used to manage index templates externally. This number is not
-         * automatically generated by Elasticsearch.
+         * automatically generated by OpenSearch.
          * <p>
          * API name: {@code version}
          */
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/PutPipelineRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/PutPipelineRequest.java
index 0df30ee67b..163e03dda2 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/PutPipelineRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/PutPipelineRequest.java
@@ -108,7 +108,7 @@ public static PutPipelineRequest of(Function<Builder, ObjectBuilder<PutPipelineR
 
     /**
      * Optional metadata about the ingest pipeline. May have any contents. This map
-     * is not automatically generated by Elasticsearch.
+     * is not automatically generated by OpenSearch.
      * <p>
      * API name: {@code _meta}
      */
@@ -281,7 +281,7 @@ public static class Builder extends ObjectBuilderBase implements ObjectBuilder<P
 
         /**
          * Optional metadata about the ingest pipeline. May have any contents. This map
-         * is not automatically generated by Elasticsearch.
+         * is not automatically generated by OpenSearch.
          * <p>
          * API name: {@code _meta}
          * <p>
@@ -294,7 +294,7 @@ public final Builder meta(Map<String, JsonData> map) {
 
         /**
          * Optional metadata about the ingest pipeline. May have any contents. This map
-         * is not automatically generated by Elasticsearch.
+         * is not automatically generated by OpenSearch.
          * <p>
          * API name: {@code _meta}
          * <p>
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/geo_ip_stats/GeoIpNodeDatabases.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/geo_ip_stats/GeoIpNodeDatabases.java
index ded9dcdb05..9d4d26a160 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/geo_ip_stats/GeoIpNodeDatabases.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/geo_ip_stats/GeoIpNodeDatabases.java
@@ -81,7 +81,7 @@ public final List<GeoIpNodeDatabaseName> databases() {
 
     /**
      * Required - Downloaded database files, including related license files.
-     * Elasticsearch stores these files in the node's temporary directory:
+     * OpenSearch stores these files in the node's temporary directory:
      * $ES_TMPDIR/geoip-databases/&lt;node_id&gt;.
      * <p>
      * API name: {@code files_in_temp}
@@ -172,7 +172,7 @@ public final Builder databases(Function<GeoIpNodeDatabaseName.Builder, ObjectBui
 
         /**
          * Required - Downloaded database files, including related license files.
-         * Elasticsearch stores these files in the node's temporary directory:
+         * OpenSearch stores these files in the node's temporary directory:
          * $ES_TMPDIR/geoip-databases/&lt;node_id&gt;.
          * <p>
          * API name: {@code files_in_temp}
@@ -186,7 +186,7 @@ public final Builder filesInTemp(List<String> list) {
 
         /**
          * Required - Downloaded database files, including related license files.
-         * Elasticsearch stores these files in the node's temporary directory:
+         * OpenSearch stores these files in the node's temporary directory:
          * $ES_TMPDIR/geoip-databases/&lt;node_id&gt;.
          * <p>
          * API name: {@code files_in_temp}
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfo.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfo.java
index d0db0c6a49..c208387e92 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfo.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/info/NodeInfo.java
@@ -304,7 +304,7 @@ public final String transportAddress() {
     }
 
     /**
-     * Required - Elasticsearch version running on this node.
+     * Required - OpenSearch version running on this node.
      * <p>
      * API name: {@code version}
      */
@@ -834,7 +834,7 @@ public final Builder transportAddress(String value) {
         }
 
         /**
-         * Required - Elasticsearch version running on this node.
+         * Required - OpenSearch version running on this node.
          * <p>
          * API name: {@code version}
          */
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateSnapshotRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateSnapshotRequest.java
index 9ffaa6a5e8..d9433cdf8f 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateSnapshotRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateSnapshotRequest.java
@@ -189,7 +189,7 @@ public final Time clusterManagerTimeout() {
 
     /**
      * Optional metadata for the snapshot. May have any contents. Must be less than
-     * 1024 bytes. This map is not automatically generated by Elasticsearch.
+     * 1024 bytes. This map is not automatically generated by OpenSearch.
      * <p>
      * API name: {@code metadata}
      */
@@ -473,7 +473,7 @@ public final Builder clusterManagerTimeout(Function<Time.Builder, ObjectBuilder<
 
         /**
          * Optional metadata for the snapshot. May have any contents. Must be less than
-         * 1024 bytes. This map is not automatically generated by Elasticsearch.
+         * 1024 bytes. This map is not automatically generated by OpenSearch.
          * <p>
          * API name: {@code metadata}
          * <p>
@@ -486,7 +486,7 @@ public final Builder metadata(Map<String, JsonData> map) {
 
         /**
          * Optional metadata for the snapshot. May have any contents. Must be less than
-         * 1024 bytes. This map is not automatically generated by Elasticsearch.
+         * 1024 bytes. This map is not automatically generated by OpenSearch.
          * <p>
          * API name: {@code metadata}
          * <p>
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetSnapshotRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetSnapshotRequest.java
index 0e05ffdc0e..79fa89d264 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetSnapshotRequest.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/snapshot/GetSnapshotRequest.java
@@ -195,7 +195,7 @@ public final List<String> snapshot() {
 
     /**
      * If true, returns additional information about each snapshot such as the
-     * version of Elasticsearch which took the snapshot, the start and end times of
+     * version of OpenSearch which took the snapshot, the start and end times of
      * the snapshot, and the number of shards snapshotted.
      * <p>
      * API name: {@code verbose}
@@ -376,7 +376,7 @@ public final Builder snapshot(String value, String... values) {
 
         /**
          * If true, returns additional information about each snapshot such as the
-         * version of Elasticsearch which took the snapshot, the start and end times of
+         * version of OpenSearch which took the snapshot, the start and end times of
          * the snapshot, and the number of shards snapshotted.
          * <p>
          * API name: {@code verbose}
diff --git a/java-client/src/main/java/org/opensearch/client/transport/OpenSearchTransport.java b/java-client/src/main/java/org/opensearch/client/transport/OpenSearchTransport.java
index 531e9f69f9..16c15a84d0 100644
--- a/java-client/src/main/java/org/opensearch/client/transport/OpenSearchTransport.java
+++ b/java-client/src/main/java/org/opensearch/client/transport/OpenSearchTransport.java
@@ -33,7 +33,7 @@
 package org.opensearch.client.transport;
 
 /**
- * A transport layer that implements Elasticsearch specificities.
+ * A transport layer that implements OpenSearch specificities.
  *
  * Currently an empty placeholder for future extension.
  */