diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8e6bf3a71c..77884857899 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,3 @@
-# Change Log for Amazon Corretto JDK
+# Change Log for Amazon Corretto 23
 
-The following sections describe the changes for each release of Amazon Corretto JDK.
+The following sections describe the changes for each release of Amazon Corretto 23.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b6961cadc98..fe06d7e9a56 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,7 +11,7 @@ information to effectively respond to your bug report or contribution.
 
 We welcome you to use the GitHub issue tracker to report bugs or suggest features.
 
-When filing an issue, please check [existing open](https://github.com/corretto/corretto-jdk/issues), or [recently closed](https://github.com/corretto/corretto-jdk/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
+When filing an issue, please check [existing open](https://github.com/corretto/corretto-23/issues), or [recently closed](https://github.com/corretto/corretto-23/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
 reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
 
 * A reproducible test case or series of steps
@@ -41,7 +41,7 @@ GitHub provides additional document on [forking a repository](https://help.githu
 
 
 ## Finding contributions to work on
-Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/corretto/corretto-jdk/labels/help%20wanted) issues is a great place to start.
+Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/corretto/corretto-23/labels/help%20wanted) issues is a great place to start.
 
 
 ## Code of Conduct
@@ -56,6 +56,6 @@ If you discover a potential security issue in this project we ask that you notif
 
 ## Licensing
 
-See the [LICENSE](https://github.com/corretto/corretto-jdk/blob/develop/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
+See the [LICENSE](https://github.com/corretto/corretto-23/blob/develop/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
 We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.
\ No newline at end of file
diff --git a/README.md b/README.md
index c3671f5ba8b..68841e76672 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Corretto JDK
+## Corretto 23
 
 Amazon Corretto is a no-cost, multiplatform,
 production-ready distribution of the Open Java Development Kit (OpenJDK).
@@ -6,7 +6,7 @@ Corretto is used internally at Amazon for production services.
 With Corretto, you can develop and run Java applications
 on operating systems such as Linux, Windows, and macOS.
 
-This repository is used to track [OpenJDK upstream tip](https://github.com/openjdk/jdk).
+This repository is used to track [OpenJDK 23](https://github.com/openjdk/jdk/tree/jdk23).
 Please look at the branches section for more information on Feature Releases.
 
 Documentation is available at [https://docs.aws.amazon.com/corretto](https://docs.aws.amazon.com/corretto).
@@ -18,10 +18,7 @@ Please read these files: "LICENSE", "ADDITIONAL_LICENSE_INFO", "ASSEMBLY_EXCEPTI
 ### Branches
 
 _develop_
-: The default branch. The branch that consumes development and patches to upstream jdk. Corretto builds are generated from this branch.
-
-_upstream-jdk_
-: The branch is similar to master at [openjdk/jdk](https://github.com/openjdk/jdk). This branch merges into develop.
+: The default branch. The branch that consumes development and patches to upstream [openjdk/jdk:jdk23](https://github.com/openjdk/jdk/tree/jdk23). Corretto builds are generated from this branch.
 
 ### OpenJDK Readme
 ```
diff --git a/build.gradle b/build.gradle
index 6399e45e064..74ada8ea10e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,7 +51,7 @@ allprojects {
         buildRoot = file("$buildDir/buildRoot")
         distributionDir = file("$buildDir/distributions")
         packageInfo = [
-                url       : "https://github.com/corretto/corretto-jdk",
+                url       : "https://github.com/corretto/corretto-${project.version.major}",
                 vendor    : 'Amazon',
                 packager  : 'Amazon',
                 description  : 'Amazon Corretto\'s packaging of the runtime core elements of the OpenJDK code.',
@@ -91,8 +91,8 @@ allprojects {
                 '--with-jvm-features=zgc',
                 "--with-version-build=${project.version.build}",
                 '--with-version-pre=',
-                "--with-vendor-bug-url=https://github.com/corretto/corretto-jdk/issues/",
-                "--with-vendor-vm-bug-url=https://github.com/corretto/corretto-jdk/issues/",
+                "--with-vendor-bug-url=https://github.com/corretto/corretto-${project.version.major}/issues/",
+                "--with-vendor-vm-bug-url=https://github.com/corretto/corretto-${project.version.major}/issues/",
                 '--with-vendor-name=Amazon.com Inc.',
                 '--with-vendor-url=https://aws.amazon.com/corretto/',
                 "--with-vendor-version-string=Corretto-${project.version.full}"
diff --git a/settings.gradle b/settings.gradle
index dd51067ddcb..bfdd16232f9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-rootProject.name = 'corretto-jdk'
+rootProject.name = 'corretto-23'
 
 import org.apache.tools.ant.taskdefs.condition.Os