diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 10663bbe..21e80ce4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -45,7 +45,7 @@ body:
     attributes:
       label: "IDE and Version"
       description: "Enter the IDE name and version."
-      placeholder: "e.g., VSCode 1.78.0"
+      placeholder: "e.g., VS Code 1.78.0"
     validations:
       required: true
 
diff --git a/.github/workflows/image-publish.yml b/.github/workflows/image-publish.yml
index 04d1726d..cdbd7633 100644
--- a/.github/workflows/image-publish.yml
+++ b/.github/workflows/image-publish.yml
@@ -44,8 +44,8 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           labels: |
             org.opencontainers.image.source=${{ github.repositoryUrl }}
-            org.opencontainers.image.description="Container image for the Codegate Local Gateway"
-            org.opencontainers.image.title="Codegate Container Image"
+            org.opencontainers.image.description="Container image for the CodeGate local gateway"
+            org.opencontainers.image.title="CodeGate container image"
             org.opencontainers.image.vendor="Stacklok Inc."
             org.opencontainers.image.version=${{ github.sha }}
           flavor: |
diff --git a/.gitignore b/.gitignore
index 5f9615d4..9b4ec366 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,7 +43,7 @@ htmlcov/
 # Weaviate
 weaviate_data/
 
-# Codegate Dashboard DB
+# CodeGate Dashboard DB
 codegate.db
 
 # certificate directory
diff --git a/cert_gen.py b/cert_gen.py
index c9d79c82..e41d4bab 100644
--- a/cert_gen.py
+++ b/cert_gen.py
@@ -150,18 +150,18 @@ def generate_certificates(cert_dir="certs"):
     print("\nTo trust these certificates:")
     print("\nOn macOS:")
     print(
-        "sudo security add-trusted-cert -d -r trustRoot "
-        "-k /Library/Keychains/System.keychain certs/server.crt"
+        "security add-trusted-cert -r trustRoot "
+        "-k ~/Library/Keychains/login.keychain certs/server.crt"
     )
-    print("\nOn Windows (PowerShell as Admin):")
+    print("\nOn Windows (PowerShell):")
     print(
         'Import-Certificate -FilePath "certs\\server.crt" '
-        "-CertStoreLocation Cert:\\LocalMachine\\Root"
+        "-CertStoreLocation Cert:\\CurrentUser\\Root"
     )
     print("\nOn Linux:")
     print("sudo cp certs/server.crt /usr/local/share/ca-certificates/proxy-pilot.crt")
     print("sudo update-ca-certificates")
-    print("\nFor VSCode, add to settings.json:")
+    print("\nFor VS Code, add to settings.json:")
     print(
         """{
     "http.proxy": "https://localhost:8989",
diff --git a/config.yaml b/config.yaml
index 2676d0e8..f044bda1 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,4 +1,4 @@
-# Codegate Example Configuration
+# CodeGate Example Configuration
 
 # Network settings
 port: 8989           # Port to listen on (1-65535)
diff --git a/config.yaml.example b/config.yaml.example
index 28d3171a..83548e9a 100644
--- a/config.yaml.example
+++ b/config.yaml.example
@@ -1,4 +1,4 @@
-# Codegate Example Configuration
+# CodeGate Example Configuration
 
 # Network settings
 port: 8989           # Port to listen on (1-65535)
diff --git a/src/codegate/__init__.py b/src/codegate/__init__.py
index 042fba14..db51fd4a 100644
--- a/src/codegate/__init__.py
+++ b/src/codegate/__init__.py
@@ -1,4 +1,4 @@
-"""Codegate - A Generative AI security gateway."""
+"""CodeGate - A Generative AI security gateway."""
 
 import logging as python_logging
 from importlib import metadata
diff --git a/src/codegate/cli.py b/src/codegate/cli.py
index ea871b5e..01f10945 100644
--- a/src/codegate/cli.py
+++ b/src/codegate/cli.py
@@ -94,7 +94,7 @@ def validate_port(ctx: click.Context, param: click.Parameter, value: int) -> int
 @click.group()
 @click.version_option()
 def cli() -> None:
-    """Codegate - A configurable service gateway."""
+    """CodeGate - A configurable service gateway."""
     pass
 
 
diff --git a/src/codegate/pipeline/codegate_context_retriever/codegate.py b/src/codegate/pipeline/codegate_context_retriever/codegate.py
index 533d70cf..eab0b9bc 100644
--- a/src/codegate/pipeline/codegate_context_retriever/codegate.py
+++ b/src/codegate/pipeline/codegate_context_retriever/codegate.py
@@ -131,7 +131,7 @@ async def process(
         if len(searched_objects) > 0:
             context_str = self.generate_context_str(searched_objects, context)
         else:
-            context_str = "Codegate did not find any malicious or archived packages."
+            context_str = "CodeGate did not find any malicious or archived packages."
 
         last_user_idx = self.get_last_user_message_idx(request)
         if last_user_idx == -1:
diff --git a/src/codegate/pipeline/version/version.py b/src/codegate/pipeline/version/version.py
index ac63018e..540a9fa9 100644
--- a/src/codegate/pipeline/version/version.py
+++ b/src/codegate/pipeline/version/version.py
@@ -47,7 +47,7 @@ async def process(
                 return PipelineResult(
                     response=PipelineResponse(
                         step_name=self.name,
-                        content="Codegate version: {}".format(__version__),
+                        content="CodeGate version: {}".format(__version__),
                         model=request["model"],
                     ),
                     context=context,