diff --git a/.ci/license/check-license-headers.sh b/.ci/license/check-license-headers.sh
new file mode 100755
index 000000000..e94203302
--- /dev/null
+++ b/.ci/license/check-license-headers.sh
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+# Copyright OpenSearch Contributors
+# SPDX-License-Identifier: Apache-2.0
+#
+# The OpenSearch Contributors require contributions made to
+# this file be licensed under the Apache-2.0 license or a
+# compatible open source license.
+
+# Check that source code files in this repo have the appropriate license
+# header.
+
+if [ "$TRACE" != "" ]; then
+    export PS4='${BASH_SOURCE}:${LINENO}: ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
+    set -o xtrace
+fi
+set -o errexit
+set -o pipefail
+
+TOP=$(cd "$(dirname "$0")/.." >/dev/null && pwd)
+NLINES_SC=$(wc -l ./.ci/license/license-sc.txt | awk '{print $1}')
+NLINES_MC=$(wc -l ./.ci/license/license-mc.txt | awk '{print $1}')
+
+echo $NLINES_SC
+echo $NLINES_MC
+
+function check_license_header {
+    local fP
+    f=$1
+    if (diff -a --strip-trailing-cr license/license-mc.txt <(head -$NLINES_MC "$f") >/dev/null) || (diff -a --strip-trailing-cr license/license-sc.txt <(head -$NLINES_SC "$f") >/dev/null); then
+        return 0
+    else
+        echo "check-license-headers: error: '$f' does not have required license header, see 'diff -u ./.ci/license/license-mc.txt <(head -$NLINES_MC ../$f)'"
+        return 1
+    fi
+}
+
+cd "$TOP"
+nErrors=0
+
+for f in $(git ls-files --directory ../ | grep '\.ts$'); do
+    if ! check_license_header $f; then
+        nErrors=$((nErrors+1))
+    fi
+done
+
+for f in $(git ls-files --directory ../ | grep '\.js$'); do
+    if ! check_license_header $f; then
+        nErrors=$((nErrors+1))
+    fi
+done
+
+if [[ $nErrors -eq 0 ]]; then
+    exit 0
+else
+    exit 1
+fi
\ No newline at end of file
diff --git a/.ci/license/license-mc.txt b/.ci/license/license-mc.txt
new file mode 100644
index 000000000..43d1458f2
--- /dev/null
+++ b/.ci/license/license-mc.txt
@@ -0,0 +1,9 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ */
diff --git a/.ci/license/license-sc.txt b/.ci/license/license-sc.txt
new file mode 100644
index 000000000..a21dff654
--- /dev/null
+++ b/.ci/license/license-sc.txt
@@ -0,0 +1,6 @@
+// Copyright OpenSearch Contributors
+// SPDX-License-Identifier: Apache-2.0
+//
+// The OpenSearch Contributors require contributions made to
+// this file be licensed under the Apache-2.0 license or a
+// compatible open source license.
diff --git a/.github/workflows/license-header.yml b/.github/workflows/license-header.yml
new file mode 100644
index 000000000..54fb53ee3
--- /dev/null
+++ b/.github/workflows/license-header.yml
@@ -0,0 +1,14 @@
+name: License headers
+
+on: [push, pull_request]
+
+jobs:
+  licenseheader:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Check license headers
+      run: "./.ci/license/check-license-headers.sh"
\ No newline at end of file
diff --git a/api/api/bulk.js b/api/api/bulk.js
index c4f6ebdcc..d9dd652f1 100644
--- a/api/api/bulk.js
+++ b/api/api/bulk.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/cat.js b/api/api/cat.js
index e6df85209..394d6db1e 100644
--- a/api/api/cat.js
+++ b/api/api/cat.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/clear_scroll.js b/api/api/clear_scroll.js
index 38295daf1..143a7ff9e 100644
--- a/api/api/clear_scroll.js
+++ b/api/api/clear_scroll.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/cluster.js b/api/api/cluster.js
index 2679285c7..860414dfc 100644
--- a/api/api/cluster.js
+++ b/api/api/cluster.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/count.js b/api/api/count.js
index 1b65db4a3..12d83a2c3 100644
--- a/api/api/count.js
+++ b/api/api/count.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/create.js b/api/api/create.js
index 3f5d8443f..896710d9e 100644
--- a/api/api/create.js
+++ b/api/api/create.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/dangling_indices.js b/api/api/dangling_indices.js
index 33c04fcf4..2a62a99d9 100644
--- a/api/api/dangling_indices.js
+++ b/api/api/dangling_indices.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/delete.js b/api/api/delete.js
index 61f4eef1e..fff799033 100644
--- a/api/api/delete.js
+++ b/api/api/delete.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/delete_by_query.js b/api/api/delete_by_query.js
index 55db6b91d..d4109add1 100644
--- a/api/api/delete_by_query.js
+++ b/api/api/delete_by_query.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/delete_by_query_rethrottle.js b/api/api/delete_by_query_rethrottle.js
index a24a2e287..f328ea359 100644
--- a/api/api/delete_by_query_rethrottle.js
+++ b/api/api/delete_by_query_rethrottle.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/delete_script.js b/api/api/delete_script.js
index bded0694b..c4539743d 100644
--- a/api/api/delete_script.js
+++ b/api/api/delete_script.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/exists.js b/api/api/exists.js
index 2c9ff22b9..012b0248f 100644
--- a/api/api/exists.js
+++ b/api/api/exists.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/exists_source.js b/api/api/exists_source.js
index c7b918efc..f5e3f4b1c 100644
--- a/api/api/exists_source.js
+++ b/api/api/exists_source.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/explain.js b/api/api/explain.js
index 9d1daf11e..9030d1781 100644
--- a/api/api/explain.js
+++ b/api/api/explain.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/features.js b/api/api/features.js
index 0d36abbaa..4d96a0709 100644
--- a/api/api/features.js
+++ b/api/api/features.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/field_caps.js b/api/api/field_caps.js
index 5bb0d21c3..c935078fe 100644
--- a/api/api/field_caps.js
+++ b/api/api/field_caps.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/get.js b/api/api/get.js
index 0cd08da37..096dbfa01 100644
--- a/api/api/get.js
+++ b/api/api/get.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/get_script.js b/api/api/get_script.js
index 67fdb7005..61e6e328b 100644
--- a/api/api/get_script.js
+++ b/api/api/get_script.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/get_script_context.js b/api/api/get_script_context.js
index 871a02c7c..832fc72d2 100644
--- a/api/api/get_script_context.js
+++ b/api/api/get_script_context.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/get_script_languages.js b/api/api/get_script_languages.js
index c0530a298..29e39d9ff 100644
--- a/api/api/get_script_languages.js
+++ b/api/api/get_script_languages.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/get_source.js b/api/api/get_source.js
index c49052ca8..ff9ac3ec2 100644
--- a/api/api/get_source.js
+++ b/api/api/get_source.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/index.js b/api/api/index.js
index c10109994..389113fb8 100644
--- a/api/api/index.js
+++ b/api/api/index.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/indices.js b/api/api/indices.js
index f8c578f13..f94c0f763 100644
--- a/api/api/indices.js
+++ b/api/api/indices.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/info.js b/api/api/info.js
index 186389c0a..ceade39c9 100644
--- a/api/api/info.js
+++ b/api/api/info.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/ingest.js b/api/api/ingest.js
index 67a0c3d82..0a86ea36a 100644
--- a/api/api/ingest.js
+++ b/api/api/ingest.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/mget.js b/api/api/mget.js
index 3eb882cf3..ad9c34d5b 100644
--- a/api/api/mget.js
+++ b/api/api/mget.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/msearch.js b/api/api/msearch.js
index e39228ddf..3c2ac6163 100644
--- a/api/api/msearch.js
+++ b/api/api/msearch.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/msearch_template.js b/api/api/msearch_template.js
index 8d23bd422..3b5ef8512 100644
--- a/api/api/msearch_template.js
+++ b/api/api/msearch_template.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/mtermvectors.js b/api/api/mtermvectors.js
index 089452006..134b0c424 100644
--- a/api/api/mtermvectors.js
+++ b/api/api/mtermvectors.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/nodes.js b/api/api/nodes.js
index c1b0eac6c..adf99382e 100644
--- a/api/api/nodes.js
+++ b/api/api/nodes.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/ping.js b/api/api/ping.js
index 005313b4d..6b64d634b 100644
--- a/api/api/ping.js
+++ b/api/api/ping.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/put_script.js b/api/api/put_script.js
index 434489c5a..917b8ce50 100644
--- a/api/api/put_script.js
+++ b/api/api/put_script.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/rank_eval.js b/api/api/rank_eval.js
index ea3c59f18..5739b4cc7 100644
--- a/api/api/rank_eval.js
+++ b/api/api/rank_eval.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/reindex.js b/api/api/reindex.js
index ae5167174..4cdc08b58 100644
--- a/api/api/reindex.js
+++ b/api/api/reindex.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/reindex_rethrottle.js b/api/api/reindex_rethrottle.js
index 5e8b93606..71df5c289 100644
--- a/api/api/reindex_rethrottle.js
+++ b/api/api/reindex_rethrottle.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/render_search_template.js b/api/api/render_search_template.js
index a5614ddb5..4f8a5e788 100644
--- a/api/api/render_search_template.js
+++ b/api/api/render_search_template.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/scripts_painless_execute.js b/api/api/scripts_painless_execute.js
index 587695262..bd2805519 100644
--- a/api/api/scripts_painless_execute.js
+++ b/api/api/scripts_painless_execute.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/scroll.js b/api/api/scroll.js
index 66f024146..03510b2db 100644
--- a/api/api/scroll.js
+++ b/api/api/scroll.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/search.js b/api/api/search.js
index eea4843b9..94ef28885 100644
--- a/api/api/search.js
+++ b/api/api/search.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/search_shards.js b/api/api/search_shards.js
index e65b8c5f4..be730ac9f 100644
--- a/api/api/search_shards.js
+++ b/api/api/search_shards.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/search_template.js b/api/api/search_template.js
index c16af488b..aae968398 100644
--- a/api/api/search_template.js
+++ b/api/api/search_template.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/shutdown.js b/api/api/shutdown.js
index 86c6b1625..2a4695999 100644
--- a/api/api/shutdown.js
+++ b/api/api/shutdown.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/snapshot.js b/api/api/snapshot.js
index 06e2c2769..6fee69364 100644
--- a/api/api/snapshot.js
+++ b/api/api/snapshot.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/tasks.js b/api/api/tasks.js
index b745ee98c..407baa2a1 100644
--- a/api/api/tasks.js
+++ b/api/api/tasks.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/terms_enum.js b/api/api/terms_enum.js
index 015a5dd18..5c0ad538e 100644
--- a/api/api/terms_enum.js
+++ b/api/api/terms_enum.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/termvectors.js b/api/api/termvectors.js
index c982af9b5..e2ec981b7 100644
--- a/api/api/termvectors.js
+++ b/api/api/termvectors.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/update.js b/api/api/update.js
index f8646d46c..ff9437d1d 100644
--- a/api/api/update.js
+++ b/api/api/update.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/update_by_query.js b/api/api/update_by_query.js
index 94d2e651a..60f37fb89 100644
--- a/api/api/update_by_query.js
+++ b/api/api/update_by_query.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/api/update_by_query_rethrottle.js b/api/api/update_by_query_rethrottle.js
index 41790cf2a..7da9f6486 100644
--- a/api/api/update_by_query_rethrottle.js
+++ b/api/api/update_by_query_rethrottle.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/index.js b/api/index.js
index a94b3b8fe..afd231c98 100644
--- a/api/index.js
+++ b/api/index.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/new.d.ts b/api/new.d.ts
index d3f186079..ea2178a31 100644
--- a/api/new.d.ts
+++ b/api/new.d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/opensearch_dashboards.d.ts b/api/opensearch_dashboards.d.ts
index 21b25cd48..11423b8c5 100644
--- a/api/opensearch_dashboards.d.ts
+++ b/api/opensearch_dashboards.d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/requestParams.d.ts b/api/requestParams.d.ts
index 651055772..9c9e4b1bb 100644
--- a/api/requestParams.d.ts
+++ b/api/requestParams.d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/types.d.ts b/api/types.d.ts
index 6ebe2e0ac..7b7b4c29c 100644
--- a/api/types.d.ts
+++ b/api/types.d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/api/utils.js b/api/utils.js
index fc7d1c3c3..671e7b7bb 100644
--- a/api/utils.js
+++ b/api/utils.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/index.d.ts b/index.d.ts
index 6e9ac2a82..f25917f6f 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/index.js b/index.js
index 56c02520c..04a83d5c7 100644
--- a/index.js
+++ b/index.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/index.mjs b/index.mjs
index 75ef740d9..2d2d89e7f 100644
--- a/index.mjs
+++ b/index.mjs
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/lib/Connection.d.ts b/lib/Connection.d.ts
index a400c43b3..0dc40d3a1 100644
--- a/lib/Connection.d.ts
+++ b/lib/Connection.d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/lib/Connection.js b/lib/Connection.js
index 389c8d704..2e4a5a547 100644
--- a/lib/Connection.js
+++ b/lib/Connection.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/lib/Helpers.d.ts b/lib/Helpers.d.ts
index 4055ae5ce..88b315edb 100644
--- a/lib/Helpers.d.ts
+++ b/lib/Helpers.d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/lib/Helpers.js b/lib/Helpers.js
index b5aa12da6..a648aea9a 100644
--- a/lib/Helpers.js
+++ b/lib/Helpers.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/lib/Serializer.d.ts b/lib/Serializer.d.ts
index 248dd4a1c..5e9799996 100644
--- a/lib/Serializer.d.ts
+++ b/lib/Serializer.d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/lib/Serializer.js b/lib/Serializer.js
index 143ef0999..224a5bd4b 100644
--- a/lib/Serializer.js
+++ b/lib/Serializer.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/lib/Transport.d.ts b/lib/Transport.d.ts
index 3b3c2f802..d79eabec7 100644
--- a/lib/Transport.d.ts
+++ b/lib/Transport.d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/lib/Transport.js b/lib/Transport.js
index 69e78d32c..9e1c4f3cb 100644
--- a/lib/Transport.js
+++ b/lib/Transport.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/lib/aws/AwsSigv4Signer.js b/lib/aws/AwsSigv4Signer.js
index 7e0c7c614..6ab50f545 100644
--- a/lib/aws/AwsSigv4Signer.js
+++ b/lib/aws/AwsSigv4Signer.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 'use strict';
diff --git a/lib/aws/errors.js b/lib/aws/errors.js
index b93e80274..b268dda18 100644
--- a/lib/aws/errors.js
+++ b/lib/aws/errors.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 'use strict';
diff --git a/lib/aws/index.d.ts b/lib/aws/index.d.ts
index 50ba0c4f0..0f9f79592 100644
--- a/lib/aws/index.d.ts
+++ b/lib/aws/index.d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /// <reference types="node" />
diff --git a/lib/aws/index.js b/lib/aws/index.js
index 8586dbb18..a36d7516e 100644
--- a/lib/aws/index.js
+++ b/lib/aws/index.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 'use strict';
diff --git a/lib/errors.d.ts b/lib/errors.d.ts
index b49485963..659975167 100644
--- a/lib/errors.d.ts
+++ b/lib/errors.d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/lib/errors.js b/lib/errors.js
index 068b63247..a8e63e77d 100644
--- a/lib/errors.js
+++ b/lib/errors.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/lib/pool/BaseConnectionPool.js b/lib/pool/BaseConnectionPool.js
index 4c2e3f296..c2a901f64 100644
--- a/lib/pool/BaseConnectionPool.js
+++ b/lib/pool/BaseConnectionPool.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/lib/pool/CloudConnectionPool.js b/lib/pool/CloudConnectionPool.js
index e8a80617a..82f2001b9 100644
--- a/lib/pool/CloudConnectionPool.js
+++ b/lib/pool/CloudConnectionPool.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/lib/pool/ConnectionPool.js b/lib/pool/ConnectionPool.js
index 43e5bacd9..f5d4846cb 100644
--- a/lib/pool/ConnectionPool.js
+++ b/lib/pool/ConnectionPool.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/lib/pool/index.d.ts b/lib/pool/index.d.ts
index f327cabc3..fe6954362 100644
--- a/lib/pool/index.d.ts
+++ b/lib/pool/index.d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/lib/pool/index.js b/lib/pool/index.js
index 7e562357c..cf95941cb 100644
--- a/lib/pool/index.js
+++ b/lib/pool/index.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/scripts/download-artifacts.js b/scripts/download-artifacts.js
index a9dcf17cf..72bb565dc 100644
--- a/scripts/download-artifacts.js
+++ b/scripts/download-artifacts.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/scripts/generate.js b/scripts/generate.js
index a144dc0af..d23ef4b98 100644
--- a/scripts/generate.js
+++ b/scripts/generate.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/scripts/release-canary.js b/scripts/release-canary.js
index 5f51348c2..93c24d07b 100644
--- a/scripts/release-canary.js
+++ b/scripts/release-canary.js
@@ -1,3 +1,31 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ */
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 'use strict';
 
 /**
diff --git a/scripts/utils/clone-opensearch.js b/scripts/utils/clone-opensearch.js
index f2ee8d261..ee2ae177a 100644
--- a/scripts/utils/clone-opensearch.js
+++ b/scripts/utils/clone-opensearch.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/scripts/utils/generateApis.js b/scripts/utils/generateApis.js
index 4d83da36f..c35f9164c 100644
--- a/scripts/utils/generateApis.js
+++ b/scripts/utils/generateApis.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/scripts/utils/generateDocs.js b/scripts/utils/generateDocs.js
index d2563c84d..35de635da 100644
--- a/scripts/utils/generateDocs.js
+++ b/scripts/utils/generateDocs.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/scripts/utils/generateMain.js b/scripts/utils/generateMain.js
index c1d4f005f..651501b84 100644
--- a/scripts/utils/generateMain.js
+++ b/scripts/utils/generateMain.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/scripts/utils/generateRequestTypes.js b/scripts/utils/generateRequestTypes.js
index e93243b31..a5a3eb8a0 100644
--- a/scripts/utils/generateRequestTypes.js
+++ b/scripts/utils/generateRequestTypes.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
@@ -37,14 +36,13 @@ const deprecatedParameters = require('./patch.json');
 function generate(version, api) {
   const release = version.charAt(0);
   let types = `/*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/scripts/utils/index.js b/scripts/utils/index.js
index d3f1005e6..8f374d12a 100644
--- a/scripts/utils/index.js
+++ b/scripts/utils/index.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/acceptance/events-order.test.js b/test/acceptance/events-order.test.js
index ac0795aac..40fa80cba 100644
--- a/test/acceptance/events-order.test.js
+++ b/test/acceptance/events-order.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/acceptance/observability.test.js b/test/acceptance/observability.test.js
index 99ff548ae..5d734d11a 100644
--- a/test/acceptance/observability.test.js
+++ b/test/acceptance/observability.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 'use strict';
diff --git a/test/acceptance/proxy.test.js b/test/acceptance/proxy.test.js
index eac2dfa52..dc2cf1b06 100644
--- a/test/acceptance/proxy.test.js
+++ b/test/acceptance/proxy.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 'use strict';
diff --git a/test/acceptance/resurrect.test.js b/test/acceptance/resurrect.test.js
index 8a66b6cce..9b063dd50 100644
--- a/test/acceptance/resurrect.test.js
+++ b/test/acceptance/resurrect.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/acceptance/sniff.test.js b/test/acceptance/sniff.test.js
index 6fbc95f41..f248fdd35 100644
--- a/test/acceptance/sniff.test.js
+++ b/test/acceptance/sniff.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/benchmarks/macro/complex.bench.js b/test/benchmarks/macro/complex.bench.js
index 723711462..a547f90c4 100644
--- a/test/benchmarks/macro/complex.bench.js
+++ b/test/benchmarks/macro/complex.bench.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 'use strict';
diff --git a/test/benchmarks/macro/simple.bench.js b/test/benchmarks/macro/simple.bench.js
index 148e8d4ae..1a56bffac 100644
--- a/test/benchmarks/macro/simple.bench.js
+++ b/test/benchmarks/macro/simple.bench.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 'use strict';
diff --git a/test/benchmarks/micro/basic.bench.js b/test/benchmarks/micro/basic.bench.js
index 47766d5e1..ce5699572 100644
--- a/test/benchmarks/micro/basic.bench.js
+++ b/test/benchmarks/micro/basic.bench.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 'use strict';
diff --git a/test/benchmarks/suite.js b/test/benchmarks/suite.js
index 1e171c130..f557eba17 100644
--- a/test/benchmarks/suite.js
+++ b/test/benchmarks/suite.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 'use strict';
diff --git a/test/bundlers/parcel-test/index.js b/test/bundlers/parcel-test/index.js
index 55fac2b21..738bc65c6 100644
--- a/test/bundlers/parcel-test/index.js
+++ b/test/bundlers/parcel-test/index.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 'use strict';
diff --git a/test/bundlers/rollup-test/index.js b/test/bundlers/rollup-test/index.js
index 55fac2b21..738bc65c6 100644
--- a/test/bundlers/rollup-test/index.js
+++ b/test/bundlers/rollup-test/index.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 'use strict';
diff --git a/test/bundlers/rollup-test/rollup.config.js b/test/bundlers/rollup-test/rollup.config.js
index 80aad33f3..7c864dde9 100644
--- a/test/bundlers/rollup-test/rollup.config.js
+++ b/test/bundlers/rollup-test/rollup.config.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 import resolve from '@rollup/plugin-node-resolve';
diff --git a/test/bundlers/webpack-test/index.js b/test/bundlers/webpack-test/index.js
index 55fac2b21..738bc65c6 100644
--- a/test/bundlers/webpack-test/index.js
+++ b/test/bundlers/webpack-test/index.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 'use strict';
diff --git a/test/bundlers/webpack-test/webpack.config.js b/test/bundlers/webpack-test/webpack.config.js
index 1b14bb813..0600ecc0b 100644
--- a/test/bundlers/webpack-test/webpack.config.js
+++ b/test/bundlers/webpack-test/webpack.config.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 'use strict';
diff --git a/test/integration/helper.js b/test/integration/helper.js
index 221e1f525..6a1c56af2 100644
--- a/test/integration/helper.js
+++ b/test/integration/helper.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/integration/helpers-secure/search.test.js b/test/integration/helpers-secure/search.test.js
index 8e003ac9e..891f96269 100644
--- a/test/integration/helpers-secure/search.test.js
+++ b/test/integration/helpers-secure/search.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 'use strict';
diff --git a/test/integration/helpers/bulk.test.js b/test/integration/helpers/bulk.test.js
index 46b8f27b0..3f9a086e6 100644
--- a/test/integration/helpers/bulk.test.js
+++ b/test/integration/helpers/bulk.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/integration/helpers/msearch.test.js b/test/integration/helpers/msearch.test.js
index bd566f069..5432010a9 100644
--- a/test/integration/helpers/msearch.test.js
+++ b/test/integration/helpers/msearch.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/integration/helpers/scroll.test.js b/test/integration/helpers/scroll.test.js
index edb5fca5d..b0251ae87 100644
--- a/test/integration/helpers/scroll.test.js
+++ b/test/integration/helpers/scroll.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/integration/helpers/search.test.js b/test/integration/helpers/search.test.js
index 92995ccd5..45e1a88bd 100644
--- a/test/integration/helpers/search.test.js
+++ b/test/integration/helpers/search.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/integration/index.js b/test/integration/index.js
index a61703203..04dbaf6b5 100644
--- a/test/integration/index.js
+++ b/test/integration/index.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/integration/reporter.js b/test/integration/reporter.js
index d856cbcb4..59e973b70 100644
--- a/test/integration/reporter.js
+++ b/test/integration/reporter.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 'use strict';
diff --git a/test/integration/test-runner.js b/test/integration/test-runner.js
index 051bb8ab1..54539ad3a 100644
--- a/test/integration/test-runner.js
+++ b/test/integration/test-runner.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/types/api-response-body.test-d.ts b/test/types/api-response-body.test-d.ts
index 3d799bf6a..e9bd9f5cc 100644
--- a/test/types/api-response-body.test-d.ts
+++ b/test/types/api-response-body.test-d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/types/api-response.test-d.ts b/test/types/api-response.test-d.ts
index c0ed20df4..25668d672 100644
--- a/test/types/api-response.test-d.ts
+++ b/test/types/api-response.test-d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/types/awssigv4signer.test-d.ts b/test/types/awssigv4signer.test-d.ts
index f45e38dbe..33d2d82db 100644
--- a/test/types/awssigv4signer.test-d.ts
+++ b/test/types/awssigv4signer.test-d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 import { expectType } from 'tsd';
 const { v4: uuidv4 } = require('uuid');
diff --git a/test/types/client-options.test-d.ts b/test/types/client-options.test-d.ts
index 0ff77158c..25b490194 100644
--- a/test/types/client-options.test-d.ts
+++ b/test/types/client-options.test-d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/types/client.test-d.ts b/test/types/client.test-d.ts
index a727ab3e4..cf924aa5d 100644
--- a/test/types/client.test-d.ts
+++ b/test/types/client.test-d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/types/connection-pool.test-d.ts b/test/types/connection-pool.test-d.ts
index a775e99d0..1b35c41db 100644
--- a/test/types/connection-pool.test-d.ts
+++ b/test/types/connection-pool.test-d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/types/connection.test-d.ts b/test/types/connection.test-d.ts
index 1abbc0ccb..f174dbc2d 100644
--- a/test/types/connection.test-d.ts
+++ b/test/types/connection.test-d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/types/errors.test-d.ts b/test/types/errors.test-d.ts
index 96718d160..af41dca25 100644
--- a/test/types/errors.test-d.ts
+++ b/test/types/errors.test-d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/types/helpers.test-d.ts b/test/types/helpers.test-d.ts
index 94e9edf03..f07630569 100644
--- a/test/types/helpers.test-d.ts
+++ b/test/types/helpers.test-d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/types/new-types.test-d.ts b/test/types/new-types.test-d.ts
index dc4f7ca04..18f8dc08a 100644
--- a/test/types/new-types.test-d.ts
+++ b/test/types/new-types.test-d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/types/serializer.test-d.ts b/test/types/serializer.test-d.ts
index d27dac9e6..cdd9fb902 100644
--- a/test/types/serializer.test-d.ts
+++ b/test/types/serializer.test-d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/types/transport.test-d.ts b/test/types/transport.test-d.ts
index 67c8dc2e4..3381f97cf 100644
--- a/test/types/transport.test-d.ts
+++ b/test/types/transport.test-d.ts
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/api-async.js b/test/unit/api-async.js
index 312e2fb88..a7b85de02 100644
--- a/test/unit/api-async.js
+++ b/test/unit/api-async.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/api.test.js b/test/unit/api.test.js
index 6c1281b9a..e7fcfdf28 100644
--- a/test/unit/api.test.js
+++ b/test/unit/api.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/base-connection-pool.test.js b/test/unit/base-connection-pool.test.js
index 27e5e0e77..8af26a393 100644
--- a/test/unit/base-connection-pool.test.js
+++ b/test/unit/base-connection-pool.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/child.test.js b/test/unit/child.test.js
index 4a08e059e..c5fea466d 100644
--- a/test/unit/child.test.js
+++ b/test/unit/child.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/client.test.js b/test/unit/client.test.js
index d78a071ee..e1d3557f2 100644
--- a/test/unit/client.test.js
+++ b/test/unit/client.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/cloud-connection-pool.test.js b/test/unit/cloud-connection-pool.test.js
index 54c132ea6..ea90d91e6 100644
--- a/test/unit/cloud-connection-pool.test.js
+++ b/test/unit/cloud-connection-pool.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/connection-pool.test.js b/test/unit/connection-pool.test.js
index c4f262ee5..4c638126a 100644
--- a/test/unit/connection-pool.test.js
+++ b/test/unit/connection-pool.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/connection.test.js b/test/unit/connection.test.js
index 48474dfb8..cb0458dc9 100644
--- a/test/unit/connection.test.js
+++ b/test/unit/connection.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/errors.test.js b/test/unit/errors.test.js
index 1477e678e..165c2e934 100644
--- a/test/unit/errors.test.js
+++ b/test/unit/errors.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/esm/index.mjs b/test/unit/esm/index.mjs
index ac86bdaa3..4368f720e 100644
--- a/test/unit/esm/index.mjs
+++ b/test/unit/esm/index.mjs
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 import t from 'tap';
diff --git a/test/unit/esm/index.test.js b/test/unit/esm/index.test.js
index 03c2e1b8c..24c7debd8 100644
--- a/test/unit/esm/index.test.js
+++ b/test/unit/esm/index.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 'use strict';
diff --git a/test/unit/events.test.js b/test/unit/events.test.js
index 566b100b8..6848f3290 100644
--- a/test/unit/events.test.js
+++ b/test/unit/events.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/helpers/bulk.test.js b/test/unit/helpers/bulk.test.js
index 1083f6007..77558879b 100644
--- a/test/unit/helpers/bulk.test.js
+++ b/test/unit/helpers/bulk.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/helpers/msearch.test.js b/test/unit/helpers/msearch.test.js
index 4945fc080..7997d04be 100644
--- a/test/unit/helpers/msearch.test.js
+++ b/test/unit/helpers/msearch.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/helpers/scroll.test.js b/test/unit/helpers/scroll.test.js
index 17c705cad..34f268f24 100644
--- a/test/unit/helpers/scroll.test.js
+++ b/test/unit/helpers/scroll.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/helpers/search.test.js b/test/unit/helpers/search.test.js
index 5e77f80fa..24177d1c0 100644
--- a/test/unit/helpers/search.test.js
+++ b/test/unit/helpers/search.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/lib/aws/awssigv4signer.test.js b/test/unit/lib/aws/awssigv4signer.test.js
index 1665045a7..c0f5a3465 100644
--- a/test/unit/lib/aws/awssigv4signer.test.js
+++ b/test/unit/lib/aws/awssigv4signer.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 const { test } = require('tap');
 const { URL } = require('url');
diff --git a/test/unit/selectors.test.js b/test/unit/selectors.test.js
index 6e7bbc349..9980d617c 100644
--- a/test/unit/selectors.test.js
+++ b/test/unit/selectors.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/serializer.test.js b/test/unit/serializer.test.js
index d171ccab7..ccbb9baf2 100644
--- a/test/unit/serializer.test.js
+++ b/test/unit/serializer.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/unit/transport.test.js b/test/unit/transport.test.js
index 5a49d989a..6c56813b0 100644
--- a/test/unit/transport.test.js
+++ b/test/unit/transport.test.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/utils/MockConnection.js b/test/utils/MockConnection.js
index 336c471dc..132dc0230 100644
--- a/test/utils/MockConnection.js
+++ b/test/utils/MockConnection.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/utils/buildCluster.js b/test/utils/buildCluster.js
index 7e27b293d..359ddc691 100644
--- a/test/utils/buildCluster.js
+++ b/test/utils/buildCluster.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/utils/buildProxy.js b/test/utils/buildProxy.js
index 2ff352862..5b0dfdfec 100644
--- a/test/utils/buildProxy.js
+++ b/test/utils/buildProxy.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 // Licensed to Elasticsearch B.V under one or more agreements.
diff --git a/test/utils/buildServer.js b/test/utils/buildServer.js
index 45b51ed1c..b3d9794c7 100644
--- a/test/utils/buildServer.js
+++ b/test/utils/buildServer.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*
diff --git a/test/utils/index.js b/test/utils/index.js
index b94e0a487..8452bac25 100644
--- a/test/utils/index.js
+++ b/test/utils/index.js
@@ -1,12 +1,11 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  *
  * The OpenSearch Contributors require contributions made to
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 /*