# HG changeset patch
# User madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
# Date 1338220492 0
# Node ID d186f8cd5000acbc560fbc0f316dac5448377747
# Parent  461854a2849c36f8d2500ac2d60e33b850e33f66
Renamed functions to avoid conflicts

diff -r 461854a2849c -r d186f8cd5000 CallbackFactory.lua
--- a/CallbackFactory.lua	Thu May 24 16:13:28 2012 +0000
+++ b/CallbackFactory.lua	Mon May 28 15:54:52 2012 +0000
@@ -18,7 +18,7 @@
 --~ along with this program; if not, write to the Free Software
 --~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-CallbackFactory = {
+CyborgMMO_CallbackFactory = {
 	new = function()
 		local self = {}
 		self.Frame = CreateFrame("Frame","CallbackFactoryFrame", UIParent);
@@ -36,92 +36,92 @@
 		self.RemoveCallback = function(name)
 			self.Callbacks[name] = nil
 		end
+		
+		self.GetCallback = function(callbackName)
+			local callback = nil
+			if("Map" == callbackName) then
+				callback = self.ToggleMap;
+			elseif("CharacterPage" == callbackName) then
+				callback = self.ToggleCharacterPage;
+			elseif("Spellbook" == callbackName) then
+				callback = self.ToggleSpellbook;
+			elseif("Macros" == callbackName) then
+				callback = self.ToggleMacros;
+			elseif("QuestLog" == callbackName) then
+				callback = self.ToggleQuests;
+			elseif("Achievement" == callbackName) then
+				callback = self.ToggleAchievements;
+			elseif("Inventory" == callbackName) then
+				callback = self.ToggleBags; 
+			end;
+			return callback;
+		end
 
+
+		self.ToggleMap = function()
+			ToggleFrame(WorldMapFrame)
+		end
+
+		self.ToggleCharacterPage = function()
+			ToggleCharacter("PaperDollFrame")
+		end
+
+		self.ToggleSpellbook = function()
+			ToggleFrame(SpellBookFrame)
+			if(SpellBookFrame:IsShown()) then
+				SpellbookMicroButton:SetButtonState("PUSHED", 1);
+			else
+				SpellbookMicroButton:SetButtonState("NORMAL");
+			end
+		end
+
+		self.ToggleMacros = function()
+			if(MacroFrame:IsShown() and MacroFrame:IsVisible()) then
+				HideUIPanel(MacroFrame);
+			else
+				ShowMacroFrame();
+			end
+		end
+
+		self.ToggleQuests = function()
+			ToggleFrame(QuestLogFrame);
+			if ( QuestLogFrame:IsShown() ) then
+				QuestLogMicroButton:SetButtonState("PUSHED", 1);
+			else
+				QuestLogMicroButton:SetButtonState("NORMAL");
+			end
+		end
+
+		self.ToggleAchievements = function()
+			ToggleAchievementFrame();
+			if ( AchievementFrame and AchievementFrame:IsShown() ) then
+				AchievementMicroButton:SetButtonState("PUSHED", 1);
+			else
+				if ( ( HasCompletedAnyAchievement() or IsInGuild() ) and CanShowAchievementUI() ) then
+					AchievementMicroButton:Enable();
+					AchievementMicroButton:SetButtonState("NORMAL");
+				else
+					AchievementMicroButton:Disable();
+				end
+			end
+		end
+
+		self.ToggleBags = function()
+			ToggleAllBags();
+		end
 		return self;
 	end,
 
 	m_Instance = nil,
 
 	Instance = function()
-		if(nil == CallbackFactory.m_Instance) then
-			CallbackFactory.m_Instance = CallbackFactory.new();
+		if(nil == CyborgMMO_CallbackFactory.m_Instance) then
+			CyborgMMO_CallbackFactory.m_Instance = CyborgMMO_CallbackFactory.new();
 		end
-		return CallbackFactory.m_Instance;
+		return CyborgMMO_CallbackFactory.m_Instance;
 	end
 
+
 }
 
 
-GetCallback = function(callbackName)
-	local callback = nil
-	if("Map" == callbackName) then
-		callback = ToggleMap;
-	elseif("CharacterPage" == callbackName) then
-		callback = ToggleCharacterPage;
-	elseif("Spellbook" == callbackName) then
-		callback = ToggleSpellbook;
-	elseif("Macros" == callbackName) then
-		callback = ToggleMacros;
-	elseif("QuestLog" == callbackName) then
-		callback = ToggleQuests;
-	elseif("Achievement" == callbackName) then
-		callback = ToggleAchievements;
-	elseif("Inventory" == callbackName) then
-		callback = ToggleBags; 
-	end;
-	return callback;
-end
-
-
-ToggleMap = function()
-	ToggleFrame(WorldMapFrame)
-end
-
-ToggleCharacterPage = function()
-	ToggleCharacter("PaperDollFrame")
-end
-
-ToggleSpellbook = function()
-	ToggleFrame(SpellBookFrame)
-	if(SpellBookFrame:IsShown()) then
-		SpellbookMicroButton:SetButtonState("PUSHED", 1);
-	else
-		SpellbookMicroButton:SetButtonState("NORMAL");
-	end
-
-end
-
-ToggleMacros = function()
-	if(MacroFrame:IsShown() and MacroFrame:IsVisible()) then
-		HideUIPanel(MacroFrame);
-	else
-		ShowMacroFrame();
-	end
-end
-
-ToggleQuests = function()
-	ToggleFrame(QuestLogFrame);
-	if ( QuestLogFrame:IsShown() ) then
-		QuestLogMicroButton:SetButtonState("PUSHED", 1);
-	else
-		QuestLogMicroButton:SetButtonState("NORMAL");
-	end
-end
-
-ToggleAchievements = function()
-	ToggleAchievementFrame();
-	if ( AchievementFrame and AchievementFrame:IsShown() ) then
-		AchievementMicroButton:SetButtonState("PUSHED", 1);
-	else
-		if ( ( HasCompletedAnyAchievement() or IsInGuild() ) and CanShowAchievementUI() ) then
-			AchievementMicroButton:Enable();
-			AchievementMicroButton:SetButtonState("NORMAL");
-		else
-			AchievementMicroButton:Disable();
-		end
-	end
-end
-
-ToggleBags = function()
-	ToggleAllBags();
-end
\ No newline at end of file
diff -r 461854a2849c -r d186f8cd5000 CyborgMMO7.lua
--- a/CyborgMMO7.lua	Thu May 24 16:13:28 2012 +0000
+++ b/CyborgMMO7.lua	Mon May 28 15:54:52 2012 +0000
@@ -22,7 +22,8 @@
 
 
 
-function LoadStrings(self)
+function CyborgMMO_LoadStrings(self)
+--~ 	msg("LoadStrings("..self:GetName()..") = "..StringTable[self:GetName()])
 	self:SetText(StringTable[self:GetName()]);
 end
 
@@ -33,8 +34,8 @@
 local Settings = nil;
 
 
-function CyborgMiniMapButton_Reposition(pos)
-	CyborgMiniMapFrame:SetPoint("TOPLEFT",
+function CyborgMMO_MiniMapButtonReposition(pos)
+	CyborgMMO_MiniMapFrame:SetPoint("TOPLEFT",
 		"Minimap",
 		"TOPLEFT",
 		52-(80*cos(pos)),
@@ -42,7 +43,7 @@
 end
 
 
-function CyborgMiniMapButton_OnUpdate()
+function CyborgMMO_MiniMapButtonOnUpdate()
 
 	local xpos,ypos = GetCursorPosition()
 	local xmin,ymin = Minimap:GetLeft(), Minimap:GetBottom()
@@ -57,14 +58,14 @@
 	end
 
 
-	CyborgMiniMapButton_Reposition(degrees)
+	CyborgMMO_MiniMapButtonReposition(degrees)
 end
 
-function MouseModeChange(mode)
-	local MiniMapTexture = getglobal("CyborgMiniMapButton_Icon")
-	local MiniMapGlowTexture = getglobal("CyborgMiniMapButton_IconGlow")
-	local OpenButtonTexture = getglobal("OpenButtonPage".."OpenMainForm"):GetNormalTexture();
-	local OpenButtonGlowTexture = getglobal("OpenButtonPage".."OpenMainForm"):GetHighlightTexture();
+function CyborgMMO_MouseModeChange(mode)
+	local MiniMapTexture = getglobal("CyborgMMO_MiniMapFrameButton_Icon")
+	local MiniMapGlowTexture = getglobal("CyborgMMO_MiniMapFrameButton_IconGlow")
+	local OpenButtonTexture = getglobal("CyborgMMO_OpenButtonPage".."OpenMainForm"):GetNormalTexture();
+	local OpenButtonGlowTexture = getglobal("CyborgMMO_OpenButtonPage".."OpenMainForm"):GetHighlightTexture();
 	if(1==mode) then
 		MiniMapTexture:SetVertexColor(1,0,0,1)
 		--MiniMapGlowTexture:SetVertexColor(1,0.26,0.26,.75);
@@ -83,7 +84,7 @@
 	end
 end
 
-function LoadWowCommands()
+function CyborgMMO_LoadWowCommands()
 	if (ProfileKeyBindings == nil) then
 		ProfileKeyBindings = {}
 		ProfileKeyBindings = InternationalWowCommands[GetLocale()]
@@ -91,26 +92,26 @@
 	WowCommands = ProfileKeyBindings 
 end
 
-function GetSaveData()
+function CyborgMMO_GetSaveData()
 	if(VarsLoaded) then
 		if (CyborgMMO7SaveData == nil) then
 			CyborgMMO7SaveData = {};
 			CyborgMMO7SaveData[SaveName] = {}
 		end
-		LoadWowCommands()
+		CyborgMMO_LoadWowCommands()
 		return CyborgMMO7SaveData[SaveName];
 	end
 	return nil;
 end
 
-function SetSaveData(data, index)
+function CyborgMMO_SetSaveData(data, index)
 	if(VarsLoaded) then
-		GetSaveData()[index] = data
+		CyborgMMO_GetSaveData()[index] = data
 		ProfileKeyBindings = WowCommands
 	end
 end
 
-function Event(self, event, ...)
+function CyborgMMO_Event(self, event, ...)
     if(event == "VARIABLES_LOADED") then
 		VarsLoaded = true;
     elseif(event == "PLAYER_ENTERING_WORLD") then
@@ -129,18 +130,18 @@
 	if(false == LoadBinding) then
 		if(VarsLoaded) then
 			if(EnteredWorld) then
-				local data = GetSaveData()
+				local data = CyborgMMO_GetSaveData()
 
-				RatPageModel.Instance().LoadData();
+				CyborgMMO_RatPageModel.Instance().LoadData();
 				LoadBinding = true;
 
 				ShowMacroFrame();
 				HideUIPanel(MacroFrame);
 
 
-				SetupModeCallbacks(1);
-				SetupModeCallbacks(2);
-				SetupModeCallbacks(3);
+				CyborgMMO_SetupModeCallbacks(1);
+				CyborgMMO_SetupModeCallbacks(2);
+				CyborgMMO_SetupModeCallbacks(3);
 
 
 				--Reload Slider values:
@@ -154,85 +155,82 @@
 
 				Settings = data["Settings"];
 
-				CyborgSizeSlider:SetValue(Settings["Cyborg"]);
-				SetOpenButtonSize(Settings["Cyborg"])
-				PluginSizeSlider:SetValue(Settings["Plugin"]);
-				SetMainPageSize(Settings["Plugin"]);
-
-				if(Settings["MiniMapButton"] == false) then
-					CyborgMiniMapButton:Hide();
-				end
+				CyborgMMO_OptionPageCyborgSizeSlider:SetValue(Settings["Cyborg"]);
+				CyborgMMO_SetOpenButtonSize(Settings["Cyborg"])
+				CyborgMMO_OptionPagePluginSizeSlider:SetValue(Settings["Plugin"]);
+				CyborgMMO_SetMainPageSize(Settings["Plugin"]);
+				
+				CyborgMMO_SetMiniMapButton(Settings["MiniMapButton"])
+				CyborgMMO_SetCyborgHeadButton(Settings["CyborgButton"])
 
 				local xmin,ymin = Minimap:GetLeft(), Minimap:GetBottom()
-				CyborgMiniMapButton_Reposition(math.deg(math.atan2(ymin,xmin)))
+				CyborgMMO_MiniMapButtonReposition(math.deg(math.atan2(ymin,xmin)))
 				-- Close the main window for now
-				Close();
+				CyborgMMO_Close();
 			end
 		end
 	end
 end
 
-function SetDefaultSettings()
-	OpenButtonPageOpenMainForm:ClearAllPoints();
-	MainPage:ClearAllPoints();
-	OpenButtonPageOpenMainForm:SetPoint("LEFT", UIParent, "LEFT", 0, 0);
-	MainPage:SetPoint("LEFT", UIParent, "LEFT", 0, 0);
+function CyborgMMO_SetDefaultSettings()
+	CyborgMMO_OpenButtonPageOpenMainForm:ClearAllPoints();
+	CyborgMMO_MainPage:ClearAllPoints();
+	CyborgMMO_OpenButtonPageOpenMainForm:SetPoint("LEFT", UIParent, "LEFT", 0, 0);
+	CyborgMMO_MainPage:SetPoint("LEFT", UIParent, "LEFT", 0, 0);
 
-	SetOpenButtonSize(0.75);
-	SetMainPageSize(0.75);
-	MiniMapButton:SetChecked();
-	SetMiniMapButton(true);
-	CyborgButton:SetChecked();
-	SetCyborgHeadButton(true);
+	CyborgMMO_SetOpenButtonSize(0.75);
+	CyborgMMO_SetMainPageSize(0.75);
+	CyborgMMO_SetMiniMapButton(true);
+	CyborgMMO_SetCyborgHeadButton(true);
 end
 
-function SetupModeCallbacks(modeNum)
 
+function CyborgMMO_SetupModeCallbacks(modeNum)
 	fn = function()
-		MouseModeChange(modeNum);
-		RatPageModel.Instance().SetMode(modeNum)
+		CyborgMMO_MouseModeChange(modeNum);
+		CyborgMMO_RatPageModel.Instance().SetMode(modeNum)
 	end
 
-	local buttonFrame, parentFrame, name = CallbackFactory.Instance().AddCallback(fn);
+	local buttonFrame, parentFrame, name = CyborgMMO_CallbackFactory.Instance().AddCallback(fn);
 	if(1 ~= SetOverrideBindingClick(parentFrame, true, Mode[modeNum], name, "LeftButton")) then
 		msg("Failed to Bind modeChange");
 	end
 end
 
-function Loaded()
-    MainPage:RegisterEvent("VARIABLES_LOADED");
-	MainPage:RegisterEvent("PLAYER_ENTERING_WORLD");
-    MainPage:RegisterEvent("PLAYER_ENTER_COMBAT");
+function CyborgMMO_Loaded()
+    CyborgMMO_MainPage:RegisterEvent("VARIABLES_LOADED");
+		CyborgMMO_MainPage:RegisterEvent("PLAYER_ENTERING_WORLD");
+    CyborgMMO_MainPage:RegisterEvent("PLAYER_ENTER_COMBAT");
 end
 
-function Close()
-    MainPage:Hide();
+function CyborgMMO_Close()
+    CyborgMMO_MainPage:Hide();
 	if(Settings["CyborgButton"] == true) then
-		OpenButtonPage:Show();
+		CyborgMMO_OpenButtonPage:Show();
 	end
 end
 
-function Open()
-	MainPage:Show();
-	RatQuickPage:Hide();
+function CyborgMMO_Open()
+	CyborgMMO_MainPage:Show();
+	CyborgMMO_RatQuickPage:Hide();
 	if(Settings["CyborgButton"] == true) then
-		OpenButtonPage:Show();
+		CyborgMMO_OpenButtonPage:Show();
 	end
 end
 
-function IsOpen()
-	if(MainPage:IsVisible() == 1) then
+function CyborgMMO_IsOpen()
+	if(CyborgMMO_MainPage:IsVisible() == 1) then
 		return true;
 	else
 		return false;
 	end
 end
 
-function Toggle()
-	if(IsOpen()) then
-		Close();
+function CyborgMMO_Toggle()
+	if(CyborgMMO_IsOpen()) then
+		CyborgMMO_Close();
 	else
-		Open();
+		CyborgMMO_Open();
 	end
 end
 
@@ -241,49 +239,52 @@
 	SendChatMessage(m, "CHANNEL", nil, id);
 end
 
-function SetMainPageSize(percent)
+function CyborgMMO_SetMainPageSize(percent)
 	if(VarsLoaded) then
 		if(EnteredWorld) then
-			MainPage:SetScale(percent);
+			CyborgMMO_MainPage:SetScale(percent);
 			Settings["Plugin"] = percent;
-			local data = GetSaveData()
+			local data = CyborgMMO_GetSaveData()
 			data["Settings"] = Settings
-			PluginSizeSlider:SetValue(percent);
+			CyborgMMO_OptionPagePluginSizeSlider:SetValue(percent);
 		end
 	end
 end
 
-function SetOpenButtonSize(percent)
+function CyborgMMO_SetOpenButtonSize(percent)
 	if(VarsLoaded) then
 		if(EnteredWorld) then
-			OpenButtonPage:SetScale(percent)
+			CyborgMMO_OpenButtonPage:SetScale(percent)
 			Settings["Cyborg"] = percent;
-			local data = GetSaveData()
+			local data = CyborgMMO_GetSaveData()
 			data["Settings"] = Settings
-			CyborgSizeSlider:SetValue(percent);
+			CyborgMMO_OptionPageCyborgSizeSlider:SetValue(percent);
 		end
 	end
 end
 
-function SetCyborgHeadButton(boolVal)
+function CyborgMMO_SetCyborgHeadButton(boolVal)
 	Settings["CyborgButton"] = boolVal;
+	CyborgMMO_OptionPageCyborgButton:SetChecked(boolVal);
 	if(Settings["CyborgButton"] == true) then
-		Close();
+		CyborgMMO_Close();
 	else
-		OpenButtonPage:Hide();
+		CyborgMMO_OpenButtonPage:Hide();
 	end
-	local data = GetSaveData()
+	local data = CyborgMMO_GetSaveData()
 	data["Settings"] = Settings
 end
 
-function SetMiniMapButton(boolVal)
-	Settings["MiniMapButton"] = boolVal;
+function CyborgMMO_SetMiniMapButton(boolVal)
+	Settings["MiniMapButton"] = boolVal
+	Settings["MiniMapButton"] = boolVal
+	CyborgMMO_OptionPageMiniMapButton:SetChecked(boolVal)
 	if(Settings["MiniMapButton"] == true) then
-		CyborgMiniMapButton:Show();
+		CyborgMMO_MiniMapFrameButton:Show()
 	else
-		CyborgMiniMapButton:Hide();
+		CyborgMMO_MiniMapFrameButton:Hide()
 	end
-	local data = GetSaveData()
+	local data = CyborgMMO_GetSaveData()
 	data["Settings"] = Settings
 end
 
diff -r 461854a2849c -r d186f8cd5000 Localisation.lua
--- a/Localisation.lua	Thu May 24 16:13:28 2012 +0000
+++ b/Localisation.lua	Mon May 28 15:54:52 2012 +0000
@@ -350,41 +350,42 @@
 
 InternationalStringTable = {
 	["enUS"] = {
-		BindingFrameExitButton="Close",
-		BindingFrameHeaderText="Please press the appropriate button",
-		CurrentBinding="Current Binding",
-		CyborgButtonTitle="Cyborg Button",
-		CyborgSizeSliderTitle="Cyborg Head Size",
-		MiniMapButtonTitle="MiniMap Button",
-		MouseRow10Name="Back Button",
-		MouseRow11Name="Button 3",
-		MouseRow12Name="Thumb Anticlockwise",
-		MouseRow13Name="Thumb Clockwise",
-		MouseRow1Name="Scroll Button",
-		MouseRow2Name="Forwards Button",
-		MouseRow3Name="Button 2",
-		MouseRow4Name="Hat Top",
-		MouseRow5Name="Precision Aim",
-		MouseRow6Name="Hat Bottom",
-		MouseRow7Name="Hat Left",
-		MouseRow8Name="Hat Right",
-		MouseRow9Name="Button 1",
-		MouseRowAName="Back Button",
-		MouseRowBName="Button 3",
-		MouseRowCName="Thumb Anticlockwise",
-		MouseRowDName="Thumb Clockwise",
-		OptionPageSetDefaults="Default",
-		OptionPageTitle="Cyborg MMO7",
-		PluginSizeSliderTitle="Interface Window Size",
-		Mode1="Mode 1",
-		Mode2="Mode 2",
-		Mode3="Mode 3"
+		CyborgMMO_BindingFrameExitButton="Close",
+		CyborgMMO_BindingFrameHeaderText="Please press the appropriate button",
+		CyborgMMO_CurrentBinding="Current Binding",
+		CyborgMMO_OptionPageCyborgButtonTitle="Cyborg Button",
+		CyborgMMO_OptionPageCyborgSizeSliderTitle="Cyborg Head Size",
+		CyborgMMO_OptionPageMiniMapButtonTitle="MiniMap Button",
+		CyborgMMO_OptionPageRebindMouseRow10Name="Back Button",
+		CyborgMMO_OptionPageRebindMouseRow11Name="Button 3",
+		CyborgMMO_OptionPageRebindMouseRow12Name="Thumb Anticlockwise",
+		CyborgMMO_OptionPageRebindMouseRow13Name="Thumb Clockwise",
+		CyborgMMO_OptionPageRebindMouseRow1Name="Scroll Button",
+		CyborgMMO_OptionPageRebindMouseRow2Name="Forwards Button",
+		CyborgMMO_OptionPageRebindMouseRow3Name="Button 2",
+		CyborgMMO_OptionPageRebindMouseRow4Name="Hat Top",
+		CyborgMMO_OptionPageRebindMouseRow5Name="Precision Aim",
+		CyborgMMO_OptionPageRebindMouseRow6Name="Hat Bottom",
+		CyborgMMO_OptionPageRebindMouseRow7Name="Hat Left",
+		CyborgMMO_OptionPageRebindMouseRow8Name="Hat Right",
+		CyborgMMO_OptionPageRebindMouseRow9Name="Button 1",
+		CyborgMMO_OptionPageRebindMouseRowAName="Back Button",
+		CyborgMMO_OptionPageRebindMouseRowBName="Button 3",
+		CyborgMMO_OptionPageRebindMouseRowCName="Thumb Anticlockwise",
+		CyborgMMO_OptionPageRebindMouseRowDName="Thumb Clockwise",
+		CyborgMMO_OptionPageSetDefaults="Default",
+		CyborgMMO_OptionPageTitle="Cyborg MMO7",
+		CyborgMMO_OptionPagePluginSizeSliderTitle="Interface Window Size",
+		CyborgMMO_OptionPageRebindMode1="Mode 1",
+		CyborgMMO_OptionPageRebindMode2="Mode 2",
+		CyborgMMO_OptionPageRebindMode3="Mode 3",
+		CyborgMMO_OptionPageRebindTitle="MMO Keybinds:-"
 	},
 	["frFR"] = {
 		CyborgButtonTitle="Bouton Cyborg",
 		MiniMapButtonTitle="Bouton minimap",
 		OptionPageTitle="Cyborg MMO7",
-		OptionPageSetDefaults="Par défaut",
+		CyborgMMO_OptionPageSetDefaults="Par défaut",
 		CyborgSizeSliderTitle="Dimension de la tête Cyborg",
 		PluginSizeSliderTitle="Dimension de la fenêtre d'interface"
 	},
@@ -392,7 +393,7 @@
 		CyborgButtonTitle="Cyborg-Taste",
 		MiniMapButtonTitle="MiniMap-Taste",
 		OptionPageTitle="Cyborg MMO7",
-		OptionPageSetDefaults="Standard",
+		CyborgMMO_OptionPageSetDefaults="Standard",
 		CyborgSizeSliderTitle="Größe des Cyborg-Kopfes",
 		PluginSizeSliderTitle="Größe des Schnittstellenfensters"
 	},
@@ -400,7 +401,7 @@
 		CyborgButtonTitle="Cyborg ??",
 		MiniMapButtonTitle="“????”??",
 		OptionPageTitle="Cyborg MMO7",
-		OptionPageSetDefaults="??",
+		CyborgMMO_OptionPageSetDefaults="??",
 		CyborgSizeSliderTitle="Cyborg ????",
 		PluginSizeSliderTitle="??????"
 	},
@@ -408,7 +409,7 @@
 		CyborgButtonTitle="Cyborg ??",
 		MiniMapButtonTitle="MiniMap ??",
 		OptionPageTitle="Cyborg MMO7",
-		OptionPageSetDefaults="??",
+		CyborgMMO_OptionPageSetDefaults="??",
 		CyborgSizeSliderTitle="Cyborg ???",
 		PluginSizeSliderTitle="??????"
 	},
@@ -416,7 +417,7 @@
 		CyborgButtonTitle="Botón Cyborg",
 		MiniMapButtonTitle="Botón Minimapa",
 		OptionPageTitle="Cyborg MMO7",
-		OptionPageSetDefaults="Predeterminado",
+		CyborgMMO_OptionPageSetDefaults="Predeterminado",
 		CyborgSizeSliderTitle="Tamaño de la cabeza de Cyborg",
 		PluginSizeSliderTitle="Tamaño de la ventana de la interfaz"
 	},
