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