diff --git a/docs/src/content/docs/challenges/angular-performance/36-ngfor-optimize.md b/docs/src/content/docs/challenges/angular-performance/36-ngfor-optimize.md
index 2732592..5fef237 100644
--- a/docs/src/content/docs/challenges/angular-performance/36-ngfor-optimize.md
+++ b/docs/src/content/docs/challenges/angular-performance/36-ngfor-optimize.md
@@ -33,7 +33,7 @@ The goal of this challenge is to understand what is causing this DOM refresh and
 ---
 
 :::note
-Start the project by running: `npx nx serve ngfor-optimize`.
+Start the project by running: `npx nx serve performance-ngfor-optimize`.
 :::
 
 :::tip[Reminder]
diff --git a/libs/cli/src/generators/challenge/files/docs/__challengeNumber__-__projectName__.md__tmpl__ b/libs/cli/src/generators/challenge/files/docs/__challengeNumber__-__projectName__.md__tmpl__
index 561ed05..f92f20c 100644
--- a/libs/cli/src/generators/challenge/files/docs/__challengeNumber__-__projectName__.md__tmpl__
+++ b/libs/cli/src/generators/challenge/files/docs/__challengeNumber__-__projectName__.md__tmpl__
@@ -21,7 +21,7 @@ WIP: The following documentation need to be written.
 ---
 
 :::note
-Start the project by running: `npx nx serve <%= projectName %>`.
+Start the project by running: `npx nx serve <%= appProjectName %>`.
 :::
 
 :::tip[Reminder]
diff --git a/libs/cli/src/generators/challenge/files/readme/README.md__tmpl__ b/libs/cli/src/generators/challenge/files/readme/README.md__tmpl__
index 4305e46..1491c3d 100644
--- a/libs/cli/src/generators/challenge/files/readme/README.md__tmpl__
+++ b/libs/cli/src/generators/challenge/files/readme/README.md__tmpl__
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve <%= projectName %>
+npx nx serve <%= appProjectName %>
 ```
 
 ### Documentation and Instruction
diff --git a/libs/cli/src/generators/challenge/generator.ts b/libs/cli/src/generators/challenge/generator.ts
index f829662..3748e5f 100644
--- a/libs/cli/src/generators/challenge/generator.ts
+++ b/libs/cli/src/generators/challenge/generator.ts
@@ -41,7 +41,10 @@ function findPreviousChallengeFilePath(tree, path, number) {
 }
 
 export async function challengeGenerator(tree: Tree, options: Schema) {
-  const { appDirectory } = getProjectDir(options.name, options.directory);
+  const { appProjectName, appDirectory } = getProjectDir(
+    options.name,
+    options.directory
+  );
 
   const difficulty = options.challengeDifficulty;
 
@@ -74,6 +77,7 @@ export async function challengeGenerator(tree: Tree, options: Schema) {
   generateFiles(tree, join(__dirname, 'files', 'readme'), appDirectory, {
     tmpl: '',
     projectName: names(options.name).name,
+    appProjectName: appProjectName,
     title: options.title,
     challengeNumber,
     docRepository: options.docRepository,
@@ -86,6 +90,7 @@ export async function challengeGenerator(tree: Tree, options: Schema) {
     {
       tmpl: '',
       projectName: names(options.name).name,
+      appProjectName: appProjectName,
       title: options.title,
       challengeNumber,
       difficulty,