@@ -424,7 +425,7 @@
 		CyborgButtonTitle="Botón de Cyborg",
 		MiniMapButtonTitle="Botón de Minimapa",
 		OptionPageTitle="Cyborg MMO7",
-		OptionPageSetDefaults="Modo predeterminado",
+		CyborgMMO_OptionPageSetDefaults="Modo predeterminado",
 		CyborgSizeSliderTitle="Tamaño de la cabeza de Cyborg",
 		PluginSizeSliderTitle="Tamaño de la ventana de interfaz"
 	}
diff -r 461854a2849c -r d186f8cd5000 MainPage.xml
--- a/MainPage.xml	Thu May 24 16:13:28 2012 +0000
+++ b/MainPage.xml	Mon May 28 15:54:52 2012 +0000
@@ -22,10 +22,10 @@
 	-->
 	
 	<!-- UIButtonsTemplate-->
-	<Button name="WowCallbackButtonsTemplate" virtual="true" inherits="IconTemplate">
+	<Button name="CyborgMMO_TemplateCallbackButton" virtual="true" inherits="CyborgMMO_TemplateIcon">
 		<Scripts>
 			<OnLoad>
-				self = CallbackIcons.new(self);
+				self = CyborgMMO_CallbackIcons.new(self);
 			</OnLoad>
 			<OnClick>
 				self.OnClick();
