diff --git a/errata/21.html b/errata/21.html
index fb12f864ec..b6841518e6 100644
--- a/errata/21.html
+++ b/errata/21.html
@@ -54,7 +54,7 @@ <h3>Editorial Errata</h3>
     
     {%- assign trDate = "2018-06-05" -%}
     {%- capture trUrl -%}
-      https://www.w3.org/TR/{{ trDate | split: "-" | first }}/REC-WCAG21-{{ trDate | replace: "-", "" }}/
+      https://www.w3.org/TR/{{ trDate | split: "-" | first }}/REC-WCAG{{ page.fileSlug }}-{{ trDate | replace: "-", "" }}/
     {%- endcapture -%}
     <section id="since-{{ trDate }}">
       <h2>Errata since <a href="{{ trUrl }}">{{ trDate | date: "%d %B %Y" }} Publication</a></h2>
diff --git a/errata/README.md b/errata/README.md
index f6b5e47b1b..d47c862787 100644
--- a/errata/README.md
+++ b/errata/README.md
@@ -3,6 +3,8 @@
 Errata are listed in reverse-chronological order, first sectioned by publish date,
 then within each section based on when each erratum was added.
 
+## Sections
+
 The first top-level section under `<main>` corresponds to the latest version / unpinned URL;
 subsequent sections correspond to previous versions / date-stamped URLs.
 
@@ -14,7 +16,7 @@ For sections corresponding to previous versions, assignments should follow this
 ```
 {%- assign trDate = "YYYY-MM-DD" -%}
 {%- capture trUrl -%}
-  https://www.w3.org/TR/{{ trDate | split: "-" | first }}/REC-WCAG21-{{ trDate | replace: "-", "" }}/
+  https://www.w3.org/TR/{{ trDate | split: "-" | first }}/REC-WCAG{{ page.fileSlug }}-{{ trDate | replace: "-", "" }}/
 {%- endcapture -%}
 ```
 
@@ -25,6 +27,8 @@ The level 2 heading in the top-level section for each previous version should us
 <h2>Errata since <a href="{{ trUrl }}">{{ trDate | date: "%d %B %Y" }} Publication</a></h2>
 ```
 
+## Erratum format
+
 Each erratum should be in the following format
 (replacing `YYYY-MM-DD`, `Section Title`, and `details of what happened`):