diff --git a/pages/pipelines/block_step.md b/pages/pipelines/block_step.md
index 3ce7c602d9..7d13670ed7 100644
--- a/pages/pipelines/block_step.md
+++ b/pages/pipelines/block_step.md
@@ -102,8 +102,9 @@ Optional attributes:
   <tr>
     <td><code>key</code></td>
     <td>
-	    <p>A unique string to identify the block step.</p>
+      <p>A unique string to identify the block step.<br>Keys can not have the same pattern as a UUID (<code>xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx</code>).</p>
       <p><em>Example:</em> <code>"test-suite"</code></p>
+      <p><em>Alias:</em> <code>identifier</code></p>
     </td>
    </tr>
    <tr>
diff --git a/pages/pipelines/command_step.md b/pages/pipelines/command_step.md
index 2ed2be2b66..3f96d18e49 100644
--- a/pages/pipelines/command_step.md
+++ b/pages/pipelines/command_step.md
@@ -22,9 +22,10 @@ Required attributes:
   <tr>
     <td><code>command</code></td>
     <td>
-      The shell command/s to run during this step. This can be a single line of commands, or a list of commands that must all pass. Also available as the alias <code>commands</code>.<br>
+      The shell command/s to run during this step. This can be a single line of commands, or a list of commands that must all pass.<br>
       <em>Example:</em> <code>"build.sh"</code><br>
-      <em>Example:</em><br><code>- "npm install"</code><br><code>- "tests.sh"</code>
+      <em>Example:</em><br><code>- "npm install"</code><br><code>- "tests.sh"</code><br>
+      <em>Alias:</em> <code>commands</code>
     </td>
   </tr>
 </table>
@@ -118,9 +119,9 @@ Optional attributes:
   <tr>
     <td><code>key</code></td>
     <td>
-      A unique string to identify the step. The value is available in the <code>BUILDKITE_STEP_KEY</code> <a href="/docs/pipelines/environment-variables">environment variable</a>.<br>
+      A unique string to identify the command step. The value is available in the <code>BUILDKITE_STEP_KEY</code> <a href="/docs/pipelines/environment-variables">environment variable</a>.<br>
       Keys can not have the same pattern as a UUID (<code>xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx</code>).<br>
-      <em>Example:</em> <code>"linter"</code>
+      <em>Example:</em> <code>"linter"</code><br>
       <em>Alias:</em> <code>identifier</code>
     </td>
   </tr>
diff --git a/pages/pipelines/group_step.md b/pages/pipelines/group_step.md
index 3e9a4bd876..5cb915bc49 100644
--- a/pages/pipelines/group_step.md
+++ b/pages/pipelines/group_step.md
@@ -81,8 +81,9 @@ Optional attributes:
   <tr>
     <td><code>key</code></td>
     <td>
-    A unique string to identify the step, block, or group. Alias: `identifier` or `id`.<br>
-      <em>Example:</em> <code>"test-suite"</code>
+      A unique string to identify the step, block, or group.<br>Keys can not have the same pattern as a UUID (<code>xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx</code>).<br>
+      <em>Example:</em> <code>"test-suite"</code><br>
+      <em>Alias:</em> <code>identifier</code>
     </td>
   </tr>
   <tr>
diff --git a/pages/pipelines/input_step.md b/pages/pipelines/input_step.md
index 51e10aaa13..503620a9e0 100644
--- a/pages/pipelines/input_step.md
+++ b/pages/pipelines/input_step.md
@@ -91,8 +91,9 @@ Optional attributes:
    <tr>
     <td><code>key</code></td>
     <td>
-	    <p>A unique string to identify the input step.</p>
-      <p><em>Example:</em> <code>"test-suite"</code></p>
+      A unique string to identify the input step.<br>Keys can not have the same pattern as a UUID (<code>xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx</code>).<br>
+      <em>Example:</em> <code>"test-suite"</code><br>
+      <em>Alias:</em> <code>identifier</code>
     </td>
    </tr>
    <tr>
diff --git a/pages/pipelines/trigger_step.md b/pages/pipelines/trigger_step.md
index 5ec13feaee..25d9372f78 100644
--- a/pages/pipelines/trigger_step.md
+++ b/pages/pipelines/trigger_step.md
@@ -91,6 +91,14 @@ Optional attributes:
       <em>Example:</em> <code>"test-suite"</code>
     </td>
    </tr>
+   <tr>
+    <td><code>key</code></td>
+    <td>
+      A unique string to identify the trigger step.<br>Keys can not have the same pattern as a UUID (<code>xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx</code>).<br>
+      <em>Example:</em> <code>"trigger-deploy"</code><br>
+      <em>Alias:</em> <code>identifier</code>
+    </td>
+   </tr>
    <tr>
     <td><code>allow_dependency_failure</code></td>
     <td>
diff --git a/pages/pipelines/wait_step.md b/pages/pipelines/wait_step.md
index a898eb98d6..d9ba6232e3 100644
--- a/pages/pipelines/wait_step.md
+++ b/pages/pipelines/wait_step.md
@@ -35,6 +35,14 @@ Optional attributes:
       <em>Example:</em> <code>"test-suite"</code>
     </td>
    </tr>
+   <tr>
+    <td><code>key</code></td>
+    <td>
+      A unique string to identify the wait step.<br>Keys can not have the same pattern as a UUID (<code>xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx</code>).<br>
+      <em>Example:</em> <code>"confirmation"</code><br>
+      <em>Alias:</em> <code>identifier</code>
+    </td>
+   </tr>
    <tr>
     <td><code>allow_dependency_failure</code></td>
     <td>