@@ -40,7 +40,7 @@
 	</Button>
 
 	<!-- The Main Form -->
-	<Frame name="MainPage" movable="true" enableMouse="true" clampedtoscreen="true" frameStrata="MEDIUM">
+	<Frame name="CyborgMMO_MainPage" movable="true" enableMouse="true" clampedtoscreen="true" frameStrata="MEDIUM">
 		<TitleRegion>
 			<Size x="512" y="512"/>
 			<Anchors>
@@ -64,7 +64,7 @@
 		</Anchors>
 		<Layers>
 			<Layer level="BACKGROUND">
-			<Texture name="BackgroundTexture"
+			<Texture name="$parentBackgroundTexture"
 					   file="Interface\AddOns\CyborgMMO7\Graphics\ParchmentAndAllIcons.tga" >
 				<Size>
 				  <AbsDimension x="512"
@@ -81,7 +81,7 @@
 			  </Texture>
 			</Layer>
 			<Layer level="ARTWORK">
-			<Texture name="RatCalloutsTexture"
+			<Texture name="$parentRatCalloutsTexture"
 					   file="Interface\AddOns\CyborgMMO7\Graphics\Lines.tga" >
 
 				<Size>
@@ -100,7 +100,7 @@
 			</Layer>
 		</Layers>
 		<Frames>
-			<Button name="CharacterPage" inherits="WowCallbackButtonsTemplate" resize="false">
+			<Button name="$parentCharacterPage" inherits="CyborgMMO_TemplateCallbackButton" resize="false">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -109,7 +109,7 @@
 					</Anchor>
 				</Anchors>
 			</Button>
-			<Button name="Inventory" inherits="WowCallbackButtonsTemplate">
+			<Button name="$parentInventory" inherits="CyborgMMO_TemplateCallbackButton">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -118,7 +118,7 @@
 					</Anchor>
 				</Anchors>
 			</Button>
-			<Button name="Spellbook" inherits="WowCallbackButtonsTemplate">
+			<Button name="$parentSpellbook" inherits="CyborgMMO_TemplateCallbackButton">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -127,7 +127,7 @@
 					</Anchor>
 				</Anchors>
 			</Button>
-			<Button name="Macros" inherits="WowCallbackButtonsTemplate">
+			<Button name="$parentMacros" inherits="CyborgMMO_TemplateCallbackButton">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -136,7 +136,7 @@
 					</Anchor>
 				</Anchors>
 			</Button>
-			<Button name="Achievement" inherits="WowCallbackButtonsTemplate">
+			<Button name="$parentAchievement" inherits="CyborgMMO_TemplateCallbackButton">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -145,7 +145,7 @@
 					</Anchor>
 				</Anchors>
 			</Button>
-			<Button name="QuestLog" inherits="WowCallbackButtonsTemplate">
+			<Button name="$parentQuestLog" inherits="CyborgMMO_TemplateCallbackButton">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -154,7 +154,7 @@
 					</Anchor>
 				</Anchors>
 			</Button>
-			<Button name="Map" inherits="WowCallbackButtonsTemplate">
+			<Button name="$parentMap" inherits="CyborgMMO_TemplateCallbackButton">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -175,13 +175,13 @@
 					</Anchor>
 				</Anchors>
 				<Scripts>
-					<OnClick>Close()</OnClick>
+					<OnClick>CyborgMMO_Close()</OnClick>
 				</Scripts>
 				<NormalTexture file="Interface\AddOns\CyborgMMO7\Graphics\CloseButton.tga"/>
 				<PushedTexture file="Interface\AddOns\CyborgMMO7\Graphics\CloseButtonDown.tga"/>
 				<HighlightTexture file="Interface\AddOns\CyborgMMO7\Graphics\CloseButtonOver.tga" alpha=".5"/>
 			</Button>
-			<Frame name="defaultPage" inherits="RatPageTemplate">
+			<Frame name="$parentSlotList" inherits="CyborgMMO_TemplateRatPage">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -192,8 +192,8 @@
 			</Frame>
 		</Frames>
 		<Scripts>
-			<OnLoad>Loaded();</OnLoad>
-			<OnEvent>Event(this, event,...);</OnEvent>
+			<OnLoad>CyborgMMO_Loaded();</OnLoad>
+			<OnEvent>CyborgMMO_Event(this, event,...);</OnEvent>
 		</Scripts>
 	</Frame>
 </Ui>
diff -r 461854a2849c -r d186f8cd5000 OpenButtonPage.xml
--- a/OpenButtonPage.xml	Thu May 24 16:13:28 2012 +0000
+++ b/OpenButtonPage.xml	Mon May 28 15:54:52 2012 +0000
@@ -20,7 +20,7 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. 
 	-->
-	<Frame name="OpenButtonPage" movable="true" clampedtoscreen="true" enableMouse="true" hidden="true">
+	<Frame name="CyborgMMO_OpenButtonPage" movable="true" clampedtoscreen="true" enableMouse="true" hidden="true">
 			<TitleRegion>
 				<Size x="75" y="75"/>
 				<Anchors>
@@ -58,7 +58,7 @@
 					self:RegisterForDrag("LeftButton","RightButton")
 				</OnLoad>
 				<OnClick>
-					Toggle();
+					CyborgMMO_Toggle();
 
 				</OnClick>
 				<OnDragStart>
@@ -91,7 +91,7 @@
 		</Frames>
 	</Frame>
 
-	<Frame name="CyborgMiniMapFrame" parent="Minimap" enableMouse="true" hidden="false" frameStrata="LOW">
+	<Frame name="CyborgMMO_MiniMapFrame" parent="Minimap" enableMouse="true" hidden="false" frameStrata="LOW">
 		<Size>
 			<AbsDimension x="32" y="32"/>
 		</Size>
