diff --git a/gencapdefs.py b/gencapdefs.py
index a6baee1b..3cacebda 100644
--- a/gencapdefs.py
+++ b/gencapdefs.py
@@ -163,7 +163,7 @@ CAPDEFS = [
         identifier="EventPlayback",
         name="draft/event-playback",
         url="https://github.com/ircv3/ircv3-specifications/pull/362",
-        standard="Draft IRCv3",
+        standard="Proposed IRCv3",
     ),
 ]
 
diff --git a/irc/caps/defs.go b/irc/caps/defs.go
index 9f10f0ae..c261a6e4 100644
--- a/irc/caps/defs.go
+++ b/irc/caps/defs.go
@@ -109,7 +109,7 @@ const (
 	// https://wiki.znc.in/Query_buffers
 	ZNCSelfMessage Capability = iota
 
-	// EventPlayback is the Draft IRCv3 capability named "draft/event-playback":
+	// EventPlayback is the Proposed IRCv3 capability named "draft/event-playback":
 	// https://github.com/ircv3/ircv3-specifications/pull/362
 	EventPlayback Capability = iota
 )
diff --git a/irc/history/history.go b/irc/history/history.go
index 3a3655bb..790eae12 100644
--- a/irc/history/history.go
+++ b/irc/history/history.go
@@ -25,8 +25,8 @@ const (
 	Nick
 )
 
-// a Tagmsg that consists entirely of junk tags is not stored
-var junkTags = map[string]bool{
+// a Tagmsg that consists entirely of transient tags is not stored
+var transientTags = map[string]bool{
 	"+draft/typing": true,
 	"+typing":       true, // future-proofing
 }
@@ -60,7 +60,7 @@ func (item *Item) HasMsgid(msgid string) bool {
 func (item *Item) isStorable() bool {
 	if item.Type == Tagmsg {
 		for name := range item.Tags {
-			if !junkTags[name] {
+			if !transientTags[name] {
 				return true
 			}
 		}