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/spec-data/readonly/boilerplate/doctypes.kdl b/bikeshed/spec-data/readonly/boilerplate/doctypes.kdl
index 01b3ed5406..7a36518a67 100644
--- a/bikeshed/spec-data/readonly/boilerplate/doctypes.kdl
+++ b/bikeshed/spec-data/readonly/boilerplate/doctypes.kdl
@@ -221,11 +221,11 @@ org "w3c" {
         requires "ED"
         group-types "wg" "ig" "tag"
     }
-    status "NOTE-WD" "W3C Working Draft" {
+    status "NOTE-WD" "W3C 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 Working Draft Note" {
         requires "ED" "TR" "Issue Tracking" "Date"
         group-types "wg" "ig" "tag"
     }
diff --git a/docs/index.bs b/docs/index.bs
index 672f19b2dd..2f5a4c355c 100644
--- a/docs/index.bs
+++ b/docs/index.bs
@@ -1081,12 +1081,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"
@@ -4660,4 +4660,4 @@ as it might be important.
 (For example, in the anchor format, multiple urlPrefix values are concatenated together, to help specify urls in multipage specs.)
 
 Additional semicolons are silently ignored;
-in other words, empty entries get dropped, so you can put a final semicolon at the end of the line or not, as you prefer.
\ No newline at end of file
+in other words, empty entries get dropped, so you can put a final semicolon at the end of the line or not, as you prefer.