@@ -103,7 +103,7 @@
 			</Anchor>
 		</Anchors>
 		<Frames>
-			<Button name="CyborgMiniMapButton">
+			<Button name="$parentButton">
 				<Size>
 					<AbsDimension x="33" y="33"/>
 				</Size>
@@ -117,7 +117,7 @@
 				<HighlightTexture alphaMode="ADD" file="Interface\Minimap\UI-Minimap-ZoomButton-Highlight"/>
 				<Layers>
 					<Layer level="BACKGROUND">
-						<Texture name="CyborgMiniMapButton_Icon" file="Interface\AddOns\CyborgMMO7\Graphics\Cyborg.tga">
+						<Texture name="$parent_Icon" file="Interface\AddOns\CyborgMMO7\Graphics\Cyborg.tga">
 							<Size>
 								<AbsDimension x="22" y="22"/>
 							</Size>
@@ -130,7 +130,7 @@
 						</Texture>
 					</Layer>
 					<Layer level="ARTWORK">
-						<Texture name="CyborgMiniMapButton_IconGlow" file="Interface\AddOns\CyborgMMO7\Graphics\CyborgGlow.tga">
+						<Texture name="$parent_IconGlow" file="Interface\AddOns\CyborgMMO7\Graphics\CyborgGlow.tga">
 							<Size>
 								<AbsDimension x="22" y="22"/>
 							</Size>
@@ -160,22 +160,22 @@
 					<OnMouseDown>
 					</OnMouseDown>
 					<OnMouseUp>
-						Toggle();
-						if(false == IsOpen()) then
-							RatQuickPage:Show();
+						CyborgMMO_Toggle();
+						if(false == CyborgMMO_IsOpen()) then
+							CyborgMMO_RatQuickPage:Show();
 						end
 					 </OnMouseUp>
 					<OnEnter>
-						if(false == IsOpen()) then
-							RatQuickPage:Show();
+						if(false == CyborgMMO_IsOpen()) then
+							CyborgMMO_RatQuickPage:Show();
 						end
 					</OnEnter>
 					<OnLeave>
-						RatQuickPage:Hide();
+						CyborgMMO_RatQuickPage:Hide();
 					</OnLeave>
 					<OnUpdate>
 						if(self:IsDragging()) then
-							CyborgMiniMapButton_OnUpdate();
+							CyborgMMO_MiniMapButtonOnUpdate();
 						end
 					</OnUpdate>
 				</Scripts>
diff -r 461854a2849c -r d186f8cd5000 OptionPage.xml
--- a/OptionPage.xml	Thu May 24 16:13:28 2012 +0000
+++ b/OptionPage.xml	Mon May 28 15:54:52 2012 +0000
@@ -56,11 +56,11 @@
 	</OnLoad>
 	<OnEvent>
 		if(event == "VARIABLES_LOADED") then
-			GetBindingButtonText(self:GetName());
+			CyborgMMO_GetBindingButtonText(self:GetName());
 		end
 	</OnEvent>
 	<OnClick>
-		BindButton(self:GetName())
+		CyborgMMO_BindButton(self:GetName())
 	</OnClick>
 	</Scripts>
 </Button>
@@ -136,16 +136,16 @@
 		</Frames>
 		<Scripts>
 			<OnLoad>
-				LoadStrings(getglobal(self:GetName().."Name"));
+				CyborgMMO_LoadStrings(getglobal(self:GetName().."Name"));
 			</OnLoad>
 		</Scripts>
 	</Frame>
 
 <!--Custom keybinds -->
-	<Frame name="MouseRebind"  virtual="true">
+	<Frame name="CyborgMMO_MouseRebind"  virtual="true">
 		<Layers>
 			<Layer level="ARTWORK">
-				<FontString name="MouseRebindTitle" inherits="GameFontNormalLarge" text="MMO Keybinds:-">
+				<FontString name="$parentTitle" inherits="GameFontNormalLarge" text="CyborgMMO_MouseRebindTitle">
 					<Anchors>
 						<Anchor point="TOPLEFT">
 							<Offset>
@@ -154,7 +154,7 @@
 						</Anchor>
 					</Anchors>
 				</FontString>
-				<FontString name="Mode1" inherits="GameFontNormal" text="Mode 1">
+				<FontString name="$parentMode1" inherits="GameFontNormal" text="Mode Num">
 					<Anchors>
 						<Anchor point="TOPLEFT">
 							<Offset>
@@ -163,7 +163,7 @@
 						</Anchor>
 					</Anchors>
 				</FontString>
-				<FontString name="Mode2" inherits="GameFontNormal" text="Mode 2">
+				<FontString name="$parentMode2" inherits="GameFontNormal" text="Mode Num">
 					<Anchors>
 						<Anchor point="TOPLEFT">
 							<Offset>
@@ -172,7 +172,7 @@
 						</Anchor>
 					</Anchors>
 				</FontString>
-				<FontString name="Mode3" inherits="GameFontNormal" text="Mode 3">
+				<FontString name="$parentMode3" inherits="GameFontNormal" text="Mode Num">
 					<Anchors>
 						<Anchor point="TOPLEFT">
 							<Offset>
@@ -184,7 +184,7 @@
 			</Layer>
 		</Layers>
 		<Frames>
-			<Frame name="MouseRow1" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow1" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="$parent">
 						<Offset>
@@ -193,108 +193,108 @@
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow2" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow2" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow1">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow1">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow3" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow3" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow2">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow2">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow4" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow4" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow3">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow3">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow5" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow5" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow4">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow4">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow6" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow6" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow5">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow5">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow7" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow7" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow6">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow6">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow8" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow8" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow7">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow7">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow9" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow9" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow8">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow8">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRowA" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRowA" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow9">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow9">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRowB" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRowB" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRowA">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRowA">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRowC" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRowC" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRowB">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRowB">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRowD" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRowD" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRowC">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRowC">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
@@ -302,11 +302,9 @@
 				</Anchors>
 			</Frame>
 		</Frames>
-		<OnLoad>
-		</OnLoad>
 	</Frame>
 
-	<Frame name="OptionPage">
+	<Frame name="CyborgMMO_OptionPage">
 		<Layers>
 			<Layer level="ARTWORK">
 				<FontString name="$parentTitle" inherits="GameFontNormalLarge">
@@ -322,7 +320,7 @@
 		</Layers>
 
 		<Frames>
-			<CheckButton name="MiniMapButton" inherits="UICheckButtonTemplate" checked="true">
+			<CheckButton name="$parentMiniMapButton" inherits="UICheckButtonTemplate" checked="true">
 				<Size>
 					<AbsDimension x="32" y="32"/>
 				</Size>
@@ -348,25 +346,25 @@
 				</Layers>
 				<Scripts>
 					<OnLoad>
-						LoadStrings(getglobal(self:GetName().."Title"));
+						CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"));
 					</OnLoad>
 					<OnClick>
 						if(self:GetChecked() == 1) then
-							SetMiniMapButton(true)
+							CyborgMMO_SetMiniMapButton(true)
 						else
-							SetMiniMapButton(false)
+							CyborgMMO_SetMiniMapButton(false)
 						end
 					</OnClick>
 				</Scripts>
 			</CheckButton>
 
 
-			<CheckButton name="CyborgButton" inherits="UICheckButtonTemplate" checked="true">
+			<CheckButton name="$parentCyborgButton" inherits="UICheckButtonTemplate" checked="true">
 				<Size>
 					<AbsDimension x="32" y="32"/>
 				</Size>
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MiniMapButton">
+					<Anchor point="TOPLEFT" relativeTo="$parentMiniMapButton">
 						<Offset>
 							<AbsDimension x="0" y="-30"/>
 						</Offset>
@@ -387,13 +385,13 @@
 				</Layers>
 				<Scripts>
 					<OnLoad>
-						LoadStrings(getglobal(self:GetName().."Title"));
+						CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"));
 					</OnLoad>
 					<OnClick>
 						if(self:GetChecked() == 1) then
-							SetCyborgHeadButton(true)
+							CyborgMMO_SetCyborgHeadButton(true)
 						else
-							SetCyborgHeadButton(false)
+							CyborgMMO_SetCyborgHeadButton(false)
 						end
 					</OnClick>
 				</Scripts>
@@ -412,15 +410,15 @@
 				</Anchors>
 				<Scripts>
 					<OnLoad>
-						LoadStrings(getglobal(self:GetName()));
+						CyborgMMO_LoadStrings(getglobal(self:GetName()));
 					</OnLoad>
 					<OnClick>
-						SetDefaultSettings();
+						CyborgMMO_SetDefaultSettings();
 					</OnClick>
 				</Scripts>
 			</Button>
 			
-			<Frame name="Rebind" inherits="MouseRebind">
+			<Frame name="$parentRebind" inherits="CyborgMMO_MouseRebind">
 				<Size>
 					<AbsDimension x="45" y="60" />
 				</Size>
@@ -431,9 +429,17 @@
 						</Offset>
 					</Anchor>
 				</Anchors>
+				<Scripts>
+					<OnLoad>
+						CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"))
+						CyborgMMO_LoadStrings(getglobal(self:GetName().."Mode1"))
+						CyborgMMO_LoadStrings(getglobal(self:GetName().."Mode2"))
+						CyborgMMO_LoadStrings(getglobal(self:GetName().."Mode3"))
+					</OnLoad>
+				</Scripts>
 			</Frame>
 			
-			<Frame name="CyborgSize">
+			<Frame name="$parentCyborgSize">
 				<Size>
 					<AbsDimension x="180" y="32" />
 				</Size>
@@ -490,19 +496,19 @@
 						</ThumbTexture>
 						<Scripts>
 							<OnLoad>
-								LoadStrings(getglobal(self:GetName().."Title"))
+								CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"))
 							</OnLoad>
-							<OnValueChanged>SetOpenButtonSize(self:GetValue())</OnValueChanged>
+							<OnValueChanged>CyborgMMO_SetOpenButtonSize(self:GetValue())</OnValueChanged>
 						</Scripts>
 					</Slider>
 				</Frames>
 			</Frame>
-			<Frame name="PluginSize">
+			<Frame name="$parentPluginSize">
 				<Size>
 					<AbsDimension x="180" y="32" />
 				</Size>
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="CyborgSize">
+					<Anchor point="TOPLEFT" relativeTo="$parentCyborgSize">
 						<Offset>
 							<AbsDimension x="200" y="0"/>
 						</Offset>
@@ -554,10 +560,10 @@
 						</ThumbTexture>
 						<Scripts>
 							<OnLoad>
-								LoadStrings(getglobal(self:GetName().."Title"));
+								CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"));
 							</OnLoad>
 							<OnValueChanged>
-								SetMainPageSize(self:GetValue())
+								CyborgMMO_SetMainPageSize(self:GetValue())
 							</OnValueChanged>
 						</Scripts>
 					  </Slider>
