diff --git a/apps/overload/.eslintrc.json b/apps/typescript/overload/.eslintrc.json
similarity index 94%
rename from apps/overload/.eslintrc.json
rename to apps/typescript/overload/.eslintrc.json
index b428c22..bf8df14 100644
--- a/apps/overload/.eslintrc.json
+++ b/apps/typescript/overload/.eslintrc.json
@@ -1,5 +1,5 @@
 {
-  "extends": ["../../.eslintrc.json"],
+  "extends": ["../../../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {
diff --git a/apps/overload/README.md b/apps/typescript/overload/README.md
similarity index 65%
rename from apps/overload/README.md
rename to apps/typescript/overload/README.md
index d542a7d..d181c0d 100644
--- a/apps/overload/README.md
+++ b/apps/typescript/overload/README.md
@@ -5,9 +5,9 @@
 ### Run Application
 
 ```bash
-npx nx serve overload`
+npx nx serve typescript-overload`
 ```
 
 ### Documentation and Instruction
 
-Challenge documentation is [here](https://angular-challenges.vercel.app/challenges/typescript/15-overload-fn/).
+Challenge documentation is [here](https://angular-challenges.vercel.app/challenges/typescript/15-typescript-overload-fn/).
diff --git a/apps/overload/project.json b/apps/typescript/overload/project.json
similarity index 62%
rename from apps/overload/project.json
rename to apps/typescript/overload/project.json
index 0dfdf20..92c12e2 100644
--- a/apps/overload/project.json
+++ b/apps/typescript/overload/project.json
@@ -1,22 +1,25 @@
 {
-  "name": "overload",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "name": "typescript-overload",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/overload/src",
+  "sourceRoot": "apps/typescript/overload/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/overload",
-        "index": "apps/overload/src/index.html",
-        "main": "apps/overload/src/main.ts",
+        "outputPath": "dist/apps/typescript/overload",
+        "index": "apps/typescript/overload/src/index.html",
+        "main": "apps/typescript/overload/src/main.ts",
         "polyfills": ["zone.js"],
-        "tsConfig": "apps/overload/tsconfig.app.json",
+        "tsConfig": "apps/typescript/overload/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
-        "assets": ["apps/overload/src/favicon.ico", "apps/overload/src/assets"],
-        "styles": ["apps/overload/src/styles.scss"],
+        "assets": [
+          "apps/typescript/overload/src/favicon.ico",
+          "apps/typescript/overload/src/assets"
+        ],
+        "styles": ["apps/typescript/overload/src/styles.scss"],
         "scripts": []
       },
       "configurations": {
@@ -50,10 +53,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "browserTarget": "overload:build:production"
+          "browserTarget": "typescript-overload:build:production"
         },
         "development": {
-          "browserTarget": "overload:build:development"
+          "browserTarget": "typescript-overload:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -61,14 +64,17 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "overload:build"
+        "browserTarget": "typescript-overload:build"
       }
     },
     "lint": {
       "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
-        "lintFilePatterns": ["apps/overload/**/*.ts", "apps/overload/**/*.html"]
+        "lintFilePatterns": [
+          "apps/typescript/overload/**/*.ts",
+          "apps/typescript/overload/**/*.html"
+        ]
       }
     }
   },
diff --git a/apps/overload/src/app/app.component.ts b/apps/typescript/overload/src/app/app.component.ts
similarity index 100%
rename from apps/overload/src/app/app.component.ts
rename to apps/typescript/overload/src/app/app.component.ts
diff --git a/apps/overload/src/app/vehicle.utils.ts b/apps/typescript/overload/src/app/vehicle.utils.ts
similarity index 100%
rename from apps/overload/src/app/vehicle.utils.ts
rename to apps/typescript/overload/src/app/vehicle.utils.ts
diff --git a/apps/overload/src/assets/.gitkeep b/apps/typescript/overload/src/assets/.gitkeep
similarity index 100%
rename from apps/overload/src/assets/.gitkeep
rename to apps/typescript/overload/src/assets/.gitkeep
diff --git a/apps/overload/src/favicon.ico b/apps/typescript/overload/src/favicon.ico
similarity index 100%
rename from apps/overload/src/favicon.ico
rename to apps/typescript/overload/src/favicon.ico
diff --git a/apps/overload/src/index.html b/apps/typescript/overload/src/index.html
similarity index 100%
rename from apps/overload/src/index.html
rename to apps/typescript/overload/src/index.html
diff --git a/apps/overload/src/main.ts b/apps/typescript/overload/src/main.ts
similarity index 100%
rename from apps/overload/src/main.ts
rename to apps/typescript/overload/src/main.ts
diff --git a/apps/overload/src/styles.scss b/apps/typescript/overload/src/styles.scss
similarity index 100%
rename from apps/overload/src/styles.scss
rename to apps/typescript/overload/src/styles.scss
diff --git a/apps/overload/tsconfig.app.json b/apps/typescript/overload/tsconfig.app.json
similarity index 84%
rename from apps/overload/tsconfig.app.json
rename to apps/typescript/overload/tsconfig.app.json
index fff4a41..5822042 100644
--- a/apps/overload/tsconfig.app.json
+++ b/apps/typescript/overload/tsconfig.app.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
+    "outDir": "../../../dist/out-tsc",
     "types": []
   },
   "files": ["src/main.ts"],
diff --git a/apps/overload/tsconfig.editor.json b/apps/typescript/overload/tsconfig.editor.json
similarity index 100%
rename from apps/overload/tsconfig.editor.json
rename to apps/typescript/overload/tsconfig.editor.json
diff --git a/apps/overload/tsconfig.json b/apps/typescript/overload/tsconfig.json
similarity index 93%
rename from apps/overload/tsconfig.json
rename to apps/typescript/overload/tsconfig.json
index 0731542..51c7908 100644
--- a/apps/overload/tsconfig.json
+++ b/apps/typescript/overload/tsconfig.json
@@ -19,7 +19,7 @@
       "path": "./tsconfig.editor.json"
     }
   ],
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,
     "strictInjectionParameters": true,
diff --git a/docs/src/content/docs/challenges/typescript/15-overload-fn.md b/docs/src/content/docs/challenges/typescript/15-overload-fn.md
index c8b0df0..6a0d68b 100644
--- a/docs/src/content/docs/challenges/typescript/15-overload-fn.md
+++ b/docs/src/content/docs/challenges/typescript/15-overload-fn.md
@@ -3,7 +3,7 @@ title: 🟠 Function Overload
 description: Challenge 15 is about creating overload functions
 author: Thomas Laforge
 challengeNumber: 15
-command: overload
+command: typescript-overload
 blogLink: https://medium.com/ngconf/function-overloading-in-typescript-8236706b2c05
 sidebar:
   order: 115