diff --git a/.gitattributes b/.gitattributes
index 1fda3c6eeaa..1134d24204c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -18651,6 +18651,7 @@ forge-gui/res/editions/Dragons[!!-~]of[!!-~]Tarkir.txt -text
 forge-gui/res/editions/Duel[!!-~]Decks[!!-~]Ajani[!!-~]vs.[!!-~]Nicol[!!-~]Bolas.txt -text
 forge-gui/res/editions/Duel[!!-~]Decks[!!-~]Blessed[!!-~]vs.[!!-~]Cursed.txt -text
 forge-gui/res/editions/Duel[!!-~]Decks[!!-~]Divine[!!-~]vs.[!!-~]Demonic.txt -text
+forge-gui/res/editions/Duel[!!-~]Decks[!!-~]Elspeth[!!-~]vs.[!!-~]Kiora.txt -text
 forge-gui/res/editions/Duel[!!-~]Decks[!!-~]Elspeth[!!-~]vs.[!!-~]Tezzeret.txt -text
 forge-gui/res/editions/Duel[!!-~]Decks[!!-~]Elves[!!-~]vs.[!!-~]Goblins.txt -text
 forge-gui/res/editions/Duel[!!-~]Decks[!!-~]Garruk[!!-~]vs.[!!-~]Liliana.txt -text
@@ -18658,7 +18659,6 @@ forge-gui/res/editions/Duel[!!-~]Decks[!!-~]Heroes[!!-~]vs.[!!-~]Monsters.txt -t
 forge-gui/res/editions/Duel[!!-~]Decks[!!-~]Izzet[!!-~]vs.[!!-~]Golgari.txt -text
 forge-gui/res/editions/Duel[!!-~]Decks[!!-~]Jace[!!-~]vs.[!!-~]Chandra.txt -text
 forge-gui/res/editions/Duel[!!-~]Decks[!!-~]Jace[!!-~]vs.[!!-~]Vraska.txt -text
-forge-gui/res/editions/Duel[!!-~]Decks[!!-~]Kiora[!!-~]vs.[!!-~]Elspeth.txt -text
 forge-gui/res/editions/Duel[!!-~]Decks[!!-~]Knights[!!-~]vs.[!!-~]Dragons.txt -text
 forge-gui/res/editions/Duel[!!-~]Decks[!!-~]Mind[!!-~]vs.[!!-~]Might.txt -text
 forge-gui/res/editions/Duel[!!-~]Decks[!!-~]Nissa[!!-~]vs.[!!-~]Ob[!!-~]Nixilis.txt -text svneol=unset#text/plain
@@ -18729,7 +18729,7 @@ forge-gui/res/editions/Oath[!!-~]of[!!-~]the[!!-~]Gatewatch.txt -text
 forge-gui/res/editions/Odyssey.txt -text
 forge-gui/res/editions/Onslaught.txt -text
 forge-gui/res/editions/Planar[!!-~]Chaos.txt -text
-forge-gui/res/editions/Planechase[!!-~]2012[!!-~]Edition.txt -text
+forge-gui/res/editions/Planechase[!!-~]2012.txt -text
 forge-gui/res/editions/Planechase[!!-~]Anthology.txt -text
 forge-gui/res/editions/Planechase.txt -text
 forge-gui/res/editions/Planeshift.txt -text
@@ -18772,7 +18772,7 @@ forge-gui/res/editions/Vanguard.txt -text
 forge-gui/res/editions/Vintage[!!-~]Masters.txt -text
 forge-gui/res/editions/Visions.txt -text
 forge-gui/res/editions/Weatherlight.txt -text
-forge-gui/res/editions/Welcome[!!-~]2016.txt -text
+forge-gui/res/editions/Welcome[!!-~]Deck[!!-~]2016.txt -text
 forge-gui/res/editions/Worldwake.txt -text
 forge-gui/res/editions/Zendikar[!!-~]Expeditions.txt -text
 forge-gui/res/editions/Zendikar.txt -text
diff --git a/forge-gui/res/editions/Duel Decks Kiora vs. Elspeth.txt b/forge-gui/res/editions/Duel Decks Elspeth vs. Kiora.txt
similarity index 92%
rename from forge-gui/res/editions/Duel Decks Kiora vs. Elspeth.txt
rename to forge-gui/res/editions/Duel Decks Elspeth vs. Kiora.txt
index 5bf566ec229..d7cd2003a8a 100644
--- a/forge-gui/res/editions/Duel Decks Kiora vs. Elspeth.txt	
+++ b/forge-gui/res/editions/Duel Decks Elspeth vs. Kiora.txt	
@@ -1,7 +1,7 @@
 [metadata]
 Code=DDO
 Date=2015-02-27
-Name=Duel Decks: Kiora vs. Elspeth
+Name=Duel Decks: Elspeth vs. Kiora
 MciCode=ddo
 Type=Duel_Decks
 
diff --git a/forge-gui/res/editions/Planechase 2012 Edition.txt b/forge-gui/res/editions/Planechase 2012.txt
similarity index 94%
rename from forge-gui/res/editions/Planechase 2012 Edition.txt
rename to forge-gui/res/editions/Planechase 2012.txt
index 03771884829..2570cd0c67a 100644
--- a/forge-gui/res/editions/Planechase 2012 Edition.txt	
+++ b/forge-gui/res/editions/Planechase 2012.txt	
@@ -1,7 +1,7 @@
 [metadata]
 Code=PC2
 Date=2012-06-01
-Name=Planechase 2012 Edition
+Name=Planechase 2012
 Code2=PC2
 MciCode=pc2
 Type=Other
diff --git a/forge-gui/res/editions/Portal Second Age.txt b/forge-gui/res/editions/Portal Second Age.txt
index d9940999bce..e9bcc80dcae 100644
--- a/forge-gui/res/editions/Portal Second Age.txt	
+++ b/forge-gui/res/editions/Portal Second Age.txt	
@@ -1,7 +1,7 @@
 [metadata]
 Code=PO2
 Date=1998-06
-Name=Portal Second Age
+Name=Portal: Second Age
 Code2=P2
 Alias=P02
 MciCode=po2
diff --git a/forge-gui/res/editions/Portal Three Kingdoms.txt b/forge-gui/res/editions/Portal Three Kingdoms.txt
index 7a93fb3eb4e..cdfe4a60e2f 100644
--- a/forge-gui/res/editions/Portal Three Kingdoms.txt	
+++ b/forge-gui/res/editions/Portal Three Kingdoms.txt	
@@ -1,7 +1,7 @@
 [metadata]
 Code=PTK
 Date=1999-05
-Name=Portal Three Kingdoms
+Name=Portal: Three Kingdoms
 Code2=P3
 MciCode=p3k
 Type=Starter
diff --git a/forge-gui/res/editions/Welcome 2016.txt b/forge-gui/res/editions/Welcome Deck 2016.txt
similarity index 94%
rename from forge-gui/res/editions/Welcome 2016.txt
rename to forge-gui/res/editions/Welcome Deck 2016.txt
index c6ab51968e9..4809fcc1278 100644
--- a/forge-gui/res/editions/Welcome 2016.txt	
+++ b/forge-gui/res/editions/Welcome Deck 2016.txt	
@@ -1,7 +1,7 @@
 [metadata]
 Code=W16
 Date=2016-06-16
-Name=Welcome 2016
+Name=Welcome Deck 2016
 MciCode=w16
 Type=Other