diff --git a/src/main/resources/templates/aeolus/c/fact.sh b/src/main/resources/templates/aeolus/c/fact.sh
index 75d126443ce9..4f7252eefaba 100644
--- a/src/main/resources/templates/aeolus/c/fact.sh
+++ b/src/main/resources/templates/aeolus/c/fact.sh
@@ -8,7 +8,7 @@ setup_the_build_environment () {
   # Task Description:
   # Build and run all tests
   # ------------------------------
-  # Updating assignment and test-reports ownership...
+  # Updating ${studentParentWorkingDirectoryName} and test-reports ownership...
   sudo chown artemis_user:artemis_user ${studentParentWorkingDirectoryName}/ -R || true
   sudo mkdir test-reports
   sudo chown artemis_user:artemis_user test-reports/ -R || true
diff --git a/src/main/resources/templates/aeolus/c/fact.yaml b/src/main/resources/templates/aeolus/c/fact.yaml
index 9d3527e65503..4278be956fac 100644
--- a/src/main/resources/templates/aeolus/c/fact.yaml
+++ b/src/main/resources/templates/aeolus/c/fact.yaml
@@ -7,7 +7,7 @@ actions:
       # Task Description:
       # Build and run all tests
       # ------------------------------
-      # Updating assignment and test-reports ownership...
+      # Updating ${studentParentWorkingDirectoryName} and test-reports ownership...
       sudo chown artemis_user:artemis_user ${studentParentWorkingDirectoryName}/ -R || true
       sudo mkdir test-reports
       sudo chown artemis_user:artemis_user test-reports/ -R || true
@@ -32,4 +32,3 @@ actions:
       - name: junit_test-reports/tests-results.xml
         path: test-reports/tests-results.xml
         type: junit
-
diff --git a/src/main/resources/templates/aeolus/c/gcc.sh b/src/main/resources/templates/aeolus/c/gcc.sh
index 454436632a89..3272660657a1 100644
--- a/src/main/resources/templates/aeolus/c/gcc.sh
+++ b/src/main/resources/templates/aeolus/c/gcc.sh
@@ -10,7 +10,7 @@ setup_the_build_environment () {
   # Build and run all tests
   # ------------------------------
 
-  # Updating assignment and test-reports ownership...
+  # Updating ${studentParentWorkingDirectoryName} and test-reports ownership...
   sudo chown artemis_user:artemis_user ${studentParentWorkingDirectoryName}/ -R
   mkdir test-reports
   chown artemis_user:artemis_user test-reports/ -R
diff --git a/src/main/resources/templates/aeolus/c/gcc.yaml b/src/main/resources/templates/aeolus/c/gcc.yaml
index 29b2e2c635ec..31cafd647000 100644
--- a/src/main/resources/templates/aeolus/c/gcc.yaml
+++ b/src/main/resources/templates/aeolus/c/gcc.yaml
@@ -9,7 +9,7 @@ actions:
       # Build and run all tests
       # ------------------------------
 
-      # Updating assignment and test-reports ownership...
+      # Updating ${studentParentWorkingDirectoryName} and test-reports ownership...
       sudo chown artemis_user:artemis_user ${studentParentWorkingDirectoryName}/ -R
       mkdir test-reports
       chown artemis_user:artemis_user test-reports/ -R
diff --git a/src/main/resources/templates/aeolus/c/gcc_static.sh b/src/main/resources/templates/aeolus/c/gcc_static.sh
index 3322c51c00ad..2dfa84c2a569 100644
--- a/src/main/resources/templates/aeolus/c/gcc_static.sh
+++ b/src/main/resources/templates/aeolus/c/gcc_static.sh
@@ -10,7 +10,7 @@ setup_the_build_environment () {
   # Build and run all tests
   # ------------------------------
 
-  # Updating assignment and test-reports ownership...
+  # Updating ${studentParentWorkingDirectoryName} and test-reports ownership...
   sudo chown artemis_user:artemis_user ${studentParentWorkingDirectoryName}/ -R
   mkdir test-reports
   chown artemis_user:artemis_user test-reports/ -R
diff --git a/src/main/resources/templates/aeolus/c/gcc_static.yaml b/src/main/resources/templates/aeolus/c/gcc_static.yaml
index 21c0b506f179..06ad3136f9aa 100644
--- a/src/main/resources/templates/aeolus/c/gcc_static.yaml
+++ b/src/main/resources/templates/aeolus/c/gcc_static.yaml
@@ -9,7 +9,7 @@ actions:
       # Build and run all tests
       # ------------------------------
 
-      # Updating assignment and test-reports ownership...
+      # Updating ${studentParentWorkingDirectoryName} and test-reports ownership...
       sudo chown artemis_user:artemis_user ${studentParentWorkingDirectoryName}/ -R
       mkdir test-reports
       chown artemis_user:artemis_user test-reports/ -R
diff --git a/src/main/resources/templates/aeolus/swift/plain.sh b/src/main/resources/templates/aeolus/swift/plain.sh
index c0c09a5f9bbc..71387b392783 100644
--- a/src/main/resources/templates/aeolus/swift/plain.sh
+++ b/src/main/resources/templates/aeolus/swift/plain.sh
@@ -7,7 +7,7 @@ build_and_test_the_code () {
   cp -R Tests ${studentParentWorkingDirectoryName}
   cp Package.swift ${studentParentWorkingDirectoryName}
 
-  # In order to get the correct console output we need to execute the command within the assignment directory
+  # In order to get the correct console output we need to execute the command within the ${studentParentWorkingDirectoryName} directory
   # swift build
   cd ${studentParentWorkingDirectoryName}
   swift build || error=true
diff --git a/src/main/resources/templates/aeolus/swift/plain.yaml b/src/main/resources/templates/aeolus/swift/plain.yaml
index 48211dee715a..a2be5d469e65 100644
--- a/src/main/resources/templates/aeolus/swift/plain.yaml
+++ b/src/main/resources/templates/aeolus/swift/plain.yaml
@@ -6,7 +6,7 @@ actions:
       cp -R Tests ${studentParentWorkingDirectoryName}
       cp Package.swift ${studentParentWorkingDirectoryName}
 
-      # In order to get the correct console output we need to execute the command within the assignment directory
+      # In order to get the correct console output we need to execute the command within the ${studentParentWorkingDirectoryName} directory
       # swift build
       cd ${studentParentWorkingDirectoryName}
       swift build || error=true
diff --git a/src/main/resources/templates/aeolus/swift/plain_static.sh b/src/main/resources/templates/aeolus/swift/plain_static.sh
index 6f6b4c15d506..3bbaa9fe0662 100644
--- a/src/main/resources/templates/aeolus/swift/plain_static.sh
+++ b/src/main/resources/templates/aeolus/swift/plain_static.sh
@@ -8,7 +8,7 @@ build_and_test_the_code () {
   cp -R Tests ${studentParentWorkingDirectoryName}
   cp Package.swift ${studentParentWorkingDirectoryName}
 
-  # In order to get the correct console output we need to execute the command within the assignment directory
+  # In order to get the correct console output we need to execute the command within the ${studentParentWorkingDirectoryName} directory
   # swift build
   cd ${studentParentWorkingDirectoryName}
   swift build || error=true
diff --git a/src/main/resources/templates/aeolus/swift/plain_static.yaml b/src/main/resources/templates/aeolus/swift/plain_static.yaml
index 72f683141903..83c76e1a2b61 100644
--- a/src/main/resources/templates/aeolus/swift/plain_static.yaml
+++ b/src/main/resources/templates/aeolus/swift/plain_static.yaml
@@ -7,7 +7,7 @@ actions:
       cp -R Tests ${studentParentWorkingDirectoryName}
       cp Package.swift ${studentParentWorkingDirectoryName}
 
-      # In order to get the correct console output we need to execute the command within the assignment directory
+      # In order to get the correct console output we need to execute the command within the ${studentParentWorkingDirectoryName} directory
       # swift build
       cd ${studentParentWorkingDirectoryName}
       swift build || error=true