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