diff --git a/bikeshed/doctypes/utils.py b/bikeshed/doctypes/utils.py
index 00e40b0d4f..dbec82e506 100644
--- a/bikeshed/doctypes/utils.py
+++ b/bikeshed/doctypes/utils.py
@@ -208,3 +208,7 @@ def validateW3CStatus(status: Status) -> None:
         m.die(
             f"Under Process2021, {status.name} is no longer a valid status. Use NOTE (or one of its variants NOTE-ED, NOTE-FPWD, NOTE-WD) instead.",
         )
+    if status.name == "NOTE-FPWD":
+        m.die(
+            "Under Process2021, Notes no longer have a 'first public' draft stage. Use NOTE-WD instead.",
+        )
diff --git a/bikeshed/metadata.py b/bikeshed/metadata.py
index bdcfc0720c..e4643efac3 100644
--- a/bikeshed/metadata.py
+++ b/bikeshed/metadata.py
@@ -331,8 +331,11 @@ def fillTextMacros(self, macros: t.DefaultDict[str, str], doc: t.SpecT) -> None:
             macros["deadline"] = self.deadline.strftime(f"{self.deadline.day} %B %Y")
             macros["isodeadline"] = self.deadline.strftime("%Y-%m-%d")
         if doc.doctype.org.name == "W3C" and "Date" in doc.doctype.status.requires:
+            status_name = doc.doctype.status.name
+            if status_name == "NOTE-WD":
+                status_name = "DNOTE"
             macros["version"] = (
-                f"https://www.w3.org/TR/{macros['year']}/{doc.doctype.status.name}-{macros['vshortname']}-{macros['cdate']}/"
+                f"https://www.w3.org/TR/{macros['year']}/{status_name}-{macros['vshortname']}-{macros['cdate']}/"
             )
             macros["history"] = f"https://www.w3.org/standards/history/{self.displayVshortname}/"
         elif self.ED:
diff --git a/bikeshed/spec-data/readonly/boilerplate/doctypes.kdl b/bikeshed/spec-data/readonly/boilerplate/doctypes.kdl
index 82fc7c5037..670b1fae21 100644
--- a/bikeshed/spec-data/readonly/boilerplate/doctypes.kdl
+++ b/bikeshed/spec-data/readonly/boilerplate/doctypes.kdl
@@ -219,11 +219,11 @@ org "w3c" {
         requires "ED"
         group-types "wg" "ig" "tag"
     }
-    status "NOTE-WD" "W3C Working Draft" {
+    status "NOTE-WD" "W3C Group Draft Note" {
         requires "ED" "TR" "Issue Tracking" "Date"
         group-types "wg" "ig" "tag"
     }
-    status "NOTE-FPWD" "W3C First Public Working Draft" {
+    status "NOTE-FPWD" "W3C First Public Group Draft Note" {
         requires "ED" "TR" "Issue Tracking" "Date"
         group-types "wg" "ig" "tag"
     }
diff --git a/docs/index.bs b/docs/index.bs
index ade1aba5a3..e53fe96382 100644
--- a/docs/index.bs
+++ b/docs/index.bs
@@ -1080,12 +1080,12 @@ Several keys are required information, and will cause the processor to flag an e
 			* PR: "W3C Proposed Recommendation"
 			* REC: "W3C Recommendation"
 			* PER: "W3C Proposed Edited Recommendation"
-			* WG-NOTE: "W3C Working Group Note"
-			* IG-NOTE: "W3C Interest Group Note"
-			* NOTE: "W3C Note" ([unclear what this is used for](https://github.com/w3c/tr-design/issues/124))
+			* WG-NOTE: "W3C Working Group Note" (removed by Process 2021)
+			* IG-NOTE: "W3C Interest Group Note" (removed by Process 2021)
+			* NOTE: "W3C Group Note"
 			* NOTE-ED: "Editor's Draft" of a Group Note
-			* NOTE-WD: "W3C Working Draft" of a Group Note
-			* NOTE-FPWD: "W3C First Public Working Draft" of a Group Note
+			* NOTE-WD: "W3C Draft Note"
+			* NOTE-FPWD: "W3C First Public Working Draft" of a Group Note (removed by Process 2021)
 			* MO: "W3C Member-only Draft"
 			* UD: "Unofficial Proposal Draft"
 			* CG-DRAFT: "Draft Community Group Report"