diff --git a/.github/vale/styles/Klaw/branding-warning-temp.yml b/.github/vale/styles/Klaw/branding-warning-temp.yml
index f7d40144..96f42708 100644
--- a/.github/vale/styles/Klaw/branding-warning-temp.yml
+++ b/.github/vale/styles/Klaw/branding-warning-temp.yml
@@ -7,6 +7,5 @@ ignorecase: true
 swap:
   "(?<!Apache )kafka": Apache Kafka
   "(?i)api": API
-  "(?i)kafka connect": Kafka Connect
   "(?i)klaw core": Klaw Core
   "(?i)klaw": Klaw
\ No newline at end of file
diff --git a/.github/vale/styles/Klaw/branding.yml b/.github/vale/styles/Klaw/branding.yml
index 6865eb7d..8267b865 100644
--- a/.github/vale/styles/Klaw/branding.yml
+++ b/.github/vale/styles/Klaw/branding.yml
@@ -24,3 +24,4 @@ swap:
   "type[ -]?scripts?": TypeScript
   "(?i)ssl": SSL
   "(?<!Klaw )cluster api": Klaw Cluster API
+  "(?i)kafka[ -]?connect": Kafka Connect
\ No newline at end of file
diff --git a/docs/HowTo/clusterconnectivity/aiven-kafka-connect-cluster-ssl-protocol.md b/docs/HowTo/clusterconnectivity/aiven-kafka-connect-cluster-ssl-protocol.md
index 72c04597..fd43a265 100644
--- a/docs/HowTo/clusterconnectivity/aiven-kafka-connect-cluster-ssl-protocol.md
+++ b/docs/HowTo/clusterconnectivity/aiven-kafka-connect-cluster-ssl-protocol.md
@@ -28,7 +28,7 @@ Kafka Connect service with Klaw using SSL protocol:
 
 3. On the **Add Kafka cluster** page, enter the following details:
 
-   - **Cluster Type:** Select **KafkaConnect** from the drop-down list
+   - **Cluster Type:** Select **Kafka Connect** from the drop-down list
    - **Cluster Name:** Provide a name for the cluster\*
    - **Protocol:** Select SSL protocol for your cluster
    - **Kafka Flavor:** Select Aiven for Apache Kafka® as the flavor
diff --git a/docs/HowTo/environments.md b/docs/HowTo/environments.md
index 68b2d544..8c267499 100644
--- a/docs/HowTo/environments.md
+++ b/docs/HowTo/environments.md
@@ -64,7 +64,7 @@ Select **Save** to add a Schema Registry environment.
 
 ### Add Kafka Connect environment
 
-To add a **KafkaConnect environment**, enter the following details in the **Add KafkaConnect Environment** screen:
+To add a **Kafka Connect environment**, enter the following details in the **Add Kafka Connect Environment** screen:
 
 - **Environment name**: Choose an environment from the
   available dropdown list.
@@ -72,7 +72,7 @@ To add a **KafkaConnect environment**, enter the following details in the **Add
   associate with this environment from the dropdown list.
 - **Tenant**: Set the tenant to default.
 
-- Select **Save** to add a new KafkaConnect environment.
+- Select **Save** to add a new Kafka Connect environment.
 
 ![image](../../static/images/environments/NewEnvironment.png)
 
diff --git a/docs/HowTo/kafka-cluster-migration/tenant-config.md b/docs/HowTo/kafka-cluster-migration/tenant-config.md
index d0caa1ba..6592e3f4 100644
--- a/docs/HowTo/kafka-cluster-migration/tenant-config.md
+++ b/docs/HowTo/kafka-cluster-migration/tenant-config.md
@@ -36,9 +36,9 @@ You can configure the following in a tenant:
 
 - Base sync environment Kafka Connector
 
-  This is the base Kafka connect environment in a hierarchy of
+  This is the base Kafka Connect environment in a hierarchy of
   environments. Make sure this environment already exists under
-  Environments (Kafka connect).
+  Environments (Kafka Connect).
 
       Field: baseSyncKafkaConnectCluster
 
@@ -46,7 +46,7 @@ You can configure the following in a tenant:
 
   Define a set of environments in order to promote a
   Kafka connector. Ex: \[\"DEV\", \"TST\"\]. Make sure this
-  environment already exists under Environments (Kafka connect)
+  environment already exists under Environments (Kafka Connect)
 
       Field: orderOfConnectorsPromotionEnvsList