diff --git a/.gitattributes b/.gitattributes
index d3aa2286950..b267693a623 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -31,13 +31,13 @@ res/cardeditions/Champions[!!-~]of[!!-~]Kamigawa.txt -text
 res/cardeditions/Chronicles.txt -text
 res/cardeditions/Classic[!!-~]Sixth[!!-~]Edition.txt -text
 res/cardeditions/Coldsnap.txt -text
+res/cardeditions/Commander's[!!-~]Arsenal.txt -text
 res/cardeditions/Commander.txt -text
-res/cardeditions/Commanders[!!-~]Arsenal.txt -text
 res/cardeditions/Conflux.txt -text
 res/cardeditions/Dark[!!-~]Ascension.txt -text
 res/cardeditions/Darksteel.txt -text
 res/cardeditions/Dissension.txt -text
-res/cardeditions/Dragons[!!-~]Maze.txt -text
+res/cardeditions/Dragon's[!!-~]Maze.txt -text
 res/cardeditions/Duel[!!-~]Decks[!!-~]Ajani[!!-~]vs.[!!-~]Nicol[!!-~]Bolas.txt -text
 res/cardeditions/Duel[!!-~]Decks[!!-~]Divine[!!-~]vs.[!!-~]Demonic.txt -text
 res/cardeditions/Duel[!!-~]Decks[!!-~]Elspeth[!!-~]vs.[!!-~]Tezzeret.txt -text
@@ -120,9 +120,9 @@ res/cardeditions/Time[!!-~]Spiral[!!-~]Timeshifted.txt -text
 res/cardeditions/Time[!!-~]Spiral.txt -text
 res/cardeditions/Torment.txt -text
 res/cardeditions/Unlimited[!!-~]Edition.txt -text
-res/cardeditions/Urzas[!!-~]Destiny.txt -text
-res/cardeditions/Urzas[!!-~]Legacy.txt -text
-res/cardeditions/Urzas[!!-~]Saga.txt -text
+res/cardeditions/Urza's[!!-~]Destiny.txt -text
+res/cardeditions/Urza's[!!-~]Legacy.txt -text
+res/cardeditions/Urza's[!!-~]Saga.txt -text
 res/cardeditions/Vanguard.txt -text
 res/cardeditions/Visions.txt -text
 res/cardeditions/Weatherlight.txt -text
diff --git a/res/cardeditions/Commanders Arsenal.txt b/res/cardeditions/Commander's Arsenal.txt
similarity index 100%
rename from res/cardeditions/Commanders Arsenal.txt
rename to res/cardeditions/Commander's Arsenal.txt
diff --git a/res/cardeditions/Commander.txt b/res/cardeditions/Commander.txt
index 65bd9bcfff5..f74f8670b9b 100644
--- a/res/cardeditions/Commander.txt
+++ b/res/cardeditions/Commander.txt
@@ -1,8 +1,9 @@
 [metadata]
 Code=COM
 Date=2011-06-17
-Name=Magic: The Gathering-Commander
+Name=Commander
 Code2=COM
+Alias=CMD
 Type=Other
 
 [cards]
diff --git a/res/cardeditions/Dragons Maze.txt b/res/cardeditions/Dragon's Maze.txt
similarity index 100%
rename from res/cardeditions/Dragons Maze.txt
rename to res/cardeditions/Dragon's Maze.txt
diff --git a/res/cardeditions/Urzas Destiny.txt b/res/cardeditions/Urza's Destiny.txt
similarity index 100%
rename from res/cardeditions/Urzas Destiny.txt
rename to res/cardeditions/Urza's Destiny.txt
diff --git a/res/cardeditions/Urzas Legacy.txt b/res/cardeditions/Urza's Legacy.txt
similarity index 100%
rename from res/cardeditions/Urzas Legacy.txt
rename to res/cardeditions/Urza's Legacy.txt
diff --git a/res/cardeditions/Urzas Saga.txt b/res/cardeditions/Urza's Saga.txt
similarity index 100%
rename from res/cardeditions/Urzas Saga.txt
rename to res/cardeditions/Urza's Saga.txt