diff --git a/data/magic.mse-game/auto_replace b/data/magic.mse-game/auto_replace
index 1a57018c..7b816359 100644
--- a/data/magic.mse-game/auto_replace
+++ b/data/magic.mse-game/auto_replace
@@ -1,4 +1,4 @@
-
+
 ############################################################## Auto replace
 
 # Do we need categories?
@@ -34,9 +34,6 @@ auto replace:
 auto replace:
 	match: @
 	replace: LEGENDNAME
-auto replace:
-	match: ~
-	replace: CARDNAME
 auto replace:
 	match: ~THIS~
 	replace: CARDNAME
diff --git a/data/magic.mse-game/script b/data/magic.mse-game/script
index 90fa2aac..143065a1 100644
--- a/data/magic.mse-game/script
+++ b/data/magic.mse-game/script
@@ -394,7 +394,7 @@ text_filter :=
 		) +
 	# step 3a : expand shortcut word CARDNAME
 	replace@(
-		match: "CARDNAME",
+		match: "~|CARDNAME",
 		in_context: "(^|[[:space:]]|\\()<match>", # TODO: Allow any punctuation before
 		replace: "<atom-cardname></atom-cardname>"
 		) +