diff --git a/docs/features/software-templates/adding-templates.md b/docs/features/software-templates/adding-templates.md
index ffaa9a3e66..55c99aa694 100644
--- a/docs/features/software-templates/adding-templates.md
+++ b/docs/features/software-templates/adding-templates.md
@@ -49,7 +49,7 @@ spec:
 
   # here's the steps that are executed in series in the scaffolder backend
   steps:
-    - id: fetch-base
+    - id: fetchBase
       name: Fetch Base
       action: fetch:template
       input:
@@ -57,7 +57,7 @@ spec:
         values:
           name: ${{ parameters.name }}
 
-    - id: fetch-docs
+    - id: fetchDocs
       name: Fetch Docs
       action: fetch:plain
       input:
diff --git a/docs/features/software-templates/builtin-actions.md b/docs/features/software-templates/builtin-actions.md
index d732bd8a27..22d8ef6454 100644
--- a/docs/features/software-templates/builtin-actions.md
+++ b/docs/features/software-templates/builtin-actions.md
@@ -78,7 +78,7 @@ allow most templates built for `fetch:cookiecutter` to work without any changes.
 
 ```yaml title="template.yaml"
 steps:
-   - id: fetch-base
+   - id: fetchBase
      name: Fetch Base
      # highlight-remove-next-line
      action: fetch:cookiecutter
diff --git a/docs/features/software-templates/experimental.md b/docs/features/software-templates/experimental.md
index 1df041d7a2..ff40120d8c 100644
--- a/docs/features/software-templates/experimental.md
+++ b/docs/features/software-templates/experimental.md
@@ -100,7 +100,7 @@ metadata:
   name: my-template
 spec:
   EXPERIMENTAL_formDecorators:
-    - id: my-decorator
+    - id: myDecorator
       input:
         test: something funky
 
@@ -115,7 +115,7 @@ You can create a decorator using the simple helper method `createScaffolderFormD
 ```ts
 export const mockDecorator = createScaffolderFormDecorator({
   // give the decorator a name
-  id: 'mock-decorator',
+  id: 'mockDecorator',
 
   // define the schema for the input that can be provided in `template.yaml`
   schema: {
diff --git a/docs/features/software-templates/writing-templates.md b/docs/features/software-templates/writing-templates.md
index 0c1ae23aa8..c39e4e80bb 100644
--- a/docs/features/software-templates/writing-templates.md
+++ b/docs/features/software-templates/writing-templates.md
@@ -59,7 +59,7 @@ spec:
 
   # here's the steps that are executed in series in the scaffolder backend
   steps:
-    - id: fetch-base
+    - id: fetchBase
       name: Fetch Base
       action: fetch:template
       input:
@@ -68,7 +68,7 @@ spec:
           name: ${{ parameters.name }}
           owner: ${{ parameters.owner }}
 
-    - id: fetch-docs
+    - id: fetchDocs
       name: Fetch Docs
       action: fetch:plain
       input:
@@ -87,7 +87,7 @@ spec:
       name: Register
       action: catalog:register
       input:
-        repoContentsUrl: ${{ steps['publish'].output.repoContentsUrl }}
+        repoContentsUrl: ${{ steps.publish.output.repoContentsUrl }}
         catalogInfoPath: '/catalog-info.yaml'
 
   # some outputs which are saved along with the job for use in the frontend
@@ -622,7 +622,7 @@ The `steps` is an array of the things that you want to happen part of this
 template. These follow the same standard format:
 
 ```yaml
-- id: fetch-base # A unique id for the step
+- id: fetchBase # A unique id for the step
   name: Fetch Base # A title displayed in the frontend
   if: ${{ parameters.name }} # Optional condition, skip the step if not truthy
   each: ${{ parameters.iterable }} # Optional iterable, run the same step multiple times
@@ -732,7 +732,7 @@ spec:
           default: false
   ...
   steps:
-    - id: fetch-base
+    - id: fetchBase
       name: Fetch Base
       action: fetch:template
       input: