diff --git a/README.md b/README.md
index f4089a6440..5e24c5116a 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Temporal:
 
 - [Temporal docs](https://docs.temporal.io/)
 - [Install Temporal Server](https://docs.temporal.io/docs/server/quick-install)
-- [Temporal CLI](https://docs.temporal.io/docs/devtools/tctl/)
+- [Temporal CLI](https://docs.temporal.io/cli/)
 
 ## Supported Java runtimes
 
diff --git a/temporal-remote-data-encoder/README.md b/temporal-remote-data-encoder/README.md
index 2e6f34a656..24a8dc6c44 100644
--- a/temporal-remote-data-encoder/README.md
+++ b/temporal-remote-data-encoder/README.md
@@ -3,7 +3,7 @@
 ## What problems does Remote Data Encoder (RDE) solves?
 
 - Allows reuse of complicated encryption logic written once between different languages
-- Allows `tctl` to encode payloads for `tctl workflow start` and Temporal WebUI to decode encrypted payloads
+- Allows `Temporal CLI` to encode payloads for `temporal workflow start` and Temporal WebUI to decode encrypted payloads
 - Allows the creation of a service that has an access to encryption keys for performing the encryption/decryption instead of a developer workstation or service accessing the keys directly.
 
 ## How does RDE work?
@@ -21,7 +21,7 @@ This module provides two reference implementations useful for creation of RDE se
 ### RDE Codec
 
 Can be used as one of the codecs in `io.temporal.common.converter.CodecDataConverter` configured on `WorkflowClientOptions#dataConverter` to use Remote Data Encoder Server for payloads encoding.
-Please keep in mind that this is an optional component. If you use RDE Server to decode data for tctl or WebUI purposes, you don't have to use it for encoding/decoding payloads on Workflow Client or Workers side. They may perform the encoding locally.
+Please keep in mind that this is an optional component. If you use RDE Server to decode data for Temporal CLI or WebUI purposes, you don't have to use it for encoding/decoding payloads on Workflow Client or Workers side. They may perform the encoding locally.
 
 This module provides a reference implementation of RDE codec that should be used by users as a base for their own RDE codecs: `io.temporal.payload.codec.AbstractRemoteDataEncoderCodec` by implementing a POST method using the HTTP client of their choice.
 This module may supply some standard implementations for popular HTTP Clients, including `io.temporal.payload.codec.OkHttpRemoteDataEncoderCodec` for [OkHttpClient](https://square.github.io/okhttp/).
diff --git a/temporal-sdk/src/main/java/io/temporal/common/WorkflowExecutionHistory.java b/temporal-sdk/src/main/java/io/temporal/common/WorkflowExecutionHistory.java
index db728f66b7..d052f60056 100644
--- a/temporal-sdk/src/main/java/io/temporal/common/WorkflowExecutionHistory.java
+++ b/temporal-sdk/src/main/java/io/temporal/common/WorkflowExecutionHistory.java
@@ -36,7 +36,8 @@ public WorkflowExecutionHistory(History history, String workflowId) {
   }
 
   /**
-   * @param serialized history json (tctl format) to import and deserialize into {@link History}
+   * @param serialized history json (temporal CLI format) to import and deserialize into {@link
+   *     History}
    * @return WorkflowExecutionHistory
    */
   public static WorkflowExecutionHistory fromJson(String serialized) {
@@ -56,7 +57,8 @@ public static WorkflowExecutionHistory fromJson(String serialized) {
   }
 
   /**
-   * @param serialized history json (tctl format) to import and deserialize into {@link History}
+   * @param serialized history json (temporal CLI format) to import and deserialize into {@link
+   *     History}
    * @param workflowId workflow id to be used in {@link #getWorkflowExecution()}
    * @return WorkflowExecutionHistory
    */
diff --git a/temporal-sdk/src/main/java/io/temporal/common/converter/DefaultDataConverter.java b/temporal-sdk/src/main/java/io/temporal/common/converter/DefaultDataConverter.java
index d2dc876079..f05c3f95a9 100644
--- a/temporal-sdk/src/main/java/io/temporal/common/converter/DefaultDataConverter.java
+++ b/temporal-sdk/src/main/java/io/temporal/common/converter/DefaultDataConverter.java
@@ -28,7 +28,7 @@ public class DefaultDataConverter extends PayloadAndFailureDataConverter {
    *
    * <p>This data converter is also always used (regardless of whether or not users have supplied
    * their own converter) to perform serialization of values essential for functionality of Temporal
-   * SDK, Server, tctl or WebUI:
+   * SDK, Server, Temporal CLI or WebUI:
    *
    * <ul>
    *   <li>Local Activity, Version, MutableSideEffect Markers metadata like id, time, name
diff --git a/temporal-sdk/src/main/java/io/temporal/internal/common/HistoryJsonUtils.java b/temporal-sdk/src/main/java/io/temporal/internal/common/HistoryJsonUtils.java
index 64ae4c17f7..c7a9c6cae0 100644
--- a/temporal-sdk/src/main/java/io/temporal/internal/common/HistoryJsonUtils.java
+++ b/temporal-sdk/src/main/java/io/temporal/internal/common/HistoryJsonUtils.java
@@ -9,7 +9,7 @@
 /**
  * Helper methods supporting transformation of History's "Proto Json" compatible format, which is
  * supported by {@link com.google.protobuf.util.JsonFormat} to the format of Temporal history
- * supported by tctl and back.
+ * supported by Temporal CLI and back.
  */
 public final class HistoryJsonUtils {
   private static final Configuration JSON_PATH_CONFIGURATION =
diff --git a/temporal-testing/src/main/java/io/temporal/testing/TestEnvironmentOptions.java b/temporal-testing/src/main/java/io/temporal/testing/TestEnvironmentOptions.java
index f3bd8872ea..d1eb4e2fc7 100644
--- a/temporal-testing/src/main/java/io/temporal/testing/TestEnvironmentOptions.java
+++ b/temporal-testing/src/main/java/io/temporal/testing/TestEnvironmentOptions.java
@@ -163,8 +163,8 @@ public Builder setUseTimeskipping(boolean useTimeskipping) {
      * @param type search attribute type
      * @return {@code this}
      * @see <a
-     *     href="https://docs.temporal.io/docs/tctl/how-to-add-a-custom-search-attribute-to-a-cluster-using-tctl">Add
-     *     a Custom Search Attribute Using tctl</a>
+     *     href="https://docs.temporal.io/self-hosted-guide/visibility#create-custom-search-attributes">
+     *     How to create custom Search Attributes</a>
      */
     public Builder registerSearchAttribute(String name, IndexedValueType type) {
       this.searchAttributes.put(name, type);
diff --git a/temporal-testing/src/main/java/io/temporal/testing/TestWorkflowEnvironment.java b/temporal-testing/src/main/java/io/temporal/testing/TestWorkflowEnvironment.java
index e1a8ec9509..b2dadcf059 100644
--- a/temporal-testing/src/main/java/io/temporal/testing/TestWorkflowEnvironment.java
+++ b/temporal-testing/src/main/java/io/temporal/testing/TestWorkflowEnvironment.java
@@ -135,8 +135,8 @@ static TestWorkflowEnvironment newInstance(TestEnvironmentOptions options) {
    * @param type Search Attribute type to be used for an elastic search index
    * @return {@code true} if the search attribute was registered, false if it was registered already
    * @see <a
-   *     href="https://docs.temporal.io/docs/tctl/how-to-add-a-custom-search-attribute-to-a-cluster-using-tctl">Add
-   *     a Custom Search Attribute Using tctl</a>
+   *     href="https://docs.temporal.io/self-hosted-guide/visibility#create-custom-search-attributes">
+   *     How to create custom Search Attributes</a>
    */
   boolean registerSearchAttribute(String name, IndexedValueType type);
 
diff --git a/temporal-testing/src/main/java/io/temporal/testing/TestWorkflowExtension.java b/temporal-testing/src/main/java/io/temporal/testing/TestWorkflowExtension.java
index deba11b4ed..65532e55e4 100644
--- a/temporal-testing/src/main/java/io/temporal/testing/TestWorkflowExtension.java
+++ b/temporal-testing/src/main/java/io/temporal/testing/TestWorkflowExtension.java
@@ -503,8 +503,8 @@ public Builder setUseTimeskipping(boolean useTimeskipping) {
      * @param type search attribute type
      * @return {@code this}
      * @see <a
-     *     href="https://docs.temporal.io/docs/tctl/how-to-add-a-custom-search-attribute-to-a-cluster-using-tctl">Add
-     *     a Custom Search Attribute Using tctl</a>
+     *     href="https://docs.temporal.io/self-hosted-guide/visibility#create-custom-search-attributes">
+     *     How to create custom Search Attributes</a>
      */
     public Builder registerSearchAttribute(String name, IndexedValueType type) {
       this.searchAttributes.put(name, type);
diff --git a/temporal-testing/src/main/java/io/temporal/testing/TestWorkflowRule.java b/temporal-testing/src/main/java/io/temporal/testing/TestWorkflowRule.java
index 47a91453af..0325e999ff 100644
--- a/temporal-testing/src/main/java/io/temporal/testing/TestWorkflowRule.java
+++ b/temporal-testing/src/main/java/io/temporal/testing/TestWorkflowRule.java
@@ -336,8 +336,8 @@ public Builder setDoNotSetupNexusEndpoint(boolean doNotSetupNexusEndpoint) {
      * @param type search attribute type
      * @return {@code this}
      * @see <a
-     *     href="https://docs.temporal.io/docs/tctl/how-to-add-a-custom-search-attribute-to-a-cluster-using-tctl">Add
-     *     a Custom Search Attribute Using tctl</a>
+     *     href="https://docs.temporal.io/self-hosted-guide/visibility#create-custom-search-attributes">
+     *     How to create custom Search Attributes</a>
      */
     public Builder registerSearchAttribute(String name, IndexedValueType type) {
       this.searchAttributes.put(name, type);
@@ -350,8 +350,8 @@ public Builder registerSearchAttribute(String name, IndexedValueType type) {
      * @param key key to register
      * @return {@code this}
      * @see <a
-     *     href="https://docs.temporal.io/docs/tctl/how-to-add-a-custom-search-attribute-to-a-cluster-using-tctl">Add
-     *     a Custom Search Attribute Using tctl</a>
+     *     href="https://docs.temporal.io/self-hosted-guide/visibility#create-custom-search-attributes">
+     *     How to create custom Search Attributes</a>
      */
     public Builder registerSearchAttribute(SearchAttributeKey<?> key) {
       return this.registerSearchAttribute(key.getName(), key.getValueType());