diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 71d3c9c..76c06df 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,7 +20,7 @@ reported the issue. Please try to include as much information as you can. Detail
 * Anything unusual about your environment or deployment
 
 ## Sign your work
-OpenSearch is an open source product released under the Apache 2.0 license (see either [the Apache site](https://www.apache.org/licenses/LICENSE-2.0) or the [LICENSE.txt file](../LICENSE.txt)).  The Apache 2.0 license allows you to freely use, modify, distribute, and sell your own products that include Apache 2.0 licensed software.
+OpenSearch is an open source product released under the Apache 2.0 license (see either [the Apache site](https://www.apache.org/licenses/LICENSE-2.0) or the [LICENSE.txt file](./LICENSE)).  The Apache 2.0 license allows you to freely use, modify, distribute, and sell your own products that include Apache 2.0 licensed software.
 
 We respect intellectual property rights of others and we want to make sure all incoming contributions are correctly attributed and licensed. A Developer Certificate of Origin (DCO) is a lightweight mechanism to do that.
 
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 19474b6..0f32b9b 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -16,7 +16,7 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Peter Fitzgibbons | [pjfitzgibbons](https://github.com/pjfitzgibbons)   | Amazon      |
 | Simeon Widdis     | [swiddis](https://github.com/swiddis)               | Amazon      |
 | Chen Dai          | [dai-chen](https://github.com/dai-chen)             | Amazon      |
-| Vamsi Manohar     | [vamsi-amazon](https://github.com/vamsi-amazon)     | Amazon      |
+| Vamsi Manohar     | [vamsi-amazon](https://github.com/vamsimanohar)     | Amazon      |
 | Peng Huo          | [penghuo](https://github.com/penghuo)               | Amazon      |
 | Sean Kao          | [seankao-az](https://github.com/seankao-az)         | Amazon      |
 | Anirudha Jadhav   | [anirudha](https://github.com/anirudha)             | Amazon      |
diff --git a/bi-connectors/TableauConnector/tableau_support.md b/bi-connectors/TableauConnector/tableau_support.md
index 57c3be6..3ccf967 100644
--- a/bi-connectors/TableauConnector/tableau_support.md
+++ b/bi-connectors/TableauConnector/tableau_support.md
@@ -7,8 +7,8 @@ Connect an OpenSearch data source to Tableau Desktop via the Tableau Connector t
 ## Prerequisites
 
 * Download and Install [Tableau Desktop](https://www.tableau.com/products/desktop/download) 2020 and higher
-* Install and Configure [OpenSearch](https://docs-beta.opensearch.org/opensearch/install/index/)
-* Download and Install [OpenSearch SQL JDBC driver](../../sql-jdbc/README.md)
+* Install and Configure [OpenSearch](https://opensearch.org/docs/latest/install-and-configure/install-opensearch/index/)
+* Download and Install [OpenSearch SQL JDBC driver](../../README.md)
 * Download Tableau Connector ([opensearch_sql_jdbc.taco](opensearch_sql_jdbc.taco)).
 Click on **Download** option for downloading `opensearch_sql_jdbc.taco` file.
 <img src="img/tableau_download_taco.png" >
diff --git a/docs/tableau.md b/docs/tableau.md
index baa53ec..c17b1f6 100644
--- a/docs/tableau.md
+++ b/docs/tableau.md
@@ -3,7 +3,7 @@
 ## Download and Installation
 
 * Download and install [Tableau Desktop](https://www.tableau.com/en-ca/products/desktop/download).
-* Install and configure [OpenSearch](https://docs-beta.opensearch.org/opensearch/install/index/).
+* Install and configure [OpenSearch](https://opensearch.org/docs/latest/install-and-configure/install-opensearch/index/).
 * Download the [OpenSearch JDBC Driver](../README.md#download-and-installation).
 
 ## Setup
@@ -85,4 +85,4 @@ You will need:
 3. Double click or drag desired fields under **Dimensions**.
 4. Select available visualization under **Show Me**.
 
-![Image of Tableau Graph](img/tableau_graph.PNG)
+![Image of Tableau Graph](img/tableau_graph.png)
diff --git a/release-notes/ODFE-jdbc.release-notes-1.7.0.0.md b/release-notes/ODFE-jdbc.release-notes-1.7.0.0.md
index 07d7ba0..949f74e 100644
--- a/release-notes/ODFE-jdbc.release-notes-1.7.0.0.md
+++ b/release-notes/ODFE-jdbc.release-notes-1.7.0.0.md
@@ -1,3 +1,3 @@
 ## 2020-05-07, Version 1.7.0.0
 ### Changes
-* Feature [#76](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/76): Cursor integration. (issue: [#74](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/74))
+* Feature [#76](https://github.com/amazon-archives/sql-jdbc/pull/76): Cursor integration. (issue: [#74](https://github.com/amazon-archives/sql-jdbc/issues/74))
diff --git a/release-notes/ODFE-jdbc.release-notes-1.8.0.0.md b/release-notes/ODFE-jdbc.release-notes-1.8.0.0.md
index b514816..96b8f44 100644
--- a/release-notes/ODFE-jdbc.release-notes-1.8.0.0.md
+++ b/release-notes/ODFE-jdbc.release-notes-1.8.0.0.md
@@ -1,3 +1,3 @@
 ## 2020-05-18, Version 1.8.0.0 
 ### Maintenance
-* [Adds workflow to upload jar to Maven](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/81):
+* [Adds workflow to upload jar to Maven](https://github.com/amazon-archives/sql-jdbc/pull/81):
diff --git a/release-notes/ODFE-jdbc.release-notes-1.9.0.0.md b/release-notes/ODFE-jdbc.release-notes-1.9.0.0.md
index e2063c8..10de788 100644
--- a/release-notes/ODFE-jdbc.release-notes-1.9.0.0.md
+++ b/release-notes/ODFE-jdbc.release-notes-1.9.0.0.md
@@ -1,4 +1,4 @@
 ## 2020-06-23, Version 1.9.0.0 (Current)
 ### Features
-* Feature [#87](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/87): Elasticsearch 7.8.0 compatibility
-(issue: [#86](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/86))
+* Feature [#87](https://github.com/amazon-archives/sql-jdbc/pull/87): Elasticsearch 7.8.0 compatibility
+(issue: [#86](https://github.com/amazon-archives/sql-jdbc/issues/86))
diff --git a/release-notes/ODFE-jdbc.release-notes-up-to-1.6.1.0.md b/release-notes/ODFE-jdbc.release-notes-up-to-1.6.1.0.md
index f9dec0c..9033f82 100644
--- a/release-notes/ODFE-jdbc.release-notes-up-to-1.6.1.0.md
+++ b/release-notes/ODFE-jdbc.release-notes-up-to-1.6.1.0.md
@@ -1,26 +1,26 @@
 ## 2020-04-29, Version 1.6.1.0
 ### Enhancement
-* Enhancement [#72](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/72): Use default holdability for prepareStatement. (issue: [#63](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/63))
+* Enhancement [#72](https://github.com/amazon-archives/sql-jdbc/pull/72): Use default holdability for prepareStatement. (issue: [#63](https://github.com/amazon-archives/sql-jdbc/issues/63))
 
 ## 2020-03-24, Version 1.6.0.0
 ### Enhancement
-* Enhancement [#49](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/49): Implementation of the execute method in the PreparedStatementImpl class (issue: [#62](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/62))
+* Enhancement [#49](https://github.com/amazon-archives/sql-jdbc/pull/49): Implementation of the execute method in the PreparedStatementImpl class (issue: [#62](https://github.com/amazon-archives/sql-jdbc/issues/62))
 
 ### Bugfix
-* BugFix [#68](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/68): Change the request body encoding to UTF-8 (issues: [#54](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/54), [#66](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/66), [#opendistro for elasticsearch/sql#392](https://github.com/opendistro-for-elasticsearch/sql/issues/392) )
+* BugFix [#68](https://github.com/amazon-archives/sql-jdbc/pull/68): Change the request body encoding to UTF-8 (issues: [#54](https://github.com/amazon-archives/sql-jdbc/issues/54), [#66](https://github.com/amazon-archives/sql-jdbc/issues/66), [#opendistro for elasticsearch/sql#392](https://github.com/opendistro-for-elasticsearch/sql/issues/392) )
 
 ## 2020-1-26, Version 1.4.0
 
 ### Features
 
 #### Documentation
-* Feature [#37](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/37): Tableau documentation
-* Feature [#35](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/35): Add documentation for connecting Tableau with OpenSearch using JDBC Driver
+* Feature [#37](https://github.com/amazon-archives/sql-jdbc/pull/37): Tableau documentation
+* Feature [#35](https://github.com/amazon-archives/sql-jdbc/pull/35): Add documentation for connecting Tableau with OpenSearch using JDBC Driver
 
 ### Bugfixes
-* BugFix [#47](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/47): Result set metadata returns Elasticsearch type (issue: [#43](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/43))
-* BugFix [#45](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/45): Add missing Elasticsearch type : object (issue: [#44](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/43))
-* BugFix [#32](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/32): Added IP type and mapped with JDBC type of varchar
+* BugFix [#47](https://github.com/amazon-archives/sql-jdbc/pull/47): Result set metadata returns Elasticsearch type (issue: [#43](https://github.com/amazon-archives/sql-jdbc/issues/43))
+* BugFix [#45](https://github.com/amazon-archives/sql-jdbc/pull/45): Add missing Elasticsearch type : object (issue: [#44](https://github.com/amazon-archives/sql-jdbc/issues/43))
+* BugFix [#32](https://github.com/amazon-archives/sql-jdbc/pull/32): Added IP type and mapped with JDBC type of varchar
 
 ## 2019-10-29, Version 1.3.0
 
@@ -58,7 +58,7 @@ No update in this release.
 
 ### Notable Changes
 
-* Feature [#4](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/4): Add support for Elasticsearch 6.6
+* Feature [#4](https://github.com/amazon-archives/sql-jdbc/issues/4): Add support for Elasticsearch 6.6
 
 
 ## 2019-03-11, Version 0.7.0
diff --git a/release-notes/opensearch-jdbc-release-notes-1.2.0.0.md b/release-notes/opensearch-jdbc-release-notes-1.2.0.0.md
index 56b6325..52598b8 100644
--- a/release-notes/opensearch-jdbc-release-notes-1.2.0.0.md
+++ b/release-notes/opensearch-jdbc-release-notes-1.2.0.0.md
@@ -12,7 +12,9 @@
 ### Maintenance
 * JDBC package renaming ([#54](https://github.com/opensearch-project/sql/pull/54))
 * Patch CVE and sync versioning ([#44](https://github.com/opensearch-project/sql-jdbc/pull/44))
-* Bump driver version ([#941](https://github.com/opensearch-project/sql/pull/941), [#11](https://github.com/opensearch-project/sql-jdbc/pull/11), [#12](https://github.>* Add JDBC driver jenkins CI workflow ([#15](https://github.com/opensearch-project/sql-jdbc/pull/15), [#45](https://github.com/opensearch-project/sql-jdbc/pull/45), [#>* Update dependency `com.amazonaws:aws-java-sdk-core` to v1.12.1 ([#10](https://github.com/opensearch-project/sql-jdbc/pull/10))
+* Bump driver version ([#941](https://github.com/opensearch-project/sql/pull/941), [#11](https://github.com/opensearch-project/sql-jdbc/pull/11), [#12](https://github.com/opensearch-project/sql-jdbc/pull/12))
+* Add JDBC driver jenkins CI workflow ([#15](https://github.com/opensearch-project/sql-jdbc/pull/15), [#45](https://github.com/opensearch-project/sql-jdbc/pull/45), [#48](https://github.com/opensearch-project/sql-jdbc/pull/48), [#53](https://github.com/opensearch-project/sql-jdbc/pull/53))
+* Update dependency `com.amazonaws:aws-java-sdk-core` to v1.12.1 ([#10](https://github.com/opensearch-project/sql-jdbc/pull/10))
 * Update wiremock and jetty dependencies ([#872](https://github.com/opensearch-project/sql/pull/872), [#46](https://github.com/opensearch-project/sql-jdbc/pull/46))
 * Update version of `jackson-databind` dependency ([#943](https://github.com/opensearch-project/sql/pull/943))
 * Bump JDBC driver's dependency version ([#735](https://github.com/opensearch-project/sql/pull/735))
diff --git a/release-notes/opensearch-jdbc-release-notes-1.3.0.0.md b/release-notes/opensearch-jdbc-release-notes-1.3.0.0.md
index 9ede5de..44a6808 100644
--- a/release-notes/opensearch-jdbc-release-notes-1.3.0.0.md
+++ b/release-notes/opensearch-jdbc-release-notes-1.3.0.0.md
@@ -1,6 +1,6 @@
 ## 2023-05-10, Version 1.3.0.0
 ### Features
-* Adding Struct Support ([#73]((https://github.com/opensearch-project/sql-jdbc/pull/73))
+* Adding Struct Support ([#73](https://github.com/opensearch-project/sql-jdbc/pull/73))
 
 ### Enhancements
 
diff --git a/src/main/java/org/opensearch/jdbc/ResultSetImpl.java b/src/main/java/org/opensearch/jdbc/ResultSetImpl.java
index e34a42d..173ae1b 100644
--- a/src/main/java/org/opensearch/jdbc/ResultSetImpl.java
+++ b/src/main/java/org/opensearch/jdbc/ResultSetImpl.java
@@ -132,7 +132,7 @@ public boolean next() throws SQLException {
     }
 
     /**
-     * TODO: Refactor as suggested https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/76#discussion_r421571383
+     * TODO: Refactor as suggested https://github.com/amazon-archives/sql-jdbc/pull/76#discussion_r421571383
      *
      * This method has side effects. It creates a new Cursor to hold rows from new pages.
      * Ideally fetching next set of rows using cursorId should be delegated to Cursor.