diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/TemplateConverter.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/TemplateConverter.ts
index 86f722e475..69788238cc 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/TemplateConverter.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/TemplateConverter.ts
@@ -99,7 +99,7 @@ export class TemplateActionRegistry {
   register(action: TemplateAction) {
     if (this.actions.has(action.id)) {
       throw new ConflictError(
-        `Template action with id ${action.id} as already been registered`,
+        `Template action with ID '${action.id}' has already been registered`,
       );
     }
     this.actions.set(action.id, action);
@@ -109,7 +109,7 @@ export class TemplateActionRegistry {
     const action = this.actions.get(actionId);
     if (!action) {
       throw new NotFoundError(
-        `Template action with id ${actionId} is not registered.`,
+        `Template action with ID '${actionId}' is not registered.`,
       );
     }
     return action;
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index a8a61972af..5821edfe8c 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -258,7 +258,7 @@ export async function createRouter(
         'Content-Type': 'text/event-stream',
       });
 
-      // After client opens connection send all nests as string
+      // After client opens connection send all events as string
       const unsubscribe = taskBroker.observe(
         { taskId, after },
         (error, { events }) => {