@@ -567,14 +573,14 @@
 
 		<Scripts>
 			<OnLoad>
-				LoadStrings(getglobal(self:GetName().."Title"));
+				CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"));
 				msg("Loaded Option Page");
-				self = OptionView.new(self);
+				self = CyborgMMO_OptionView.new(self);
 			</OnLoad>
 		</Scripts>
 	</Frame>
 	
-	<Button name="BindingFrame" toplevel="true" parent="UIParent" frameStrata="DIALOG" movable="true" enableMouse="true" hidden="true" enableKeyboard="true">
+	<Button name="CyborgMMO_BindingFrame" toplevel="true" parent="UIParent" frameStrata="DIALOG" movable="true" enableMouse="true" hidden="true" enableKeyboard="true">
     <Size>
       <AbsDimension x="400" y="200"/>
     </Size>
@@ -664,10 +670,6 @@
           </Anchor>
         </Anchors>
         <Scripts>
-				<OnLoad>
-					LoadStrings(getglobal("BindingFrameHeaderText"))
-					LoadStrings(getglobal("BindingFrameExitButton"))
-				</OnLoad>
           <OnClick>
             HideUIPanel(self:GetParent());
           </OnClick>
@@ -677,19 +679,21 @@
 
     <Scripts>
       <OnLoad>
+			CyborgMMO_LoadStrings(getglobal(self:GetName().."HeaderText"))
+			CyborgMMO_LoadStrings(getglobal(self:GetName().."ExitButton"))
         self:RegisterForClicks("AnyUp");
       </OnLoad>
       <OnClick>
-        BindingFrame_OnKeyDown(self, button);
+        CyborgMMO_BindingFrameOnKeyDown(self, button);
       </OnClick>
       <OnKeyDown>
-        BindingFrame_OnKeyDown(self, key);
+        CyborgMMO_BindingFrameOnKeyDown(self, key);
       </OnKeyDown>
       <OnMouseWheel>
         if (delta > 0) then
-          BindingFrame_OnKeyDown(self, "MOUSEWHEELUP");
+          CyborgMMO_BindingFrameOnKeyDown(self, "MOUSEWHEELUP");
         else
-          BindingFrame_OnKeyDown(self, "MOUSEWHEELDOWN");
+          CyborgMMO_BindingFrameOnKeyDown(self, "MOUSEWHEELDOWN");
         end
       </OnMouseWheel>
     </Scripts>
