diff --git a/course-definition.yml b/course-definition.yml
index d96abef..981353a 100644
--- a/course-definition.yml
+++ b/course-definition.yml
@@ -110,7 +110,7 @@ stages:
       In this stage, you'll start implementing the ResponseHeader.
 
   - slug: "wa6"
-    name: "Parse Correlation ID in RequestHeader"
+    name: "Parse Correlation ID"
     difficulty: medium
     description_md: |-
       In this stage, you'll continue implementing the Kafka wire protocol.
@@ -153,7 +153,7 @@ stages:
       In this stage, you'll start decoding the RequestHeader.
 
   - slug: "nc5"
-    name: "Parse APIVersion in RequestHeader"
+    name: "Parse API Version"
     difficulty: medium
     description_md: |-
       In this stage, you'll continue decoding the RequestHeader.
@@ -181,7 +181,7 @@ stages:
       In this stage, you'll start encoding your response to the `APIVersions` requests.
 
   - slug: "pv1"
-    name: "Implement API keys endpoint"
+    name: "Handle APIVersions requests"
     difficulty: hard
     description_md: |-
       In this stage, you'll implement the ResponseBody for the `APIVersions` request.
@@ -209,7 +209,7 @@ stages:
       In this stage, you'll need to implement the `APIVersions:V3` response.
 
   - slug: "gs0"
-    name: "Include Fetch in the APIVersions response"
+    name: "Include Fetch in APIVersions response"
     difficulty: medium
     description_md: |-
       In this stage, you'll add Fetch to the APIVersions response.
@@ -235,7 +235,7 @@ stages:
       In this stage, you'll add the Fetch API to the APIVersions response.
 
   - slug: "dh6"
-    name: "Fetch response with 0 messages"
+    name: "Fetch with an empty topic"
     difficulty: medium
     description_md: |-
       In this stage, you'll implement the Fetch response for a topic with 0 messages.
@@ -265,7 +265,7 @@ stages:
       In this stage, you'll start encoding your response to the `Fetch` requests.
 
   - slug: "cm4"
-    name: "Fetch response with hardcoded message"
+    name: "Fetch with a hardcoded message"
     difficulty: hard
     description_md: |-
       In this stage, you'll implement the Fetch response for a topic with multiple messages (hardcoded).