--- 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