diff --git a/ButtonForge-classic.toc b/ButtonForge.toc
similarity index 93%
rename from ButtonForge-classic.toc
rename to ButtonForge.toc
index 68e4f67..7f48cdf 100644
--- a/ButtonForge-classic.toc
+++ b/ButtonForge.toc
@@ -1,5 +1,5 @@
-## Interface: 11303
-## Title: Button Forge Classic
+## Interface: 11305
+## Title: Button Forge (Classic)
 ## Notes: Add as many or few extra Action Bars and Buttons to your user interface to complement the standard (or other) Action Bars
 ## Version: 0.9.50.4
 ## Author: Massiner of Nathrezim
diff --git a/Const.lua b/Const.lua
index 051186b..81bca39 100644
--- a/Const.lua
+++ b/Const.lua
@@ -34,7 +34,7 @@ Const.KeyBindOverlayColor 		= {0.3, 0.7, 0.1, 0.4};
 Const.BarBackdrop 				= {0.1, 0.1, 0.4, 0.85};
 Const.BonusBarBackdrop 			= {0.1, 0.5, 0.1, 0.85};
 Const.IconDragOverlayColor		= {0.0, 0.1, 0.3, 0.0};
-Const.ImagesDir 			= "Interface\\AddOns\\ButtonForge-classic\\Images\\";
+Const.ImagesDir 			= "Interface\\AddOns\\ButtonForge\\Images\\";
 Const.SlashNumLines			= 4;		--Num of lines to show before breaking the message up
 
 Const.DisableAutoAlignAgainstDefaultBars	= false;	--Set to true and reload UI in order to not check the Blizzard bars when performing auto-alignment, this probably isn't needed but just in case
diff --git a/KeyBinder.xml b/KeyBinder.xml
index 6e96637..4842ad9 100644
--- a/KeyBinder.xml
+++ b/KeyBinder.xml
@@ -99,7 +99,7 @@
 						</Offset>
 					</Shadow>
 				</FontString>
-				<Texture parentKey="ToggleBorder" file="Interface\AddOns\ButtonForge-classic\Images\ToggleBorder.tga">
+				<Texture parentKey="ToggleBorder" file="Interface\AddOns\ButtonForge\Images\ToggleBorder.tga">
 					<Size>
 						<AbsDimension x="26" y="26" />
 					</Size>
diff --git a/UILibToolbar.xml b/UILibToolbar.xml
index 6b95772..c3662c9 100644
--- a/UILibToolbar.xml
+++ b/UILibToolbar.xml
@@ -48,7 +48,7 @@
 					</Anchors>
 					<TexCoords left="0.2" right="0.8" top="0" bottom="0.6" />
 				</Texture>
-				<Texture name="$parentToggleBorder" file="Interface\AddOns\ButtonForge-classic\Images\ToggleBorder.tga">
+				<Texture name="$parentToggleBorder" file="Interface\AddOns\ButtonForge\Images\ToggleBorder.tga">
 					<Size>
 						<AbsDimension x="26" y="26" />
 					</Size>