diff -r 461854a2849c -r d186f8cd5000 OptionView.lua
--- a/OptionView.lua	Thu May 24 16:13:28 2012 +0000
+++ b/OptionView.lua	Mon May 28 15:54:52 2012 +0000
@@ -18,7 +18,7 @@
 --~ along with this program; if not, write to the Free Software
 --~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-OptionView = {
+CyborgMMO_OptionView = {
 	new = function(self)
         self.name = "Cyborg MMO7 Plugin"
         InterfaceOptions_AddCategory(self);
@@ -29,39 +29,39 @@
 
 local lastButton = nil
 
-function BindButton(name)
+function CyborgMMO_BindButton(name)
 	lastButton = name
-	local index = GetButtonIndex(name)
+	local index = CyborgMMO_GetButtonIndex(name)
 	local mode = 1
 	while(index > 13) do
 		mode = mode + 1
 		index = index - 13
 	end
-	local buttonStr =  StringTable[("MouseRow"..index.."Name")]
+	local buttonStr =  StringTable[("CyborgMMO_OptionPageRebindMouseRow"..index.."Name")]
 	
-	getglobal("BindingFrameButtonName"):SetText(buttonStr.." Mode "..mode)
-	getglobal("BindingFrameKey"):SetText(StringTable["CurrentBinding"].." "..WowCommands[GetButtonIndex(lastButton)])
-	BindingFrame:Show()
+	getglobal("CyborgMMO_BindingFrameButtonName"):SetText(buttonStr.." Mode "..mode)
+	getglobal("CyborgMMO_BindingFrameKey"):SetText(StringTable["CyborgMMO_CurrentBinding"].." "..WowCommands[CyborgMMO_GetButtonIndex(lastButton)])
+	CyborgMMO_BindingFrame:Show()
 	
 end
 
-function GetBindingButtonText(name)
+function CyborgMMO_GetBindingButtonText(name)
 	if(nil == WowCommands) then
-		LoadWowCommands();
+		CyborgMMO_LoadWowCommands();
 	end
 	
-	local binding = WowCommands[GetButtonIndex(name)]
+	local binding = WowCommands[CyborgMMO_GetButtonIndex(name)]
 	getglobal(name):SetText(binding)
 end
 
-function GetButtonIndex(name)
+function CyborgMMO_GetButtonIndex(name)
 	local row,mode = string.find(name,"Mode")
 	local modeStr = string.sub(name, mode +1,mode+2)
 	local rowStr = string.sub(name, row-1,row-1)
-	return (GetNumberFromHexLetter(rowStr) + ((GetNumberFromHexLetter(modeStr) - 1) * 13))
+	return (CyborgMMO_GetNumberFromHexLetter(rowStr) + ((CyborgMMO_GetNumberFromHexLetter(modeStr) - 1) * 13))
 end
 
-function GetNumberFromHexLetter(str)
+function CyborgMMO_GetNumberFromHexLetter(str)
 	local number = 0
 	if("A" == str) then
 		number = 10
@@ -81,17 +81,17 @@
 	return number
 end
 
-function SetNewKeybind(keyOrButton)
-	local previous = WowCommands[GetButtonIndex(lastButton)]
-	WowCommands[GetButtonIndex(lastButton)] = keyOrButton;
-	GetBindingButtonText(lastButton);
-	BindingFrame:Hide()
-	RatPageModel.Instance().LoadData()
+function CyborgMMO_SetNewKeybind(keyOrButton)
+	local previous = WowCommands[CyborgMMO_GetButtonIndex(lastButton)]
+	WowCommands[CyborgMMO_GetButtonIndex(lastButton)] = keyOrButton;
+	CyborgMMO_GetBindingButtonText(lastButton);
+	CyborgMMO_BindingFrame:Hide()
+	CyborgMMO_RatPageModel.Instance().LoadData()
 end
 
-function BindingFrame_OnKeyDown(self, keyOrButton)
+function CyborgMMO_BindingFrameOnKeyDown(self, keyOrButton)
    if keyOrButton=="ESCAPE" then
-      BindingFrame:Hide()
+      CyborgMMO_BindingFrame:Hide()
       return
    end
    
@@ -192,6 +192,6 @@
       return;
    end
 	 
-	 SetNewKeybind(keyPressed)
+	 CyborgMMO_SetNewKeybind(keyPressed)
 	 
 end
diff -r 461854a2849c -r d186f8cd5000 RatPage.xml
--- a/RatPage.xml	Thu May 24 16:13:28 2012 +0000
+++ b/RatPage.xml	Mon May 28 15:54:52 2012 +0000
@@ -21,7 +21,7 @@
 	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. 
 	-->
 	<!-- IconTemplate-->
-	<Button name="IconTemplate" virtual="true" inherits="SecureActionButtonTemplate">
+	<Button name="CyborgMMO_TemplateIcon" virtual="true" inherits="SecureActionButtonTemplate">
 		<Size>
 			<AbsDimension x="32" y="32"/>
 		</Size>
@@ -48,10 +48,10 @@
 		<HighlightTexture alphaMode="ADD" file="Interface\Buttons\ButtonHilight-Square"/>
 	</Button>
 
-	<Button name="SlotTemplate" inherits="IconTemplate" virtual="true">
+	<Button name="CyborgMMO_TemplateSlot" inherits="CyborgMMO_TemplateIcon" virtual="true">
 		<Scripts>
 			<OnLoad>
-				self = SlotView.new(self);
+				self = CyborgMMO_SlotView.new(self);
 			</OnLoad>
 			<OnMouseDown>
 				if(button == "LeftButton") then
@@ -64,11 +64,10 @@
 
 
 
-	<Button name="ModeTemplate" virtual="true">
+	<Button name="CyborgMMO_TemplateMode" virtual="true">
 		<Size>
 			<AbsDimension x="127" y="63" />
 		</Size>
-
 		<ButtonText name="$parentText">
 			<FontHeight>
 				<AbsValue val="10" />
@@ -79,7 +78,7 @@
 		<DisabledFont style="GameFontDisable" />
 		<Scripts>
 			<OnLoad>
-				self = ModeView.new(self);
+				self = CyborgMMO_ModeView.new(self);
 			</OnLoad>
 			<OnClick>
 				self.Clicked();
@@ -88,7 +87,7 @@
 	</Button>
 
 	<!-- The Rat Page Frame -->
-	<Frame name="RatPageTemplate" virtual="true">
+	<Frame name="CyborgMMO_TemplateRatPage" virtual="true">
 		<Size>
 			<AbsDimension x="512" y="512"/>
 		</Size>
@@ -101,7 +100,7 @@
 		</Anchors>
 		<!-- Our Slot Locations -->
 		<Frames>
-			<CheckButton name="$parentSlot1" inherits="SlotTemplate" id="1">
+			<CheckButton name="$parentSlot1" inherits="CyborgMMO_TemplateSlot" id="1">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -126,7 +125,7 @@
 					</Layer>
 				</Layers>
 			</CheckButton>
-			<CheckButton name="$parentSlot2" inherits="SlotTemplate" id="2">
+			<CheckButton name="$parentSlot2" inherits="CyborgMMO_TemplateSlot" id="2">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -151,7 +150,7 @@
 					</Layer>
 				</Layers>
 			</CheckButton>
-			<CheckButton name="$parentSlot3" inherits="SlotTemplate" id="3">
+			<CheckButton name="$parentSlot3" inherits="CyborgMMO_TemplateSlot" id="3">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -176,7 +175,7 @@
 					</Layer>
 				</Layers>
 			</CheckButton>
-			<CheckButton name="$parentSlot4" inherits="SlotTemplate" id="4">
+			<CheckButton name="$parentSlot4" inherits="CyborgMMO_TemplateSlot" id="4">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -201,7 +200,7 @@
 					</Layer>
 				</Layers>
 			</CheckButton>
-			<CheckButton name="$parentSlot5" inherits="SlotTemplate" id="5">
+			<CheckButton name="$parentSlot5" inherits="CyborgMMO_TemplateSlot" id="5">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -226,7 +225,7 @@
 					</Layer>
 				</Layers>
 			</CheckButton>
-			<CheckButton name="$parentSlot6" inherits="SlotTemplate" id="6">
+			<CheckButton name="$parentSlot6" inherits="CyborgMMO_TemplateSlot" id="6">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -251,7 +250,7 @@
 					</Layer>
 				</Layers>
 			</CheckButton>
-			<CheckButton name="$parentSlot7" inherits="SlotTemplate" id="7">
+			<CheckButton name="$parentSlot7" inherits="CyborgMMO_TemplateSlot" id="7">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -276,7 +275,7 @@
 					</Layer>
 				</Layers>
 			</CheckButton>
-			<CheckButton name="$parentSlot8" inherits="SlotTemplate" id="8">
+			<CheckButton name="$parentSlot8" inherits="CyborgMMO_TemplateSlot" id="8">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -301,7 +300,7 @@
 					</Layer>
 				</Layers>
 			</CheckButton>
-			<CheckButton name="$parentSlot9" inherits="SlotTemplate" id="9">
+			<CheckButton name="$parentSlot9" inherits="CyborgMMO_TemplateSlot" id="9">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -326,7 +325,7 @@
 					</Layer>
 				</Layers>
 			</CheckButton>
-			<CheckButton name="$parentSlot10" inherits="SlotTemplate" id="10">
+			<CheckButton name="$parentSlot10" inherits="CyborgMMO_TemplateSlot" id="10">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -351,7 +350,7 @@
 					</Layer>
 				</Layers>
 			</CheckButton>
-			<CheckButton name="$parentSlot11" inherits="SlotTemplate" id="11">
+			<CheckButton name="$parentSlot11" inherits="CyborgMMO_TemplateSlot" id="11">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -376,7 +375,7 @@
 					</Layer>
 				</Layers>
 			</CheckButton>
-			<CheckButton name="$parentSlot12" inherits="SlotTemplate" id="12">
+			<CheckButton name="$parentSlot12" inherits="CyborgMMO_TemplateSlot" id="12">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -401,7 +400,7 @@
 					</Layer>
 				</Layers>
 			</CheckButton>
-			<CheckButton name="$parentSlot13" inherits="SlotTemplate" id="13">
+			<CheckButton name="$parentSlot13" inherits="CyborgMMO_TemplateSlot" id="13">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -426,7 +425,7 @@
 					</Layer>
 				</Layers>
 			</CheckButton>
-			<Button name="Mode1" inherits="ModeTemplate" id="1">
+			<Button name="Mode1" inherits="CyborgMMO_TemplateMode" id="1">
 				<NormalTexture file="Interface\AddOns\CyborgMMO7\Graphics\Mode1Down.tga" >
 				</NormalTexture>
 				<PushedTexture file="Interface\AddOns\CyborgMMO7\Graphics\Mode1Selected.tga">
@@ -441,7 +440,7 @@
 					</Anchor>
 				</Anchors>
 			</Button>
-			<Button name="Mode2" inherits="ModeTemplate" id="2">
+			<Button name="Mode2" inherits="CyborgMMO_TemplateMode" id="2">
 				<NormalTexture file="Interface\AddOns\CyborgMMO7\Graphics\Mode2Down.tga" >
 				</NormalTexture>
 				<PushedTexture file="Interface\AddOns\CyborgMMO7\Graphics\Mode2Selected.tga">
@@ -456,7 +455,7 @@
 					</Anchor>
 				</Anchors>
 			</Button>
-			<Button name="Mode3" inherits="ModeTemplate" id="3">
+			<Button name="Mode3" inherits="CyborgMMO_TemplateMode" id="3">
 				<NormalTexture file="Interface\AddOns\CyborgMMO7\Graphics\Mode3Down.tga" >
 				</NormalTexture>
 				<PushedTexture file="Interface\AddOns\CyborgMMO7\Graphics\Mode3Selected.tga">
@@ -474,7 +473,7 @@
 		</Frames>
 		<Scripts>
 			<OnLoad>
-				self = RatPageView.new(self);
+				self = CyborgMMO_RatPageView.new(self);
 			</OnLoad>
 		</Scripts>
 	</Frame>
diff -r 461854a2849c -r d186f8cd5000 RatPageController.lua
--- a/RatPageController.lua	Thu May 24 16:13:28 2012 +0000
+++ b/RatPageController.lua	Mon May 28 15:54:52 2012 +0000
@@ -18,15 +18,15 @@
 --~ along with this program; if not, write to the Free Software
 --~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-RatPageController = {
+CyborgMMO_RatPageController = {
 	new = function()
 		local self = {};
-		RatPageModel.Instance().SetMode(1);
+		CyborgMMO_RatPageModel.Instance().SetMode(1);
 
 		self.SlotClicked = function(slot)
 			local slotObject = nil
-			slotObject = RatPageModel.Instance().GetObjectOnButton(slot.Id)
-			RatPageModel.Instance().SetObjectOnButton(slot.Id, RatPageModel.Instance().GetMode(), self.GetCursorObject());
+			slotObject = CyborgMMO_RatPageModel.Instance().GetObjectOnButton(slot.Id)
+			CyborgMMO_RatPageModel.Instance().SetObjectOnButton(slot.Id, CyborgMMO_RatPageModel.Instance().GetMode(), self.GetCursorObject());
 
 			if(slotObject ~= nil) then
 				slotObject.Pickup();
@@ -36,14 +36,14 @@
 
 		self.ModeClicked = function(mode)
 			msg("Setting mode "..tostring(mode.Id));
-			RatPageModel.Instance().SetMode(mode.Id);
+			CyborgMMO_RatPageModel.Instance().SetMode(mode.Id);
 		end
 
 		self.GetCursorObject = function()
 			local cursorObject = nil;
 			if(nil ~= GetCursorInfo()) then
 				local type, detail, subdetail = GetCursorInfo();
-				cursorObject = WowObject.Create(type, detail, subdetail);
+				cursorObject = CyborgMMO_WowObject.Create(type, detail, subdetail);
 				ClearCursor();
 			end
 			return cursorObject;
@@ -51,7 +51,7 @@
 		
 		self.CallbackDropped = function(callbackObject)
 			local slot = nil;
-			local observers = RatPageModel.Instance().GetAllObservers();
+			local observers = CyborgMMO_RatPageModel.Instance().GetAllObservers();
 			for i = 1, (# observers) do
 				if(MouseIsOver(observers[i])) then
 					slot = observers[i];
@@ -59,7 +59,7 @@
 				end
 			end
 			if(nil ~= slot) then 
-				RatPageModel.Instance().SetObjectOnButton(slot.Id, RatPageModel.Instance().GetMode(), callbackObject.wowObject);
+				CyborgMMO_RatPageModel.Instance().SetObjectOnButton(slot.Id, CyborgMMO_RatPageModel.Instance().GetMode(), callbackObject.wowObject);
 			end
 		end
 		
@@ -78,9 +78,9 @@
 	m_Instance = nil,
 
 	Instance = function()
-		if(nil == RatPageController.m_Instance) then
-			RatPageController.m_Instance = RatPageController.new();
+		if(nil == CyborgMMO_RatPageController.m_Instance) then
+			CyborgMMO_RatPageController.m_Instance = CyborgMMO_RatPageController.new();
 		end
-		return RatPageController.m_Instance;
+		return CyborgMMO_RatPageController.m_Instance;
 	end
 }
diff -r 461854a2849c -r d186f8cd5000 RatPageModel.lua
--- a/RatPageModel.lua	Thu May 24 16:13:28 2012 +0000
+++ b/RatPageModel.lua	Mon May 28 15:54:52 2012 +0000
@@ -23,7 +23,7 @@
 
 local MIDDLEMOUSE = 1;
 
-RatPageModel = {
+CyborgMMO_RatPageModel = {
 	new = function()
 	local self = {}
 		self.m_Mode = 1;
@@ -54,7 +54,7 @@
 
 		self.LoadData = function()
 			msg("Loading...")
-			local data = GetSaveData();
+			local data = CyborgMMO_GetSaveData();
 
 
 			if (nil == data["Rat"]) then
@@ -67,10 +67,10 @@
 				for mode = 1,RAT7.MODES do
 					for button = 1, RAT7.BUTTONS do
 						if(self.Data[mode][button] ~= nil) then
-							object = WowObject.Create(self.Data[mode][button].Type, self.Data[mode][button].Detail, self.Data[mode][button].Subdetail);
+							object = CyborgMMO_WowObject.Create(self.Data[mode][button].Type, self.Data[mode][button].Detail, self.Data[mode][button].Subdetail);
 							self.SetObjectOnButtonNoUpdate(button, mode, object);
 						else
-							object = WowObject.Create("", "", "");
+							object = CyborgMMO_WowObject.Create("", "", "");
 							self.SetObjectOnButtonNoUpdate(button, mode, object);
 							self.Data[mode][button] = object;
 						end
@@ -82,7 +82,7 @@
 
 		self.SaveData = function()
 			msg("Saving...")
-			SetSaveData(self.Data, "Rat");
+			CyborgMMO_SetSaveData(self.Data, "Rat");
 		end
 
 		self.SetMode = function(mode)
@@ -114,12 +114,12 @@
 				object.SetBinding(WowCommands[((mode-1)*RAT7.BUTTONS)+button]);
 				if("callback" == object.Type) then
 					msg("trying to set texture")
-					local slot = getglobal("defaultPageSlot"..button);
+					local slot = getglobal("CyborgMMO_MainPageSlotListSlot"..button);
 					slot:SetNormalTexture(object.Texture)
 				end
 			else
 				msg("clearing "..button)
-				WowObject.ClearBinding(WowCommands[((mode-1)*RAT7.BUTTONS)+button])
+				CyborgMMO_WowObject.ClearBinding(WowCommands[((mode-1)*RAT7.BUTTONS)+button])
 			end
 		end
 
@@ -149,9 +149,9 @@
 	m_Instance = nil,
 
 	Instance = function()
-		if(nil == RatPageModel.m_Instance) then
-			RatPageModel.m_Instance = RatPageModel.new();
+		if(nil == CyborgMMO_RatPageModel.m_Instance) then
+			CyborgMMO_RatPageModel.m_Instance = CyborgMMO_RatPageModel.new();
 		end
-		return RatPageModel.m_Instance;
+		return CyborgMMO_RatPageModel.m_Instance;
 	end
 }
diff -r 461854a2849c -r d186f8cd5000 RatPageView.lua
--- a/RatPageView.lua	Thu May 24 16:13:28 2012 +0000
+++ b/RatPageView.lua	Mon May 28 15:54:52 2012 +0000
@@ -18,7 +18,7 @@
 --~ along with this program; if not, write to the Free Software
 --~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-RatPageView = {
+CyborgMMO_RatPageView = {
 	new = function(self)
 		msg("new Rat Page View");
 		for _, child in ipairs(self:GetChildren()) do
@@ -27,12 +27,12 @@
 		
 		self.SlotClicked = function(slot)
 			msg("View Recieved Click")
-			RatPageController.Instance().SlotClicked(slot)
+			CyborgMMO_RatPageController.Instance().SlotClicked(slot)
 		end
 
 		self.ModeClicked = function(mode)
 			msg("View Recieved Click")
-			RatPageController.Instance().ModeClicked(mode)
+			CyborgMMO_RatPageController.Instance().ModeClicked(mode)
 		end
 
 		self.RegisterMode = function()
@@ -46,14 +46,14 @@
 	end
 }
 
-RatQuickPageView = {
+CyborgMMO_RatQuickPageView = {
 	new = function(self)
 		for _, child in ipairs(self:GetChildren()) do
 			child.Register();
 		end
 
 		self.SlotClicked = function(slot)
-			RatPageController.Instance().SlotClicked(slot)
+			CyborgMMO_RatPageController.Instance().SlotClicked(slot)
 		end
 
 		return self;
@@ -61,14 +61,13 @@
 }
 
 -- Slot Class --
-SlotView = {
+CyborgMMO_SlotView = {
 	new = function(self, parent)
 		self._assignedWowObject = nil;
+		self.UnCheckedTexture = self:GetNormalTexture();
 		self:RegisterForClicks("LeftButtonUp", "RightButtonUp");
 		self.Id = self:GetID();
-		RatPageModel.Instance().AddObserver(self);
-		self.UnCheckedTexture = self:GetNormalTexture();
-
+		CyborgMMO_RatPageModel.Instance().AddObserver(self);
 		-- Object Method --
 		self.Clicked = function()
 			self:GetParent().SlotClicked(self)
@@ -94,11 +93,11 @@
 	end,
 }
 
-SlotMiniView = {
+CyborgMMO_SlotMiniView = {
 	new = function(self, parent)
 		self._assignedWowObject = nil;
 		self.Id = self:GetID();
-		RatPageModel.Instance().AddObserver(self);
+		CyborgMMO_RatPageModel.Instance().AddObserver(self);
 		self.UnCheckedTexture = self:GetNormalTexture();
 
 		self.Update = function(data, activeMode)
@@ -120,11 +119,11 @@
 
 
 -- ModeButton --
-ModeView = {
+CyborgMMO_ModeView = {
 	new = function(self)
 	self.Id = self:GetID();
 	self.Name = self:GetName();
-	RatPageModel.Instance().AddObserver(self);
+	CyborgMMO_RatPageModel.Instance().AddObserver(self);
 	if(self.Id ~= 1) then
 		self:Hide()
 	end
diff -r 461854a2849c -r d186f8cd5000 RatQuickPage.xml
--- a/RatQuickPage.xml	Thu May 24 16:13:28 2012 +0000
+++ b/RatQuickPage.xml	Mon May 28 15:54:52 2012 +0000
@@ -21,7 +21,7 @@
 	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. 
 	-->
 	<!-- IconTemplate-->
-	<Button name="SmallIconTemplate" virtual="true">
+	<Button name="CyborgMMO_TemplateSmallIcon" virtual="true">
 		<Size>
 			<AbsDimension x="16.5" y="16.5"/>
 		</Size>
@@ -48,10 +48,10 @@
 		<HighlightTexture alphaMode="ADD" file="Interface\Buttons\ButtonHilight-Square"/>
 	</Button>
 
-	<Button name="SmallSlotTemplate" inherits="SmallIconTemplate" virtual="true">
+	<Button name="CyborgMMO_TemplateSmallSlot" inherits="CyborgMMO_TemplateSmallIcon" virtual="true">
 		<Scripts>
 			<OnLoad>
-				self = SlotMiniView.new(self);
+				self = CyborgMMO_SlotMiniView.new(self);
 			</OnLoad>
 			<OnClick>
 				self.Clicked();
@@ -60,7 +60,7 @@
 	</Button>
 
 	<!-- The Rat Page Frame -->
-	<Frame name="RatQuickPage" hidden="true">
+	<Frame name="CyborgMMO_RatQuickPage" hidden="true">
 		<Size>
 			<AbsDimension x="256" y="256" />
 		</Size>
@@ -73,7 +73,7 @@
 		</Anchors>
 		<Layers>
 			<Layer level="BACKGROUND">
-			<Texture name="BackgroundTexture" file="Interface\AddOns\CyborgMMO7\Graphics\ParchmentAndLeftSide.tga">
+			<Texture name="$parentBackgroundTexture" file="Interface\AddOns\CyborgMMO7\Graphics\ParchmentAndLeftSide.tga">
 				<Size>
 				  <AbsDimension x="256" y="256" />
 				</Size>
@@ -87,7 +87,7 @@
 			  </Texture>
 			</Layer>
 			<Layer level="ARTWORK">
-			<Texture name="RatCalloutsTexture" file="Interface\AddOns\CyborgMMO7\Graphics\Lines.tga">
+			<Texture name="$parentCalloutsTexture" file="Interface\AddOns\CyborgMMO7\Graphics\Lines.tga">
 				<Size>
 					<AbsDimension x="256" y="256" />
 				</Size>
@@ -103,7 +103,7 @@
 		</Layers>
 		<!-- Our Slot Locations -->
 		<Frames>
-			<CheckButton name="$parentSlot1" inherits="SmallSlotTemplate" id="1">
+			<CheckButton name="$parentSlot1" inherits="CyborgMMO_TemplateSmallSlot" id="1">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -112,7 +112,7 @@
 					</Anchor>
 				</Anchors>
 			</CheckButton>
-			<CheckButton name="$parentSlot2" inherits="SmallSlotTemplate" id="2">
+			<CheckButton name="$parentSlot2" inherits="CyborgMMO_TemplateSmallSlot" id="2">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -121,7 +121,7 @@
 					</Anchor>
 				</Anchors>
 			</CheckButton>
-			<CheckButton name="$parentSlot3" inherits="SmallSlotTemplate" id="3">
+			<CheckButton name="$parentSlot3" inherits="CyborgMMO_TemplateSmallSlot" id="3">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -130,7 +130,7 @@
 					</Anchor>
 				</Anchors>
 			</CheckButton>
-			<CheckButton name="$parentSlot4" inherits="SmallSlotTemplate" id="4">
+			<CheckButton name="$parentSlot4" inherits="CyborgMMO_TemplateSmallSlot" id="4">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -139,7 +139,7 @@
 					</Anchor>
 				</Anchors>
 			</CheckButton>
-			<CheckButton name="$parentSlot5" inherits="SmallSlotTemplate" id="5">
+			<CheckButton name="$parentSlot5" inherits="CyborgMMO_TemplateSmallSlot" id="5">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -148,7 +148,7 @@
 					</Anchor>
 				</Anchors>
 			</CheckButton>
-			<CheckButton name="$parentSlot6" inherits="SmallSlotTemplate" id="6">
+			<CheckButton name="$parentSlot6" inherits="CyborgMMO_TemplateSmallSlot" id="6">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -157,7 +157,7 @@
 					</Anchor>
 				</Anchors>
 			</CheckButton>
-			<CheckButton name="$parentSlot7" inherits="SmallSlotTemplate" id="7">
+			<CheckButton name="$parentSlot7" inherits="CyborgMMO_TemplateSmallSlot" id="7">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -166,7 +166,7 @@
 					</Anchor>
 				</Anchors>
 			</CheckButton>
-			<CheckButton name="$parentSlot8" inherits="SmallSlotTemplate" id="8">
+			<CheckButton name="$parentSlot8" inherits="CyborgMMO_TemplateSmallSlot" id="8">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -175,7 +175,7 @@
 					</Anchor>
 				</Anchors>
 			</CheckButton>
-			<CheckButton name="$parentSlot9" inherits="SmallSlotTemplate" id="9">
+			<CheckButton name="$parentSlot9" inherits="CyborgMMO_TemplateSmallSlot" id="9">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -184,7 +184,7 @@
 					</Anchor>
 				</Anchors>
 			</CheckButton>
-			<CheckButton name="$parentSlot10" inherits="SmallSlotTemplate" id="10">
+			<CheckButton name="$parentSlot10" inherits="CyborgMMO_TemplateSmallSlot" id="10">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -193,7 +193,7 @@
 					</Anchor>
 				</Anchors>
 			</CheckButton>
-			<CheckButton name="$parentSlot11" inherits="SmallSlotTemplate" id="11">
+			<CheckButton name="$parentSlot11" inherits="CyborgMMO_TemplateSmallSlot" id="11">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -202,7 +202,7 @@
 					</Anchor>
 				</Anchors>
 			</CheckButton>
-			<CheckButton name="Slot12" inherits="SmallSlotTemplate" id="12">
+			<CheckButton name="$parentSlot12" inherits="CyborgMMO_TemplateSmallSlot" id="12">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -211,7 +211,7 @@
 					</Anchor>
 				</Anchors>
 			</CheckButton>
-			<CheckButton name="$parentSlot13" inherits="SmallSlotTemplate" id="13">
+			<CheckButton name="$parentSlot13" inherits="CyborgMMO_TemplateSmallSlot" id="13">
 				<Anchors>
 					<Anchor point="TOPLEFT">
 						<Offset>
@@ -223,7 +223,7 @@
 		</Frames>
 		<Scripts>
 			<OnLoad>
-				RatQuickPageView.new(self);
+				CyborgMMO_RatQuickPageView.new(self);
 			</OnLoad>
 		</Scripts>
 	</Frame>
diff -r 461854a2849c -r d186f8cd5000 WowObjects.lua
--- a/WowObjects.lua	Thu May 24 16:13:28 2012 +0000
+++ b/WowObjects.lua	Mon May 28 15:54:52 2012 +0000
@@ -18,7 +18,7 @@
 --~ along with this program; if not, write to the Free Software
 --~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-WowObject = {
+CyborgMMO_WowObject = {
 	new = function(type, detail, subdetail)
 		local self = {};
 		self.Texture = nil;
@@ -48,7 +48,7 @@
 	end,
 
 	ClearBinding = function(key)
-		local buttonFrame, parentFrame, name = CallbackFactory.Instance().AddCallback(WowObject.DoNothing);
+		local buttonFrame, parentFrame, name = CyborgMMO_CallbackFactory.Instance().AddCallback(CyborgMMO_WowObject.DoNothing);
 		if(1 ~= SetOverrideBindingClick(parentFrame, true, key, name, "LeftButton")) then
 			msg("Failed to bind companion to button click");
 		end
@@ -59,21 +59,21 @@
 
 	Load = function(object)
 		if("item" == type) then
-			object = WowItem.Load(Object)
+			object = CyborgMMO_WowItem.Load(Object)
 		elseif("macro" == type) then
-			object = WowMacro.Load(object)
+			object = CyborgMMO_WowMacro.Load(object)
 		elseif("spell" == type) then
-			object = WowSpell.Load(object)
+			object = CyborgMMO_WowSpell.Load(object)
 		elseif("petaction" == type) then
-			object = WowSpell.Load(object)
+			object = CyborgMMO_WowSpell.Load(object)
 		--elseif("merchant"== type) then
 			--object = SlotMerchant.new(detail,subdetail)
 		elseif("companion" == type) then
-			object = WowCompanion.Load(object)
+			object = CyborgMMO_WowCompanion.Load(object)
 		elseif("equipmentset" == type) then
-			object = WowEquipmentSet.Load(object)
+			object = CyborgMMO_WowEquipmentSet.Load(object)
 		else
-			object = WowObject.new(type,detail, subdetail)
+			object = CyborgMMO_WowObject.new(type,detail, subdetail)
 		end
 		return object;
 	end,
@@ -82,23 +82,23 @@
 	Create = function(objectType, detail, subdetail)
 		local object;
 		if("item" == objectType) then
-			object = WowItem.new(detail,subdetail)
+			object = CyborgMMO_WowItem.new(detail,subdetail)
 		elseif("macro" == objectType) then
-			object = WowMacro.new(detail)
+			object = CyborgMMO_WowMacro.new(detail)
 		elseif("spell" == objectType) then
-			object = WowSpell.new(objectType, detail,subdetail)
+			object = CyborgMMO_WowSpell.new(objectType, detail,subdetail)
 		elseif("petaction" == objectType) then
-			object = WowSpell.new(objectType, detail,subdetail)
+			object = CyborgMMO_WowSpell.new(objectType, detail,subdetail)
 		elseif("merchant"== objectType) then
-			object = SlotMerchant.new(detail,subdetail)
+			object = CyborgMMO_SlotMerchant.new(detail,subdetail)
 		elseif("companion" == objectType) then
-			object = WowCompanion.new(detail,subdetail)
+			object = CyborgMMO_WowCompanion.new(detail,subdetail)
 		elseif("equipmentset" == objectType) then
-			object = WowEquipmentSet.new(objectType,detail,subdetail)
+			object = CyborgMMO_WowEquipmentSet.new(objectType,detail,subdetail)
 		elseif("callback" == objectType) then
-			object = WowCallback.new(detail);
+			object = CyborgMMO_WowCallback.new(detail);
 		else
-			object = WowObject.new(objectType,detail, subdetail)
+			object = CyborgMMO_WowObject.new(objectType,detail, subdetail)
 		end
 
 		return object;
@@ -107,12 +107,12 @@
 
 local CallbackCursor = nil;
 
-CallbackIcons = {
+CyborgMMO_CallbackIcons = {
 	new = function(self)
 		self.point, self.relativeTo, self.relativePoint, self.xOfs, self.yOfs = self:GetPoint();
 		--self:SetPoint(self.point, self.relativeTo, self.relativePoint, self.xOfs, self.yOfs);
 		self.strata = self:GetFrameStrata();
-		self.wowObject = WowCallback.new(self:GetName());
+		self.wowObject = CyborgMMO_WowCallback.new(string.gsub(self:GetName(), self:GetParent():GetName(), "",1))
 		self.wowObject.SetTextures(self);
 		self:RegisterForDrag("LeftButton","RightButton")
 		self:SetResizable(false);
@@ -139,27 +139,28 @@
 			self:ClearAllPoints();
 			self:SetPoint(self.point, self.relativeTo, self.relativePoint, self.xOfs, self.yOfs);
 			local x, y  = GetCursorPosition();
-			RatPageController.Instance().CallbackDropped(self)
+			CyborgMMO_RatPageController.Instance().CallbackDropped(self)
 		end
 		
 		return self;
 	end
 }
 
-WowCallback = {
+CyborgMMO_WowCallback = {
 	new = function(callbackName)
-		local self = WowObject.new("callback", callbackName, "");
+		local self = CyborgMMO_WowObject.new("callback", callbackName, "");
 		self.CallbackName = callbackName;
 		self.Texture = "Interface\\AddOns\\CyborgMMO7\\Graphics\\"..self.CallbackName.."Unselected.tga"
 		
 		self.SetTextures = function(buttonFrame)
+			msg("TextureName = "..self.CallbackName)
 			buttonFrame:SetNormalTexture("Interface\\AddOns\\CyborgMMO7\\Graphics\\"..self.CallbackName.."Unselected.tga")
 			buttonFrame:SetPushedTexture("Interface\\AddOns\\CyborgMMO7\\Graphics\\"..self.CallbackName.."Down.tga")
 			buttonFrame:SetHighlightTexture("Interface\\AddOns\\CyborgMMO7\\Graphics\\"..self.CallbackName.."Over.tga")
 		end
 		
 		self.DoAction = function()
-			local action = GetCallback(self.CallbackName)
+			local action = CyborgMMO_CallbackFactory.Instance().GetCallback(self.CallbackName)
 			msg("calling callback:- "..self.CallbackName);
 			action();
 			
@@ -168,7 +169,7 @@
 		self.PickupCallback = function()
 			
 			local slot = nil;
-			local observers = RatPageModel.Instance().GetAllObservers();
+			local observers = CyborgMMO_RatPageModel.Instance().GetAllObservers();
 			for i = 1, (# observers) do
 				if(MouseIsOver(observers[i])) then
 					slot = observers[i];
@@ -183,11 +184,6 @@
 			msg("click handler");
 			CallbackCursor:StopMoving();
 			CallbackCursor:Hide();
-			
-			if("LeftButton" == button) then
-			else
-				
-			end
 		end
 		
 		self.Pickup = function()
@@ -199,8 +195,8 @@
 		
 		
 		self.SetBinding = function(key)
-			local buttonFrame, parentFrame, name = CallbackFactory.Instance().AddCallback(self.DoAction);
-			if(1 ~= SetOverrideBindingClick(CallbackFactory.Instance().Frame, true, key, name, "LeftButton")) then
+			local buttonFrame, parentFrame, name = CyborgMMO_CallbackFactory.Instance().AddCallback(self.DoAction);
+			if(1 ~= SetOverrideBindingClick(CyborgMMO_CallbackFactory.Instance().Frame, true, key, name, "LeftButton")) then
 				msg("Failed to Bind modeChange");
 			end
 		end
@@ -211,9 +207,9 @@
 
 -- WowItem Class --
 
-WowItem = {
+CyborgMMO_WowItem = {
 	new = function(number, itemID)
-		local self = WowObject.new("item", number, itemID); -- base class
+		local self = CyborgMMO_WowObject.new("item", number, itemID); -- base class
 		-- Set all the item info. --
 		self.Name,
 		self.Link,
@@ -241,7 +237,7 @@
 		end
 
 		self.SetBinding = function(key)
-			SetOverrideBinding(CallbackFactory.Instance().Frame, true, key, "ITEM "..self.Name);
+			SetOverrideBinding(CyborgMMO_CallbackFactory.Instance().Frame, true, key, "ITEM "..self.Name);
 		end
 
 		return self;
@@ -250,9 +246,9 @@
 
 -- WowSpell Class --
 
-WowSpell = {
+CyborgMMO_WowSpell = {
 	new = function(type, spellbookID, spellbook)
-		local self = WowObject.new(type, spellbookID, spellbook) -- base class
+		local self = CyborgMMO_WowObject.new(type, spellbookID, spellbook) -- base class
 		self.SpellbookID = spellbookID;
 		self.Spellbook = spellbook;
 		self.Name, self.Rank = GetSpellBookItemName(spellbookID, spellbook);
@@ -276,7 +272,7 @@
 		self.SetBinding = function(key)
 			msg("Binding to key "..key)
 			self.Key = key
-			SetOverrideBinding(CallbackFactory.Instance().Frame, true, self.Key, self.Type.." "..self.Name);
+			SetOverrideBinding(CyborgMMO_CallbackFactory.Instance().Frame, true, self.Key, self.Type.." "..self.Name);
 		end
 
     return self;
@@ -293,9 +289,9 @@
 
 -- WowMacro Class --
 
-WowMacro = {
+CyborgMMO_WowMacro = {
 	new = function(index)
-		local self = WowObject.new("macro", index, nil); -- base class
+		local self = CyborgMMO_WowObject.new("macro", index, nil); -- base class
 		-- Set all the item info. --
 		self.Name,
 		self.Texture,
@@ -318,7 +314,7 @@
 
 		self.SetBinding = function(key)
 			self.Key = key;
-			SetOverrideBinding(CallbackFactory.Instance().Frame, true, key, "MACRO "..self.Index);
+			SetOverrideBinding(CyborgMMO_CallbackFactory.Instance().Frame, true, key, "MACRO "..self.Index);
 		end
 
     return self;
@@ -328,9 +324,9 @@
 
 -- WowCompanion Class --
 
-WowCompanion = {
+CyborgMMO_WowCompanion = {
 	new = function(index, SubType)
-		local self = WowObject.new("companion", index, SubType); -- base class
+		local self = CyborgMMO_WowObject.new("companion", index, SubType); -- base class
 		-- Set all the item info. --
 		self.Id, self.Name, self.SpellId, self.Texture,	self.isSummoned = GetCompanionInfo(SubType, index);
 		self.SubType = SubType;
@@ -352,7 +348,7 @@
 
 		self.SetBinding = function(key)
 			self.Key = key
-			local buttonFrame, parentFrame, name = CallbackFactory.Instance().AddCallback(self.DoAction);
+			local buttonFrame, parentFrame, name = CyborgMMO_CallbackFactory.Instance().AddCallback(self.DoAction);
 			if(1 ~= SetOverrideBindingClick(parentFrame, true, key, name, "LeftButton")) then
 				msg("Failed to bind companion to button click");
 			end
@@ -369,9 +365,9 @@
 }
 
 -- WowMerchant Class --
-WowMerchant = {
+CyborgMMO_WowMerchant = {
 	new = function(index)
-		local self = WowObject.new("macro", index, nil); -- base class
+		local self = CyborgMMO_WowObject.new("macro", index, nil); -- base class
 		-- Set all the item info. --
 		self.Name,
 		self.Texture,
@@ -397,7 +393,7 @@
 
 		self.SetBinding = function(key)
 			self.Key = key
-			SetOverrideBinding(CallbackFactory.Instance().Frame, true, key, "MERCHANT "..self.Index);
+			SetOverrideBinding(CyborgMMO_CallbackFactory.Instance().Frame, true, key, "MERCHANT "..self.Index);
 		end
 
     return self;
@@ -405,9 +401,9 @@
 }
 
 -- WowEquipmentSet Class --
-WowEquipmentSet = {
+CyborgMMO_WowEquipmentSet = {
 	new = function(objectType, name, index)
-		local self = WowObject.new(objectType, name, index); -- base class
+		local self = CyborgMMO_WowObject.new(objectType, name, index); -- base class
 		-- Set all the item info. --
 		texture, lessIndex = GetEquipmentSetInfoByName(name);
 		self.Texture = "Interface\\Icons\\"..texture;
@@ -429,7 +425,7 @@
 
 		self.SetBinding = function(key)
 			self.Key = key
-			local buttonFrame, parentFrame, name = CallbackFactory.Instance().AddCallback(self.DoAction);
+			local buttonFrame, parentFrame, name = CyborgMMO_CallbackFactory.Instance().AddCallback(self.DoAction);
 			if(1 ~= SetOverrideBindingClick(parentFrame, true, key, name, "LeftButton")) then
 				msg("Failed to bind companion to button click");
 			end