diff --git a/airbyte-integrations/connector-templates/destination-java/README.md.hbs b/airbyte-integrations/connector-templates/destination-java/README.md.hbs
index a84b8749dbec..681d38134a99 100644
--- a/airbyte-integrations/connector-templates/destination-java/README.md.hbs
+++ b/airbyte-integrations/connector-templates/destination-java/README.md.hbs
@@ -1,6 +1,6 @@
-# Destination {{titleCase name}}
+# Destination {{capitalCase name}}
 
-This is the repository for the {{titleCase name}} destination connector in Java.
+This is the repository for the {{capitalCase name}} destination connector in Java.
 For information about how to use this connector within Airbyte, see [the User Documentation](https://docs.airbyte.io/integrations/destinations/{{dashCase name}}).
 
 ## Local development
diff --git a/airbyte-integrations/connector-templates/destination-java/definition.yaml.hbs b/airbyte-integrations/connector-templates/destination-java/definition.yaml.hbs
index f318657df630..6c28efacc084 100644
--- a/airbyte-integrations/connector-templates/destination-java/definition.yaml.hbs
+++ b/airbyte-integrations/connector-templates/destination-java/definition.yaml.hbs
@@ -1,5 +1,5 @@
 - destinationDefinitionId: {{uuid}}
-  name: {{titleCase name}}
+  name: {{capitalCase name}}
   dockerRepository: airbyte/destination-{{dashCase name}}
   dockerImageTag: 0.1.0
   documentationUrl: https://docs.airbyte.io/integrations/destinations/{{dashCase name}}
\ No newline at end of file
diff --git a/airbyte-integrations/connector-templates/destination-java/doc.md.hbs b/airbyte-integrations/connector-templates/destination-java/doc.md.hbs
index f281d9f64543..85a8697b44a6 100644
--- a/airbyte-integrations/connector-templates/destination-java/doc.md.hbs
+++ b/airbyte-integrations/connector-templates/destination-java/doc.md.hbs
@@ -1,4 +1,4 @@
-# {{titleCase name}}
+# {{capitalCase name}}
 
 TODO: update this doc
 
diff --git a/airbyte-integrations/connector-templates/destination-python/README.md b/airbyte-integrations/connector-templates/destination-python/README.md
index a44aec8e0938..d26ea312a9de 100644
--- a/airbyte-integrations/connector-templates/destination-python/README.md
+++ b/airbyte-integrations/connector-templates/destination-python/README.md
@@ -1,6 +1,6 @@
-# {{titleCase name}} Destination
+# {{capitalCase name}} Destination
 
-This is the repository for the {{titleCase name}} destination connector, written in Python.
+This is the repository for the {{capitalCase name}} destination connector, written in Python.
 For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/destinations/{{dashCase name}}).
 
 ## Local development
