diff --git a/creator/index.php b/creator/index.php
index 1e279e2c..b601014a 100644
--- a/creator/index.php
+++ b/creator/index.php
@@ -61,11 +61,11 @@
 								<select id='selectFrameGroup' onchange='loadScript("/js/frames/group" + this.value + ".js")' class='input'>
 									<option disabled>Standard Frames</option>
 									<option value='Standard'>Regular</option>
-									<option value='Token'>Tokens</option>
+									<option value='Token-1'>Tokens</option>
 									<option value='Saga'>Sagas</option>
 									<option value='Planeswalker'>Planeswalkers</option>
 									<option disabled>Special Frames</option>
-									<option value='Showcase'>Showcase Frames</option>
+									<option value='Showcase-1'>Showcase Frames</option>
 									<option value='Promo'>Promos (Tall Art)</option>
 									<option value='Textless'>Textless/Fullart</option>
 									<option value='Modal'>Short Modal DFC's</option>
diff --git a/js/frames/groupShowcase.js b/js/frames/groupShowcase-1.js
similarity index 86%
rename from js/frames/groupShowcase.js
rename to js/frames/groupShowcase-1.js
index bd663e53..82bc4c8b 100644
--- a/js/frames/groupShowcase.js
+++ b/js/frames/groupShowcase-1.js
@@ -1,16 +1,16 @@
 loadFramePacks([
-	{name:'Generic Showcase', value:'GenericShowcase'},
 	{name:'Commander Legends', value:'CommanderLegends'},
 	{name:'Zendikar Rising', value:'ZendikarRising'},
 	{name:'M21', value:'M21'},
 	{name:'Eldraine Storybooks', value:'Storybook'},
+	{name:'Generic Showcase', value:'GenericShowcase'},
 	{name:'Masterpieces/Other', value:'disabled'},
 	{name:'Nickname', value:'M15Nickname'},
 	{name:'Box Toppers', value:'M15BoxTopper'},
-	{name:'ZNR Expeditions (2020)', value:'ExpeditionZNR'},
+	{name:'ZNR Expeditions (2020)', value:'ExpeditionZNR-1'},
 	{name:'Ixalan Maps', value:'Ixalan'},
 	{name:'Kaladesh Inventions', value:'Invention'},
-	{name:'BFZ Expeditions (2015)', value:'ExpeditionBFZ'},
+	{name:'BFZ Expeditions (2015)', value:'ExpeditionBFZ-1'},
 	{name:'Addons', value:'disabled'},
 	{name:'Legend Crowns', value:'M15LegendCrowns'},
 	{name:'Floating Legend Crowns', value:'M15LegendCrownsFloating'},
diff --git a/js/frames/groupToken.js b/js/frames/groupToken-1.js
similarity index 68%
rename from js/frames/groupToken.js
rename to js/frames/groupToken-1.js
index ce0fabcc..8b823e05 100644
--- a/js/frames/groupToken.js
+++ b/js/frames/groupToken-1.js
@@ -1,7 +1,7 @@
 loadFramePacks([
-	{name:'Regular', value:'TokenRegular'},
-	{name:'Textless', value:'TokenTextless'},
-	{name:'Tall', value:'TokenTall'},
+	{name:'Regular', value:'TokenRegular-1'},
+	{name:'Textless', value:'TokenTextless-1'},
+	{name:'Tall', value:'TokenTall-1'},
 	{name:'Addons', value:'disabled'},
 	{name:'Floating Legend Crowns', value:'M15LegendCrownsFloating'},
 	{name:'Inner Crowns', value:'M15InnerCrowns'},
diff --git a/js/frames/packExpeditionBFZ.js b/js/frames/packExpeditionBFZ-1.js
similarity index 100%
rename from js/frames/packExpeditionBFZ.js
rename to js/frames/packExpeditionBFZ-1.js
diff --git a/js/frames/packExpeditionZNR.js b/js/frames/packExpeditionZNR-1.js
similarity index 100%
rename from js/frames/packExpeditionZNR.js
rename to js/frames/packExpeditionZNR-1.js
diff --git a/js/frames/packTokenRegular.js b/js/frames/packTokenRegular-1.js
similarity index 100%
rename from js/frames/packTokenRegular.js
rename to js/frames/packTokenRegular-1.js
diff --git a/js/frames/packTokenTall.js b/js/frames/packTokenTall-1.js
similarity index 100%
rename from js/frames/packTokenTall.js
rename to js/frames/packTokenTall-1.js
diff --git a/js/frames/packTokenTextless.js b/js/frames/packTokenTextless-1.js
similarity index 100%
rename from js/frames/packTokenTextless.js
rename to js/frames/packTokenTextless-1.js