diff --git a/README.md b/README.md
index bfe6bd67f471db..afe450379e9d1f 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@
 
 - **Browser**: 
     - Using Gitpod dashboard [gitpod.io/new](https://gitpod.io/new).
-    - Add `gitpod.io/# `as a prefix to any of your GitHub/ GitLab/ BitBucket repository, like [this](https://gitpod.io/#https://github.com/gitpod-io/template-typescript-react)
+    - Add `gitpod.io/# `as a prefix to any of your GitHub/ GitLab/ Bitbucket repository, like [this](https://gitpod.io/#https://github.com/gitpod-io/template-typescript-react)
 - **CLI**: You can also [install Gitpod CLI](https://www.gitpod.io/docs/references/gitpod-cli#installation) and create your first workspace directly from your terminal :)
 
 
diff --git a/components/dashboard/src/teams/TeamAuthentication.tsx b/components/dashboard/src/teams/TeamAuthentication.tsx
index cae04be9ea92ed..879393f2332712 100644
--- a/components/dashboard/src/teams/TeamAuthentication.tsx
+++ b/components/dashboard/src/teams/TeamAuthentication.tsx
@@ -97,7 +97,7 @@ const PrivateSourceControlAccess = () => {
         <ConfigurationSettingsField className="bg-pk-surface-secondary">
             <Heading3>Private source control access</Heading3>
             <Subheading className="mt-1">
-                Connect to your private source control like GitHub, BitBucket and GitLab
+                Connect to your private source control like GitHub, Bitbucket and GitLab
             </Subheading>
 
             <LinkButton
diff --git a/components/dashboard/src/teams/TeamPolicies.tsx b/components/dashboard/src/teams/TeamPolicies.tsx
index deb546db0eb744..3e8739976b81b3 100644
--- a/components/dashboard/src/teams/TeamPolicies.tsx
+++ b/components/dashboard/src/teams/TeamPolicies.tsx
@@ -283,7 +283,7 @@ const WorkspaceClassesEnterpriseCallout = () => {
                 <PillLabel type="warn">Enterprise</PillLabel>
             </Heading3>
             <Subheading>
-                Access to more powerful workspace classes with up to 30 cores 54GB of RAM and 100GB storage
+                Access to more powerful workspace classes with up to 30 cores 54GB of RAM and 100GB of storage
             </Subheading>
 
             <div className="mt-6 flex flex-row space-x-2">
diff --git a/components/server/src/bitbucket/README.md b/components/server/src/bitbucket/README.md
index 70f52762fcd4a0..52c1085ea268ce 100644
--- a/components/server/src/bitbucket/README.md
+++ b/components/server/src/bitbucket/README.md
@@ -1,6 +1,6 @@
-# BitBucket Integration tests
+# Bitbucket Integration tests
 
-To run the BitBucket integration tests via `npm test` the `GITPOD_TEST_TOKEN_BITBUCKET` environment variable needs to be defined:
+To run the Bitbucket integration tests via `npm test` the `GITPOD_TEST_TOKEN_BITBUCKET` environment variable needs to be defined:
 
 ```bash
 export GITPOD_TEST_TOKEN_BITBUCKET='{ "username": "$username", "value": "$applicationPassword", "scopes": [] }'
diff --git a/components/server/src/github/api.ts b/components/server/src/github/api.ts
index 83715be1f9cd7d..7899c9a119dc60 100644
--- a/components/server/src/github/api.ts
+++ b/components/server/src/github/api.ts
@@ -158,7 +158,7 @@ export class GitHubRestApi {
     }
 
     protected get userAgent() {
-        return (this.config.oauth && new URL(this.config.oauth?.callBackUrl)?.hostname) || "GitPod unknown";
+        return (this.config.oauth && new URL(this.config.oauth?.callBackUrl)?.hostname) || "Gitpod unknown";
     }
 
     /**
diff --git a/components/server/src/user/token-service.ts b/components/server/src/user/token-service.ts
index a709e14c2b478e..1ba7459c47dd44 100644
--- a/components/server/src/user/token-service.ts
+++ b/components/server/src/user/token-service.ts
@@ -27,7 +27,7 @@ export class TokenService implements TokenProvider {
      *
      * The default lifetime of a token if not specified otherwise.
      * Atm we only specify a different lifetime on workspace starts (for the token we pass to "git clone" during content init).
-     * Also, this value is relevant for "opportunistic token refreshes" (enabled for BitBucket only atm): It's the time we mark a token as "reserved" (= do not opportunistically refresh it).
+     * Also, this value is relevant for "opportunistic token refreshes" (enabled for Bitbucket only atm): It's the time we mark a token as "reserved" (= do not opportunistically refresh it).
      */
     static readonly DEFAULT_LIFETIME = 5;