diff --git a/airbyte-integrations/connector-templates/destination-python/destination_{{snakeCase name}}/spec.json b/airbyte-integrations/connector-templates/destination-python/destination_{{snakeCase name}}/spec.json
index 5d5c32aab591..9a8e4857a08b 100644
--- a/airbyte-integrations/connector-templates/destination-python/destination_{{snakeCase name}}/spec.json	
+++ b/airbyte-integrations/connector-templates/destination-python/destination_{{snakeCase name}}/spec.json	
@@ -8,7 +8,7 @@
   "supportsNormalization": false,
   "connectionSpecification": {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "Destination {{titleCase name}}",
+    "title": "Destination {{capitalCase name}}",
     "type": "object",
     "required": ["TODO -- fix me!"],
     "additionalProperties": false,
diff --git a/airbyte-integrations/connector-templates/destination-python/setup.py b/airbyte-integrations/connector-templates/destination-python/setup.py
index 59d76f68028d..95d9de4b70ba 100644
--- a/airbyte-integrations/connector-templates/destination-python/setup.py
+++ b/airbyte-integrations/connector-templates/destination-python/setup.py
@@ -15,7 +15,7 @@
 
 setup(
     name="destination_{{snakeCase name}}",
-    description="Destination implementation for {{titleCase name}}.",
+    description="Destination implementation for {{capitalCase name}}.",
     author="Airbyte",
     author_email="contact@airbyte.io",
     packages=find_packages(),
diff --git a/airbyte-integrations/connector-templates/generator/package-lock.json b/airbyte-integrations/connector-templates/generator/package-lock.json
index 8cc1782b4772..da56d7a34659 100644
--- a/airbyte-integrations/connector-templates/generator/package-lock.json
+++ b/airbyte-integrations/connector-templates/generator/package-lock.json
@@ -8,6 +8,7 @@
       "name": "airbyte-connector-generator",
       "version": "0.1.0",
       "devDependencies": {
+        "capital-case": "^1.0.4",
         "handlebars": "^4.7.7",
         "plop": "^3.0.5",
         "set-value": ">=4.0.1",
diff --git a/airbyte-integrations/connector-templates/generator/package.json b/airbyte-integrations/connector-templates/generator/package.json
index 641d297034f0..0a4ae5ac873f 100644
--- a/airbyte-integrations/connector-templates/generator/package.json
+++ b/airbyte-integrations/connector-templates/generator/package.json
@@ -6,6 +6,7 @@
     "generate": "plop"
   },
   "devDependencies": {
+    "capital-case": "^1.0.4",
     "handlebars": "^4.7.7",
     "plop": "^3.0.5",
     "set-value": ">=4.0.1",
diff --git a/airbyte-integrations/connector-templates/generator/plopfile.js b/airbyte-integrations/connector-templates/generator/plopfile.js
index fb0f3b6fbd20..d2b0ae02a14c 100644
--- a/airbyte-integrations/connector-templates/generator/plopfile.js
+++ b/airbyte-integrations/connector-templates/generator/plopfile.js
@@ -1,6 +1,7 @@
 'use strict';
 const path = require('path');
 const uuid = require('uuid');
+const capitalCase = require('capital-case');
 
 const getSuccessMessage = function(connectorName, outputPath, additionalMessage){
     return `
@@ -43,6 +44,10 @@ module.exports = function (plop) {
   const javaDestinationOutputRoot = `${outputDir}/destination-{{dashCase name}}`;
   const pythonDestinationOutputRoot = `${outputDir}/destination-{{dashCase name}}`;
 
+  plop.setHelper('capitalCase', function(name) {
+    return capitalCase.capitalCase(name);
+  });
+
   plop.setActionType('emitSuccess', function(answers, config, plopApi){
       console.log(getSuccessMessage(answers.name, plopApi.renderString(config.outputPath, answers), config.message));
   });
diff --git a/airbyte-integrations/connector-templates/source-generic/README.md.hbs b/airbyte-integrations/connector-templates/source-generic/README.md.hbs
index da9bb8bb71d2..65428c65a33b 100644
--- a/airbyte-integrations/connector-templates/source-generic/README.md.hbs
+++ b/airbyte-integrations/connector-templates/source-generic/README.md.hbs
@@ -1,6 +1,6 @@
-# {{titleCase name}} Source 
+# {{capitalCase name}} Source
 
-This is the repository for the {{titleCase name}} source connector.
+This is the repository for the {{capitalCase name}} source connector.
 For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/{{dashCase name}}).
 
 ## Local development
diff --git a/airbyte-integrations/connector-templates/source-java-jdbc/README.md b/airbyte-integrations/connector-templates/source-java-jdbc/README.md
index d141f3b4a494..064e7f934d9f 100644
--- a/airbyte-integrations/connector-templates/source-java-jdbc/README.md
+++ b/airbyte-integrations/connector-templates/source-java-jdbc/README.md
@@ -1,6 +1,6 @@
-# Source {{titleCase name}}
+# Source {{capitalCase name}}
 
-This is the repository for the {{titleCase name}} source connector in Java.
+This is the repository for the {{capitalCase name}} source connector in Java.
 For information about how to use this connector within Airbyte, see [the User Documentation](https://docs.airbyte.io/integrations/sources/{{dashCase name}}).
 
 ## Local development
diff --git a/airbyte-integrations/connector-templates/source-python-http-api/README.md.hbs b/airbyte-integrations/connector-templates/source-python-http-api/README.md.hbs
index 285df113f90a..16e98927f20b 100644
--- a/airbyte-integrations/connector-templates/source-python-http-api/README.md.hbs
+++ b/airbyte-integrations/connector-templates/source-python-http-api/README.md.hbs
@@ -1,6 +1,6 @@
-# {{titleCase name}} Source
+# {{capitalCase name}} Source
 
-This is the repository for the {{titleCase name}} source connector, written in Python.
+This is the repository for the {{capitalCase name}} source connector, written in Python.
 For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/{{dashCase name}}).
 
 ## Local development
diff --git a/airbyte-integrations/connector-templates/source-python-http-api/setup.py.hbs b/airbyte-integrations/connector-templates/source-python-http-api/setup.py.hbs
index f06014f4c248..33db636d5de6 100644
--- a/airbyte-integrations/connector-templates/source-python-http-api/setup.py.hbs
+++ b/airbyte-integrations/connector-templates/source-python-http-api/setup.py.hbs
@@ -17,7 +17,7 @@ TEST_REQUIREMENTS = [
 
 setup(
     name="source_{{snakeCase name}}",
-    description="Source implementation for {{titleCase name}}.",
+    description="Source implementation for {{capitalCase name}}.",
     author="Airbyte",
     author_email="contact@airbyte.io",
     packages=find_packages(),
diff --git a/airbyte-integrations/connector-templates/source-python-http-api/source_{{snakeCase name}}/spec.json.hbs b/airbyte-integrations/connector-templates/source-python-http-api/source_{{snakeCase name}}/spec.json.hbs
index a0ad81e0a3c9..6b8f5a28ab3b 100644
--- a/airbyte-integrations/connector-templates/source-python-http-api/source_{{snakeCase name}}/spec.json.hbs	
+++ b/airbyte-integrations/connector-templates/source-python-http-api/source_{{snakeCase name}}/spec.json.hbs	
@@ -2,7 +2,7 @@
   "documentationUrl": "https://docsurl.com",
   "connectionSpecification": {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "{{titleCase name}} Spec",
+    "title": "{{capitalCase name}} Spec",
     "type": "object",
     "required": ["TODO"],
     "additionalProperties": false,
diff --git a/airbyte-integrations/connector-templates/source-python/README.md.hbs b/airbyte-integrations/connector-templates/source-python/README.md.hbs
index 749ddbc44021..245e61992e59 100644
--- a/airbyte-integrations/connector-templates/source-python/README.md.hbs
+++ b/airbyte-integrations/connector-templates/source-python/README.md.hbs
@@ -1,6 +1,6 @@
-# {{titleCase name}} Source
+# {{capitalCase name}} Source
 
-This is the repository for the {{titleCase name}} source connector, written in Python.
+This is the repository for the {{capitalCase name}} source connector, written in Python.
 For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/{{dashCase name}}).
 
 ## Local development
diff --git a/airbyte-integrations/connector-templates/source-python/setup.py.hbs b/airbyte-integrations/connector-templates/source-python/setup.py.hbs
index 022c56b1b57d..8336ec0f2ee9 100644
--- a/airbyte-integrations/connector-templates/source-python/setup.py.hbs
+++ b/airbyte-integrations/connector-templates/source-python/setup.py.hbs
@@ -16,7 +16,7 @@ TEST_REQUIREMENTS = [
 
 setup(
     name="source_{{snakeCase name}}",
-    description="Source implementation for {{titleCase name}}.",
+    description="Source implementation for {{capitalCase name}}.",
     author="Airbyte",
     author_email="contact@airbyte.io",
     packages=find_packages(),
diff --git a/airbyte-integrations/connector-templates/source-python/source_{{snakeCase name}}/spec.json.hbs b/airbyte-integrations/connector-templates/source-python/source_{{snakeCase name}}/spec.json.hbs
index 7d0c011bcbdc..5be21867a124 100644
--- a/airbyte-integrations/connector-templates/source-python/source_{{snakeCase name}}/spec.json.hbs	
+++ b/airbyte-integrations/connector-templates/source-python/source_{{snakeCase name}}/spec.json.hbs	
@@ -2,7 +2,7 @@
   "documentationUrl": "https://docsurl.com",
   "connectionSpecification": {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "{{titleCase name}} Spec",
+    "title": "{{capitalCase name}} Spec",
     "type": "object",
     "required": ["fix-me"],
     "additionalProperties": false,
diff --git a/airbyte-integrations/connector-templates/source-singer/README.md.hbs b/airbyte-integrations/connector-templates/source-singer/README.md.hbs
index b6b654f58465..5f41d0b567a1 100644
--- a/airbyte-integrations/connector-templates/source-singer/README.md.hbs
+++ b/airbyte-integrations/connector-templates/source-singer/README.md.hbs
@@ -1,6 +1,6 @@
-# Source {{titleCase name}} Singer
+# Source {{capitalCase name}} Singer
 
-This is the repository for the {{titleCase name}} source connector, based on a Singer tap.
+This is the repository for the {{capitalCase name}} source connector, based on a Singer tap.
 For information about how to use this connector within Airbyte, see [the User Documentation](https://docs.airbyte.io/integrations/sources/{{dashCase name}}).
 
 ## Local development
diff --git a/airbyte-integrations/connector-templates/source-singer/setup.py.hbs b/airbyte-integrations/connector-templates/source-singer/setup.py.hbs
index 991e888431c5..a621d517c4aa 100644
--- a/airbyte-integrations/connector-templates/source-singer/setup.py.hbs
+++ b/airbyte-integrations/connector-templates/source-singer/setup.py.hbs
@@ -17,7 +17,7 @@ TEST_REQUIREMENTS = [
 
 setup(
     name="source_{{snakeCase name}}_singer",
-    description="Source implementation for {{titleCase name}}, built on the Singer tap implementation.",
+    description="Source implementation for {{capitalCase name}}, built on the Singer tap implementation.",
     author="Airbyte",
     author_email="contact@airbyte.io",
     packages=find_packages(),
diff --git a/airbyte-integrations/connector-templates/source-singer/source_{{snakeCase name}}_singer/spec.json.hbs b/airbyte-integrations/connector-templates/source-singer/source_{{snakeCase name}}_singer/spec.json.hbs
index e9db2347fe63..cb0cbb12a177 100644
--- a/airbyte-integrations/connector-templates/source-singer/source_{{snakeCase name}}_singer/spec.json.hbs	
+++ b/airbyte-integrations/connector-templates/source-singer/source_{{snakeCase name}}_singer/spec.json.hbs	
@@ -2,7 +2,7 @@
   "documentationUrl": "https://docs.airbyte.io/integrations/sources/{{snakeCase name}}",
   "connectionSpecification": {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "Source {{titleCase name}} Singer Spec",
+    "title": "Source {{capitalCase name}} Singer Spec",
     "type": "object",
     "required": ["TODO"],
     "additionalProperties": true,
diff --git a/airbyte-integrations/connectors/destination-scaffold-destination-python/README.md b/airbyte-integrations/connectors/destination-scaffold-destination-python/README.md
index 650159131389..f78b2e13224c 100644
--- a/airbyte-integrations/connectors/destination-scaffold-destination-python/README.md
+++ b/airbyte-integrations/connectors/destination-scaffold-destination-python/README.md
@@ -1,6 +1,6 @@
-# Scaffold-Destination-Python Destination
+# Scaffold Destination Python Destination
 
-This is the repository for the Scaffold-Destination-Python destination connector, written in Python.
+This is the repository for the Scaffold Destination Python destination connector, written in Python.
 For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/destinations/scaffold-destination-python).
 
 ## Local development
diff --git a/airbyte-integrations/connectors/destination-scaffold-destination-python/destination_scaffold_destination_python/spec.json b/airbyte-integrations/connectors/destination-scaffold-destination-python/destination_scaffold_destination_python/spec.json
index 1c76c93511fc..aba800f419e6 100644
--- a/airbyte-integrations/connectors/destination-scaffold-destination-python/destination_scaffold_destination_python/spec.json
+++ b/airbyte-integrations/connectors/destination-scaffold-destination-python/destination_scaffold_destination_python/spec.json
@@ -8,7 +8,7 @@
   "supportsNormalization": false,
   "connectionSpecification": {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "Destination Scaffold-Destination-Python",
+    "title": "Destination Scaffold Destination Python",
     "type": "object",
     "required": ["TODO -- fix me!"],
     "additionalProperties": false,
diff --git a/airbyte-integrations/connectors/destination-scaffold-destination-python/setup.py b/airbyte-integrations/connectors/destination-scaffold-destination-python/setup.py
index 1d1ff9db48d7..b51d89f7f091 100644
--- a/airbyte-integrations/connectors/destination-scaffold-destination-python/setup.py
+++ b/airbyte-integrations/connectors/destination-scaffold-destination-python/setup.py
@@ -15,7 +15,7 @@
 
 setup(
     name="destination_scaffold_destination_python",
-    description="Destination implementation for Scaffold-Destination-Python.",
+    description="Destination implementation for Scaffold Destination Python.",
     author="Airbyte",
     author_email="contact@airbyte.io",
     packages=find_packages(),
diff --git a/airbyte-integrations/connectors/source-scaffold-java-jdbc/README.md b/airbyte-integrations/connectors/source-scaffold-java-jdbc/README.md
index 45394c2e9a6f..2ccf880f11f9 100644
--- a/airbyte-integrations/connectors/source-scaffold-java-jdbc/README.md
+++ b/airbyte-integrations/connectors/source-scaffold-java-jdbc/README.md
@@ -1,6 +1,6 @@
-# Source Scaffold-Java-Jdbc
+# Source Scaffold Java Jdbc
 
-This is the repository for the Scaffold-Java-Jdbc source connector in Java.
+This is the repository for the Scaffold Java Jdbc source connector in Java.
 For information about how to use this connector within Airbyte, see [the User Documentation](https://docs.airbyte.io/integrations/sources/scaffold-java-jdbc).
 
 ## Local development
diff --git a/airbyte-integrations/connectors/source-scaffold-source-http/README.md b/airbyte-integrations/connectors/source-scaffold-source-http/README.md
index 32b53186d7e5..f238246865e1 100644
--- a/airbyte-integrations/connectors/source-scaffold-source-http/README.md
+++ b/airbyte-integrations/connectors/source-scaffold-source-http/README.md
@@ -1,6 +1,6 @@
-# Scaffold-Source-Http Source
+# Scaffold Source Http Source
 
-This is the repository for the Scaffold-Source-Http source connector, written in Python.
+This is the repository for the Scaffold Source Http source connector, written in Python.
 For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/scaffold-source-http).
 
 ## Local development
diff --git a/airbyte-integrations/connectors/source-scaffold-source-http/setup.py b/airbyte-integrations/connectors/source-scaffold-source-http/setup.py
index c5971fa5b44a..2f5242793720 100644
--- a/airbyte-integrations/connectors/source-scaffold-source-http/setup.py
+++ b/airbyte-integrations/connectors/source-scaffold-source-http/setup.py
@@ -17,7 +17,7 @@
 
 setup(
     name="source_scaffold_source_http",
-    description="Source implementation for Scaffold-Source-Http.",
+    description="Source implementation for Scaffold Source Http.",
     author="Airbyte",
     author_email="contact@airbyte.io",
     packages=find_packages(),
diff --git a/airbyte-integrations/connectors/source-scaffold-source-http/source_scaffold_source_http/spec.json b/airbyte-integrations/connectors/source-scaffold-source-http/source_scaffold_source_http/spec.json
index 12469b2b4e83..63ad05756e57 100644
--- a/airbyte-integrations/connectors/source-scaffold-source-http/source_scaffold_source_http/spec.json
+++ b/airbyte-integrations/connectors/source-scaffold-source-http/source_scaffold_source_http/spec.json
@@ -2,7 +2,7 @@
   "documentationUrl": "https://docsurl.com",
   "connectionSpecification": {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "Scaffold-Source-Http Spec",
+    "title": "Scaffold Source Http Spec",
     "type": "object",
     "required": ["TODO"],
     "additionalProperties": false,
diff --git a/airbyte-integrations/connectors/source-scaffold-source-python/README.md b/airbyte-integrations/connectors/source-scaffold-source-python/README.md
index ea5d9445ec19..1f62dd697ac7 100644
--- a/airbyte-integrations/connectors/source-scaffold-source-python/README.md
+++ b/airbyte-integrations/connectors/source-scaffold-source-python/README.md
@@ -1,6 +1,6 @@
-# Scaffold-Source-Python Source
+# Scaffold Source Python Source
 
-This is the repository for the Scaffold-Source-Python source connector, written in Python.
+This is the repository for the Scaffold Source Python source connector, written in Python.
 For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/scaffold-source-python).
 
 ## Local development
diff --git a/airbyte-integrations/connectors/source-scaffold-source-python/setup.py b/airbyte-integrations/connectors/source-scaffold-source-python/setup.py
index 7f115726d469..a648354f8b45 100644
--- a/airbyte-integrations/connectors/source-scaffold-source-python/setup.py
+++ b/airbyte-integrations/connectors/source-scaffold-source-python/setup.py
@@ -16,7 +16,7 @@
 
 setup(
     name="source_scaffold_source_python",
-    description="Source implementation for Scaffold-Source-Python.",
+    description="Source implementation for Scaffold Source Python.",
     author="Airbyte",
     author_email="contact@airbyte.io",
     packages=find_packages(),
diff --git a/airbyte-integrations/connectors/source-scaffold-source-python/source_scaffold_source_python/spec.json b/airbyte-integrations/connectors/source-scaffold-source-python/source_scaffold_source_python/spec.json
index ffd9d45b3880..b4f62b06a8e8 100644
--- a/airbyte-integrations/connectors/source-scaffold-source-python/source_scaffold_source_python/spec.json
+++ b/airbyte-integrations/connectors/source-scaffold-source-python/source_scaffold_source_python/spec.json
@@ -2,7 +2,7 @@
   "documentationUrl": "https://docsurl.com",
   "connectionSpecification": {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "Scaffold-Source-Python Spec",
+    "title": "Scaffold Source Python Spec",
     "type": "object",
     "required": ["fix-me"],
     "additionalProperties": false,