diff --git a/Aux-Vanilla.toc b/Aux-Vanilla.toc
index c66f254..50e5430 100644
--- a/Aux-Vanilla.toc
+++ b/Aux-Vanilla.toc
@@ -1,8 +1,8 @@
 ## Interface: 11200
-## Title: Auctionator
+## Title: Aux
 ## Notes: A lightweight addon designed to help manage auctions
 ## SavedVariablesPerCharacter: AUCTIONATOR_ENABLE_ALT, AUCTIONATOR_OPEN_FIRST, AUCTIONATOR_INSTANT_BUYOUT
-## SavedVariables: auctionatorEntries
+## SavedVariables: auxEntries
 Core.xml
 Scan.xml
 Sell.xml
diff --git a/about.xml b/about.xml
index 732a980..b884e1a 100644
--- a/about.xml
+++ b/about.xml
@@ -1,6 +1,6 @@
 <Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/">
 	
-	<Frame name="AuctionatorDescriptionFrame" frameStrata="HIGH" toplevel="true" parent="UIParent" enableMouse="true" hidden="true">
+	<Frame name="AuxDescriptionFrame" frameStrata="HIGH" toplevel="true" parent="UIParent" enableMouse="true" hidden="true">
 		<Size><AbsDimension x="520" y="480" /></Size>		
 		<Anchors><Anchor point="TOP"><Offset><AbsDimension x="0" y="-90"/></Offset></Anchor></Anchors>
 
@@ -12,7 +12,7 @@
 
 		<Layers>
 			<Layer level="BACKGROUND">
-				<FontString name="AuctionatorAuthorText" inherits="GameFontDisableSmall" justifyH="LEFT" justifyV="TOP">
+				<FontString name="AuxAuthorText" inherits="GameFontDisableSmall" justifyH="LEFT" justifyV="TOP">
 					<Anchors>
 						<Anchor point="BOTTOMLEFT">
 							<Offset><AbsDimension x="30" y="20"/></Offset>
@@ -24,7 +24,7 @@
 
 		<Frames>
 
-			<SimpleHTML name="AuctionatorDescriptionHTML">
+			<SimpleHTML name="AuxDescriptionHTML">
 				<Size><AbsDimension x="460" y="420" /></Size>		
 				<Anchors>
 					<Anchor point="TOPLEFT"><Offset><AbsDimension x="30" y="-30"/></Offset></Anchor>
@@ -38,7 +38,7 @@
 				<Anchors><Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="-20" y="15"/></Offset></Anchor></Anchors>
 				<Scripts>
 					<OnClick>
-						AuctionatorDescriptionFrame:Hide()
+						AuxDescriptionFrame:Hide()
 					</OnClick>
 				</Scripts>
 			</Button>
diff --git a/buy.lua b/buy.lua
index da325d5..0e1f5f2 100644
--- a/buy.lua
+++ b/buy.lua
@@ -3,19 +3,19 @@ local entries
 local selectedEntries = {}
 local searchQuery
 
-function AuctionatorBuySearchButton_OnClick()
+function AuxBuySearchButton_OnClick()
 	entries = nil
 	selectedEntries = {}
-	Auctionator_Buy_ScrollbarUpdate()
-	searchQuery = Auctionator_Scan_CreateQuery{
-		name = AuctionatorBuySearchBox:GetText(),
+	Aux_Buy_ScrollbarUpdate()
+	searchQuery = Aux_Scan_CreateQuery{
+		name = AuxBuySearchBox:GetText(),
 		exactMatch = true
 	}
-	Auctionator_Scan_Start{
+	Aux_Scan_Start{
 			query = searchQuery,
 			onComplete = function(data)
 				processScanResults(data)
-				Auctionator_Buy_ScrollbarUpdate()
+				Aux_Buy_ScrollbarUpdate()
 			end
 	}
 end
@@ -38,21 +38,21 @@ end
 
 -----------------------------------------
 
-function AuctionatorBuyBuySelectedButton_OnClick()
+function AuxBuyBuySelectedButton_OnClick()
 	
-	AuctionatorBuySearchButton:Disable()
-	AuctionatorBuyBuySelectedButton:Disable()
+	AuxBuySearchButton:Disable()
+	AuxBuyBuySelectedButton:Disable()
 	
 	local order = createOrder(selectedEntries)
-	local orderedCount = Auctionator_SetSize(selectedEntries)
+	local orderedCount = Aux_SetSize(selectedEntries)
 	local purchasedCount = 0
 
 	entries = nil
 	selectedEntries = {}
 	
-	Auctionator_Buy_ScrollbarUpdate()					
+	Aux_Buy_ScrollbarUpdate()					
 	
-	Auctionator_Scan_Start{
+	Aux_Scan_Start{
 			query = searchQuery,
 			onReadDatum = function(datum)
 				local key = datum.name.."_"..datum.stackSize.."_"..datum.buyoutPrice
@@ -78,31 +78,31 @@ function AuctionatorBuyBuySelectedButton_OnClick()
 			end,
 			onComplete = function(data)
 				processScanResults(data)
-				Auctionator_Buy_ScrollbarUpdate()
-				AuctionatorBuySearchButton:Enable()
-				Auctionator_Buy_ShowReport(true, orderedCount, purchasedCount)
+				Aux_Buy_ScrollbarUpdate()
+				AuxBuySearchButton:Enable()
+				Aux_Buy_ShowReport(true, orderedCount, purchasedCount)
 			end,
 			onAbort = function()
-				AuctionatorBuySearchButton:Enable()
-				Auctionator_Buy_ShowReport(false, orderedCount, purchasedCount)
+				AuxBuySearchButton:Enable()
+				Aux_Buy_ShowReport(false, orderedCount, purchasedCount)
 			end
 	}
 end
 
 -----------------------------------------
 
-function AuctionatorBuyEntry_OnClick()
+function AuxBuyEntry_OnClick()
 	local entryIndex = this:GetID()
 
 	local entry = entries[entryIndex]
 
-	if Auctionator_SetContains(selectedEntries, entry) then
-		Auctionator_RemoveFromSet(selectedEntries, entry)
+	if Aux_SetContains(selectedEntries, entry) then
+		Aux_RemoveFromSet(selectedEntries, entry)
 	else
-		Auctionator_AddToSet(selectedEntries, entry)
+		Aux_AddToSet(selectedEntries, entry)
 	end
 	
-	Auctionator_Buy_ScrollbarUpdate()
+	Aux_Buy_ScrollbarUpdate()
 
 	PlaySound("igMainMenuOptionCheckBoxOn")
 end
@@ -131,23 +131,23 @@ end
 
 -----------------------------------------
 
-function Auctionator_Buy_ScrollbarUpdate()
+function Aux_Buy_ScrollbarUpdate()
 	if entries and getn(entries) == 0 then
-		Auctionator_SetMessage("No auctions were found")
+		Aux_SetMessage("No auctions were found")
 	else
-		AuctionatorBuyMessage:Hide()
+		AuxBuyMessage:Hide()
 	end
 	
 	local total = 0
 	for entry, _ in selectedEntries do
 		total = total + entry.buyoutPrice
 	end	
-	MoneyFrame_Update("AuctionatorBuyTotal", Auctionator_Round(total))
+	MoneyFrame_Update("AuxBuyTotal", Aux_Round(total))
 	
-	if Auctionator_SetSize(selectedEntries) > 0 and GetMoney() >= total then
-		AuctionatorBuyBuySelectedButton:Enable()
+	if Aux_SetSize(selectedEntries) > 0 and GetMoney() >= total then
+		AuxBuyBuySelectedButton:Enable()
 	else
-		AuctionatorBuyBuySelectedButton:Disable()
+		AuxBuyBuySelectedButton:Disable()
 	end
 	
 	local numrows
@@ -157,12 +157,12 @@ function Auctionator_Buy_ScrollbarUpdate()
 		numrows = getn(entries)
 	end
 	
-	FauxScrollFrame_Update(AuctionatorBuyScrollFrame, numrows, 19, 16);
+	FauxScrollFrame_Update(AuxBuyScrollFrame, numrows, 19, 16);
 	
 	for line = 1,19 do
 
-		local dataOffset = line + FauxScrollFrame_GetOffset(AuctionatorBuyScrollFrame)
-		local lineEntry = getglobal("AuctionatorBuyEntry"..line)
+		local dataOffset = line + FauxScrollFrame_GetOffset(AuxBuyScrollFrame)
+		local lineEntry = getglobal("AuxBuyEntry"..line)
 		
 		if numrows <= 19 then
 			lineEntry:SetWidth(800)
@@ -176,17 +176,17 @@ function Auctionator_Buy_ScrollbarUpdate()
 			
 			local entry = entries[dataOffset]
 
-			local lineEntry_name = getglobal("AuctionatorBuyEntry"..line.."_Name")
-			local lineEntry_stackSize = getglobal("AuctionatorBuyEntry"..line.."_StackSize")
+			local lineEntry_name = getglobal("AuxBuyEntry"..line.."_Name")
+			local lineEntry_stackSize = getglobal("AuxBuyEntry"..line.."_StackSize")
 			
 			local color = "ffffffff"
-			if Auctionator_QualityColor(entry.quality) then
-				color = Auctionator_QualityColor(entry.quality)
+			if Aux_QualityColor(entry.quality) then
+				color = Aux_QualityColor(entry.quality)
 			end
 			
 			lineEntry_name:SetText("\124c" .. color ..  entry.name .. "\124r")
 
-			if Auctionator_SetContains(selectedEntries, entry) then
+			if Aux_SetContains(selectedEntries, entry) then
 				lineEntry:LockHighlight()
 			else
 				lineEntry:UnlockHighlight()
@@ -194,8 +194,8 @@ function Auctionator_Buy_ScrollbarUpdate()
 
 			lineEntry_stackSize:SetText(entry.stackSize)
 			
-			MoneyFrame_Update("AuctionatorBuyEntry"..line.."_UnitPrice", Auctionator_Round(entry.buyoutPrice/entry.stackSize))
-			MoneyFrame_Update("AuctionatorBuyEntry"..line.."_TotalPrice", Auctionator_Round(entry.buyoutPrice))
+			MoneyFrame_Update("AuxBuyEntry"..line.."_UnitPrice", Aux_Round(entry.buyoutPrice/entry.stackSize))
+			MoneyFrame_Update("AuxBuyEntry"..line.."_TotalPrice", Aux_Round(entry.buyoutPrice))
 
 			lineEntry:Show()
 		else
@@ -203,17 +203,17 @@ function Auctionator_Buy_ScrollbarUpdate()
 		end
 	end
 	
-	function Auctionator_Buy_ShowReport(completed, orderedCount, purchasedCount)
-		AuctionatorBuyReport:Show()
+	function Aux_Buy_ShowReport(completed, orderedCount, purchasedCount)
+		AuxBuyReport:Show()
 		
-		AuctionatorBuyReportHTML:SetText("<html><body>"
-				.."<h1>Auctionator Buy Report</h1><br/>"
+		AuxBuyReportHTML:SetText("<html><body>"
+				.."<h1>Aux Buy Report</h1><br/>"
 				.."<h1>Status: "..(completed and "Completed" or "Aborted").."</h1><br/>"
 				.."<p>"
 				..string.format("%i out of the %i ordered auctions have been purchased", purchasedCount, orderedCount)
 				.."</p>"
 				.."</body></html>")
 			
-		AuctionatorBuyReportHTML:SetSpacing(3)
+		AuxBuyReportHTML:SetSpacing(3)
 	end
 end
\ No newline at end of file
diff --git a/buy.xml b/buy.xml
index 354ebae..78c4814 100644
--- a/buy.xml
+++ b/buy.xml
@@ -2,7 +2,7 @@
 
 	<Script file="Buy.lua"/> 
 	
-	<Button name="AuctionatorBuyEntryTemplate" virtual="true" hidden="true">
+	<Button name="AuxBuyEntryTemplate" virtual="true" hidden="true">
 		<Size><AbsDimension y="16"/></Size>		
 		<Frames>
 			<Frame>
@@ -67,12 +67,12 @@
 		</HighlightTexture>
 		<Scripts>
 			<OnClick>
-				AuctionatorBuyEntry_OnClick()
+				AuxBuyEntry_OnClick()
 			</OnClick>
 		</Scripts>
 	</Button>
 	
-	<Frame name="AuctionatorBuyTemplate" virtual="true" hidden="true">
+	<Frame name="AuxBuyTemplate" virtual="true" hidden="true">
 		<Size>
 			<AbsDimension x="694" y="447"/>
 		</Size>
@@ -82,20 +82,20 @@
 
 		<Layers>
 			<Layer level="BACKGROUND">
-				<FontString inherits="GameFontNormal" text="Auctionator Buy">
+				<FontString inherits="GameFontNormal" text="Aux Buy">
 					<Anchors><Anchor point="TOP"><Offset><AbsDimension x="20" y="-18"/></Offset></Anchor></Anchors>
 				</FontString>
 
-				<FontString name="AuctionatorBuyMessage" inherits="GameFontNormal">
+				<FontString name="AuxBuyMessage" inherits="GameFontNormal">
 					<Anchors><Anchor point="TOP"><Offset><AbsDimension x="70" y="-120"/></Offset></Anchor></Anchors>
 				</FontString>
 				
-				<FontString name="AuctionatorBuySearchBoxLabel" inherits="GameFontHighlightSmall" text="Search For">
+				<FontString name="AuxBuySearchBoxLabel" inherits="GameFontHighlightSmall" text="Search For">
 					<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="160" y="-50"/></Offset></Anchor></Anchors>
 				</FontString>
 			</Layer>
 			<Layer level="ARTWORK">
-				<FontString name="AuctionatorBuyTotalLabel" inherits="GameFontHighlightSmall" text="Total">
+				<FontString name="AuxBuyTotalLabel" inherits="GameFontHighlightSmall" text="Total">
 					<Anchors>
 						<Anchor point="BOTTOM">
 							<Offset>
@@ -135,28 +135,28 @@
 		</Layers>
 
 		<Frames>		
-            <EditBox name="AuctionatorBuySearchBox" autoFocus="false" inherits="InputBoxTemplate">
+            <EditBox name="AuxBuySearchBox" autoFocus="false" inherits="InputBoxTemplate">
 				<Size><AbsDimension x="240" y="20"/></Size>
-				<Anchors><Anchor point="LEFT" relativeTo="AuctionatorBuySearchBoxLabel" relativePoint="RIGHT"><Offset><AbsDimension x="10" y="0"/></Offset></Anchor></Anchors>
+				<Anchors><Anchor point="LEFT" relativeTo="AuxBuySearchBoxLabel" relativePoint="RIGHT"><Offset><AbsDimension x="10" y="0"/></Offset></Anchor></Anchors>
 				<Scripts>
 					<OnEnterPressed>
 						this:ClearFocus()
-						AuctionatorBuySearchButton_OnClick()
+						AuxBuySearchButton_OnClick()
 					</OnEnterPressed>
 				</Scripts>
 			</EditBox> 
             
-            <Button name="AuctionatorBuySearchButton" inherits="UIPanelButtonTemplate" text="Search">
+            <Button name="AuxBuySearchButton" inherits="UIPanelButtonTemplate" text="Search">
 				<Size><AbsDimension x="80" y="22"/></Size>
-				<Anchors><Anchor point="LEFT" relativeTo="AuctionatorBuySearchBox" relativePoint="RIGHT"><Offset><AbsDimension x="10" y="1" /></Offset></Anchor></Anchors>
+				<Anchors><Anchor point="LEFT" relativeTo="AuxBuySearchBox" relativePoint="RIGHT"><Offset><AbsDimension x="10" y="1" /></Offset></Anchor></Anchors>
 				<Scripts>
 					<OnClick>
-						AuctionatorBuySearchButton_OnClick()
+						AuxBuySearchButton_OnClick()
 					</OnClick>
 				</Scripts>
 			</Button>
             
-			<Button name="AuctionatorBuyBuySelectedButton" inherits="UIPanelButtonTemplate" text="Buy Selected Auctions">
+			<Button name="AuxBuyBuySelectedButton" inherits="UIPanelButtonTemplate" text="Buy Selected Auctions">
 				<Size><AbsDimension x="166" y="22"/></Size>
 				<Anchors>
 					<Anchor point="BOTTOMRIGHT">
@@ -167,14 +167,14 @@
 				</Anchors>
 				<Scripts>
 					<OnClick>
-						AuctionatorBuyBuySelectedButton_OnClick()
+						AuxBuyBuySelectedButton_OnClick()
 					</OnClick>
 				</Scripts>
 			</Button>
 			
-			<Frame name="AuctionatorBuyTotal" inherits="SmallMoneyFrameTemplate">
+			<Frame name="AuxBuyTotal" inherits="SmallMoneyFrameTemplate">
 				<Anchors>
-					<Anchor point="LEFT" relativePoint="RIGHT" relativeTo="AuctionatorBuyTotalLabel">
+					<Anchor point="LEFT" relativePoint="RIGHT" relativeTo="AuxBuyTotalLabel">
 						<Offset>
 							<AbsDimension x="10" y="0"/>
 						</Offset>
@@ -198,45 +198,45 @@
 				</Anchors>
 			</Frame> -->
 		
-			<ScrollFrame name="AuctionatorBuyScrollFrame" inherits="FauxScrollFrameTemplate">
+			<ScrollFrame name="AuxBuyScrollFrame" inherits="FauxScrollFrameTemplate">
 				<Size><AbsDimension x="785" y="309"/></Size>
 				<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="13" y="-98"/></Offset></Anchor></Anchors>
 
 				<Scripts>
 					<OnVerticalScroll>
-						FauxScrollFrame_OnVerticalScroll(16, Auctionator_Buy_ScrollbarUpdate)
+						FauxScrollFrame_OnVerticalScroll(16, Aux_Buy_ScrollbarUpdate)
 					</OnVerticalScroll>
 					<OnShow>
-						<!--Auctionator_ScrollbarUpdate();-->
+						<!--Aux_ScrollbarUpdate();-->
 					</OnShow>
 				</Scripts>
 			</ScrollFrame>
 
-            <Button name="AuctionatorBuyEntry1" inherits="AuctionatorBuyEntryTemplate">
-            <Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyScrollFrame" relativePoint="TOPLEFT"><Offset><AbsDimension x="8" y="0"/></Offset></Anchor></Anchors>
+            <Button name="AuxBuyEntry1" inherits="AuxBuyEntryTemplate">
+            <Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyScrollFrame" relativePoint="TOPLEFT"><Offset><AbsDimension x="8" y="0"/></Offset></Anchor></Anchors>
             </Button>
-            <Button name="AuctionatorBuyEntry2"  inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry1"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry3"  inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry2"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry4"  inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry3"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry5"  inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry4"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry6"  inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry5"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry7"  inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry6"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry8"  inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry7"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry9"  inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry8"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry10" inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry9"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry11" inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry10" relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry12" inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry11" relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry13" inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry12" relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry14" inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry13" relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry15" inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry14" relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry16" inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry15" relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry17" inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry16" relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry18" inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry17" relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="AuctionatorBuyEntry19" inherits="AuctionatorBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorBuyEntry18" relativePoint="BOTTOMLEFT"/></Anchors></Button>		
+            <Button name="AuxBuyEntry2"  inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry1"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry3"  inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry2"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry4"  inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry3"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry5"  inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry4"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry6"  inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry5"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry7"  inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry6"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry8"  inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry7"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry9"  inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry8"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry10" inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry9"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry11" inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry10" relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry12" inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry11" relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry13" inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry12" relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry14" inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry13" relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry15" inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry14" relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry16" inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry15" relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry17" inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry16" relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry18" inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry17" relativePoint="BOTTOMLEFT"/></Anchors></Button>
+            <Button name="AuxBuyEntry19" inherits="AuxBuyEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxBuyEntry18" relativePoint="BOTTOMLEFT"/></Anchors></Button>		
 		</Frames>
 	</Frame>
 	
-	<Frame name="AuctionatorBuyReport" frameStrata="FULLSCREEN_DIALOG"  toplevel="true" parent="UIParent" enableMouse="true" hidden="true">
+	<Frame name="AuxBuyReport" frameStrata="FULLSCREEN_DIALOG"  toplevel="true" parent="UIParent" enableMouse="true" hidden="true">
 		<Size><AbsDimension x="400" y="180" /></Size>		
 		<Anchors><Anchor point="TOP"><Offset><AbsDimension x="0" y="-90"/></Offset></Anchor></Anchors>
 
@@ -247,7 +247,7 @@
 		</Backdrop>
 
 		<Frames>
-			<SimpleHTML name="AuctionatorBuyReportHTML">
+			<SimpleHTML name="AuxBuyReportHTML">
 				<Size><AbsDimension x="420" y="420" /></Size>		
 				<Anchors>
 					<Anchor point="TOPLEFT"><Offset><AbsDimension x="30" y="-30"/></Offset></Anchor>
@@ -261,7 +261,7 @@
 				<Anchors><Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="-20" y="15"/></Offset></Anchor></Anchors>
 				<Scripts>
 					<OnClick>
-						AuctionatorBuyReport:Hide()
+						AuxBuyReport:Hide()
 					</OnClick>
 				</Scripts>
 			</Button>
diff --git a/core.lua b/core.lua
index 9f7290a..f46a992 100644
--- a/core.lua
+++ b/core.lua
@@ -1,11 +1,11 @@
-AuctionatorVersion = "1.2.0-Vanilla"
-AuctionatorAuthors = "Zirco (Original); Nimeral (Backport); shirsig, Zerf (Update)"
+AuxVersion = "1.2.0-Vanilla"
+AuxAuthors = "Zirco (Original); Nimeral (Backport); shirsig, Zerf (Update)"
 
 AUCTIONATOR_ENABLE_ALT = true
 AUCTIONATOR_OPEN_FIRST = false
 AUCTIONATOR_INSTANT_BUYOUT = false
 
-Auctionator = {
+Aux = {
 	loaded = false,
 	orig = {},
 	elements = {},
@@ -25,36 +25,36 @@ local relevel
 
 -----------------------------------------
 
-function Auctionator_OnLoad()
-	Auctionator_Log("Auctionator v"..AuctionatorVersion.." loaded")
-	Auctionator.loaded = true
+function Aux_OnLoad()
+	Aux_Log("Aux v"..AuxVersion.." loaded")
+	Aux.loaded = true
 end
 
 -----------------------------------------
 
-function Auctionator_OnEvent()
+function Aux_OnEvent()
 	if event == "VARIABLES_LOADED" then
-		Auctionator_OnLoad()
+		Aux_OnLoad()
 	elseif event == "ADDON_LOADED" then
-		Auctionator_OnAddonLoaded()
+		Aux_OnAddonLoaded()
 	elseif event == "AUCTION_HOUSE_SHOW" then
-		Auctionator_OnAuctionHouseShow()
+		Aux_OnAuctionHouseShow()
 	elseif event == "AUCTION_HOUSE_CLOSED" then
-		Auctionator_OnAuctionHouseClosed()
+		Aux_OnAuctionHouseClosed()
 	end
 end
 
 -----------------------------------------
 
-function Auctionator_OnAddonLoaded()
+function Aux_OnAddonLoaded()
 
 	if string.lower(arg1) == "blizzard_auctionui" then
-		Auctionator_AddTabs()
-		Auctionator_AddPanels()
+		Aux_AddTabs()
+		Aux_AddPanels()
 		
-		Auctionator_SetupHookFunctions()
+		Aux_SetupHookFunctions()
 		
-		Auctionator.tabs.sell.hiddenElements = {
+		Aux.tabs.sell.hiddenElements = {
 				AuctionsTitle,
 				AuctionsScrollFrame,
 				AuctionsButton1,
@@ -73,7 +73,7 @@ function Auctionator_OnAddonLoaded()
 				AuctionsCancelAuctionButton
 		}
         
-		Auctionator.tabs.buy.hiddenElements = {
+		Aux.tabs.buy.hiddenElements = {
 				BidTitle,
 				BidScrollFrame,
 				BidQualitySort,
@@ -88,99 +88,99 @@ function Auctionator_OnAddonLoaded()
 				BidBidText
 		}
 
-		Auctionator.tabs.sell.shownElements = {
-				getglobal("Auctionator_Recommend_Text"),
-				getglobal("Auctionator_RecommendPerItem_Text"),
-				getglobal("Auctionator_RecommendPerItem_Price"),
-				getglobal("Auctionator_RecommendPerStack_Text"),
-				getglobal("Auctionator_RecommendPerStack_Price"),
-				getglobal("Auctionator_Recommend_Basis_Text"),
-				getglobal("Auctionator_RecommendItem_Tex")
+		Aux.tabs.sell.shownElements = {
+				getglobal("Aux_Recommend_Text"),
+				getglobal("Aux_RecommendPerItem_Text"),
+				getglobal("Aux_RecommendPerItem_Price"),
+				getglobal("Aux_RecommendPerStack_Text"),
+				getglobal("Aux_RecommendPerStack_Price"),
+				getglobal("Aux_Recommend_Basis_Text"),
+				getglobal("Aux_RecommendItem_Tex")
 		}
 	end
 end
 
 -----------------------------------------
 
-function Auctionator_OnAuctionHouseShow()
+function Aux_OnAuctionHouseShow()
 
-	AuctionatorOptionsButtonPanel:Show()
+	AuxOptionsButtonPanel:Show()
 
 	if AUCTIONATOR_OPEN_FIRST then
-		AuctionFrameTab_OnClick(Auctionator.tabs.sell.index)
+		AuctionFrameTab_OnClick(Aux.tabs.sell.index)
 	end
 
 end
 
 -----------------------------------------
 
-function Auctionator_OnAuctionHouseClosed()
+function Aux_OnAuctionHouseClosed()
 
-	if not Auctionator_Scan_IsIdle() then
-		Auctionator_Scan_Abort()
+	if not Aux_Scan_IsIdle() then
+		Aux_Scan_Abort()
 	end
 	
-	AuctionatorOptionsButtonPanel:Hide()
-	AuctionatorOptionsFrame:Hide()
-	AuctionatorDescriptionFrame:Hide()
-	AuctionatorSellPanel:Hide()
-    AuctionatorBuyPanel:Hide()
+	AuxOptionsButtonPanel:Hide()
+	AuxOptionsFrame:Hide()
+	AuxDescriptionFrame:Hide()
+	AuxSellPanel:Hide()
+    AuxBuyPanel:Hide()
 	
 end
 
 -----------------------------------------
 
-function Auctionator_AuctionFrameTab_OnClick(index)
+function Aux_AuctionFrameTab_OnClick(index)
 	
 	if not index then
 		index = this:GetID()
 	end
 	
-	if not Auctionator_Scan_IsIdle() then
-		Auctionator_Scan_Abort()
+	if not Aux_Scan_IsIdle() then
+		Aux_Scan_Abort()
 	end
-	AuctionatorSellPanel:Hide()
-    AuctionatorBuyPanel:Hide()
+	AuxSellPanel:Hide()
+    AuxBuyPanel:Hide()
 
 	if index == 2 then		
-		Auctionator_ShowElems(Auctionator.tabs.buy.hiddenElements)
+		Aux_ShowElems(Aux.tabs.buy.hiddenElements)
 	end
 	
 	if index == 3 then		
-		Auctionator_ShowElems(Auctionator.tabs.sell.hiddenElements)
+		Aux_ShowElems(Aux.tabs.sell.hiddenElements)
 	end
 	
-	if index == Auctionator.tabs.sell.index then
+	if index == Aux.tabs.sell.index then
 		AuctionFrameTab_OnClick(3)
 		
-		PanelTemplates_SetTab(AuctionFrame, Auctionator.tabs.sell.index)
+		PanelTemplates_SetTab(AuctionFrame, Aux.tabs.sell.index)
 		
-		Auctionator_HideElems(Auctionator.tabs.sell.hiddenElements)
+		Aux_HideElems(Aux.tabs.sell.hiddenElements)
 		
-		AuctionatorSellPanel:Show()
+		AuxSellPanel:Show()
 		AuctionFrame:EnableMouse(false)
 		
-		Auctionator_OnNewAuctionUpdate()
-    elseif index == Auctionator.tabs.buy.index then
+		Aux_OnNewAuctionUpdate()
+    elseif index == Aux.tabs.buy.index then
         AuctionFrameTab_OnClick(2)
 		
-		PanelTemplates_SetTab(AuctionFrame, Auctionator.tabs.buy.index)
+		PanelTemplates_SetTab(AuctionFrame, Aux.tabs.buy.index)
 		
-		Auctionator_HideElems(Auctionator.tabs.buy.hiddenElements)
+		Aux_HideElems(Aux.tabs.buy.hiddenElements)
 		
-		AuctionatorBuyPanel:Show()
+		AuxBuyPanel:Show()
 		AuctionFrame:EnableMouse(false)
 		
-		Auctionator_Buy_ScrollbarUpdate()
+		Aux_Buy_ScrollbarUpdate()
     else
-        Auctionator.orig.AuctionFrameTab_OnClick(index)
+        Aux.orig.AuctionFrameTab_OnClick(index)
 		lastItemPosted = nil
 	end
 end
 
 -----------------------------------------
 
-function Auctionator_Log(msg)
+function Aux_Log(msg)
 	if DEFAULT_CHAT_FRAME then
 		DEFAULT_CHAT_FRAME:AddMessage(msg, 1, 1, 0)
 	end
@@ -188,21 +188,21 @@ end
 
 -----------------------------------------
 
-function Auctionator_AddPanels()
+function Aux_AddPanels()
 	
-	local sellFrame = CreateFrame("Frame", "AuctionatorSellPanel", AuctionFrame, "AuctionatorSellTemplate")
+	local sellFrame = CreateFrame("Frame", "AuxSellPanel", AuctionFrame, "AuxSellTemplate")
 	sellFrame:SetParent("AuctionFrame")
 	sellFrame:SetPoint("TOPLEFT", "AuctionFrame", "TOPLEFT")
 	relevel(sellFrame)
 	sellFrame:Hide()
     
-    local buyFrame = CreateFrame("Frame", "AuctionatorBuyPanel", AuctionFrame, "AuctionatorBuyTemplate")
+    local buyFrame = CreateFrame("Frame", "AuxBuyPanel", AuctionFrame, "AuxBuyTemplate")
 	buyFrame:SetParent("AuctionFrame")
 	buyFrame:SetPoint("TOPLEFT", "AuctionFrame", "TOPLEFT")
 	relevel(buyFrame)
 	buyFrame:Hide()
 	
-	local optionsFrame = CreateFrame("Frame", "AuctionatorOptionsButtonPanel", AuctionFrame, "AuctionatorOptionsButtonTemplate")
+	local optionsFrame = CreateFrame("Frame", "AuxOptionsButtonPanel", AuctionFrame, "AuxOptionsButtonTemplate")
 	optionsFrame:SetParent("AuctionFrame")
 	optionsFrame:SetPoint("TOPLEFT", "AuctionFrame", "TOPLEFT")
 	relevel(optionsFrame)
@@ -211,13 +211,13 @@ end
 
 -----------------------------------------
 
-function Auctionator_AddTabs()
+function Aux_AddTabs()
 	
-	Auctionator.tabs.sell.index = AuctionFrame.numTabs + 1
-    Auctionator.tabs.buy.index = AuctionFrame.numTabs + 2
+	Aux.tabs.sell.index = AuctionFrame.numTabs + 1
+    Aux.tabs.buy.index = AuctionFrame.numTabs + 2
 
-	local sellTabName = "AuctionFrameTab"..Auctionator.tabs.sell.index
-    local buyTabName = "AuctionFrameTab"..Auctionator.tabs.buy.index
+	local sellTabName = "AuctionFrameTab"..Aux.tabs.sell.index
+    local buyTabName = "AuctionFrameTab"..Aux.tabs.buy.index
 
 	local sellTab = CreateFrame("Button", sellTabName, AuctionFrame, "AuctionTabTemplate")
     local buyTab = CreateFrame("Button", buyTabName, AuctionFrame, "AuctionTabTemplate")
@@ -225,22 +225,22 @@ function Auctionator_AddTabs()
 	setglobal(sellTabName, sellTab)
     setglobal(buyTabName, buyTab)
     
-	sellTab:SetID(Auctionator.tabs.sell.index)
+	sellTab:SetID(Aux.tabs.sell.index)
 	sellTab:SetText("Sell")
 	sellTab:SetPoint("LEFT", getglobal("AuctionFrameTab"..AuctionFrame.numTabs), "RIGHT", -8, 0)
     
-    buyTab:SetID(Auctionator.tabs.buy.index)
+    buyTab:SetID(Aux.tabs.buy.index)
 	buyTab:SetText("Buy")
-	buyTab:SetPoint("LEFT", getglobal("AuctionFrameTab"..Auctionator.tabs.sell.index), "RIGHT", -8, 0)
+	buyTab:SetPoint("LEFT", getglobal("AuctionFrameTab"..Aux.tabs.sell.index), "RIGHT", -8, 0)
 	
-	PanelTemplates_SetNumTabs(AuctionFrame, Auctionator.tabs.buy.index)
-    PanelTemplates_EnableTab(AuctionFrame, Auctionator.tabs.sell.index)
-	PanelTemplates_EnableTab(AuctionFrame, Auctionator.tabs.buy.index)
+	PanelTemplates_SetNumTabs(AuctionFrame, Aux.tabs.buy.index)
+    PanelTemplates_EnableTab(AuctionFrame, Aux.tabs.sell.index)
+	PanelTemplates_EnableTab(AuctionFrame, Aux.tabs.buy.index)
 end
 
 -----------------------------------------
 
-function Auctionator_HideElems(tt)
+function Aux_HideElems(tt)
 
 	if not tt then
 		return;
@@ -253,7 +253,7 @@ end
 
 -----------------------------------------
 
-function Auctionator_ShowElems(tt)
+function Aux_ShowElems(tt)
 
 	for i,x in ipairs(tt) do
 		x:Show()
@@ -262,7 +262,7 @@ end
 
 -----------------------------------------
 
-function Auctionator_PluralizeIf(word, count)
+function Aux_PluralizeIf(word, count)
 
 	if count and count == 1 then
 		return word
@@ -273,25 +273,25 @@ end
 
 -----------------------------------------
 
-function Auctionator_Round(v)
+function Aux_Round(v)
 	return math.floor(v + 0.5)
 end
 
 -----------------------------------------
 
-function Auctionator_AddToSet(set, key)
+function Aux_AddToSet(set, key)
     set[key] = true
 end
 
-function Auctionator_RemoveFromSet(set, key)
+function Aux_RemoveFromSet(set, key)
     set[key] = nil
 end
 
-function Auctionator_SetContains(set, key)
+function Aux_SetContains(set, key)
     return set[key] ~= nil
 end
 
-function Auctionator_SetSize(set)
+function Aux_SetSize(set)
     local size = 0
 	for _,_ in pairs(set) do
 		size = size + 1
@@ -312,15 +312,15 @@ end
 
 -----------------------------------------
 
-function Auctionator_BrowseButton_OnClick(button)
+function Aux_BrowseButton_OnClick(button)
 	if arg1 == "LeftButton" then -- because we additionally registered right clicks we only let left ones pass here
-		Auctionator.orig.BrowseButton_OnClick(button)
+		Aux.orig.BrowseButton_OnClick(button)
 	end
 end
 
 -----------------------------------------
 
-function Auctionator_BrowseButton_OnMouseDown()
+function Aux_BrowseButton_OnMouseDown()
 	if arg1 == "RightButton" and AUCTIONATOR_INSTANT_BUYOUT then
 		local index = this:GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame)
 	
@@ -337,32 +337,32 @@ end
 
 -----------------------------------------
 
-function Auctionator_ContainerFrameItemButton_OnClick(button)
+function Aux_ContainerFrameItemButton_OnClick(button)
 	
 	if button == "LeftButton"
 			and IsShiftKeyDown()
 			and not ChatFrameEditBox:IsVisible()
-			and (PanelTemplates_GetSelectedTab(AuctionFrame) == 1 or PanelTemplates_GetSelectedTab(AuctionFrame) == Auctionator.tabs.buy.index)
+			and (PanelTemplates_GetSelectedTab(AuctionFrame) == 1 or PanelTemplates_GetSelectedTab(AuctionFrame) == Aux.tabs.buy.index)
 	then
 		local itemLink = GetContainerItemLink(this:GetParent():GetID(), this:GetID())
 		if itemLink then
 		local itemName = string.gsub(itemLink, "^.-%[(.*)%].*", "%1")
 			if PanelTemplates_GetSelectedTab(AuctionFrame) == 1 then
 				BrowseName:SetText(itemName)
-			elseif PanelTemplates_GetSelectedTab(AuctionFrame) == Auctionator.tabs.buy.index then
-				AuctionatorBuySearchBox:SetText(itemName)
+			elseif PanelTemplates_GetSelectedTab(AuctionFrame) == Aux.tabs.buy.index then
+				AuxBuySearchBox:SetText(itemName)
 			end
 		end
 	else
-		Auctionator.orig.ContainerFrameItemButton_OnClick(button)
+		Aux.orig.ContainerFrameItemButton_OnClick(button)
 
 		if AUCTIONATOR_ENABLE_ALT and AuctionFrame:IsShown() and IsAltKeyDown() and button == "LeftButton" then
 		
 			ClickAuctionSellItemButton()
 			ClearCursor()
 			
-			if PanelTemplates_GetSelectedTab(AuctionFrame) ~= Auctionator.tabs.sell.index then
-				AuctionFrameTab_OnClick(Auctionator.tabs.sell.index)
+			if PanelTemplates_GetSelectedTab(AuctionFrame) ~= Aux.tabs.sell.index then
+				AuctionFrameTab_OnClick(Aux.tabs.sell.index)
 			end
 		end
 	end
@@ -370,7 +370,7 @@ end
 
 -----------------------------------------
 
-function Auctionator_QualityColor(code)
+function Aux_QualityColor(code)
 	if code == 0 then
 		return "ff9d9d9d" -- poor, gray
 	elseif code == 1 then
diff --git a/core.xml b/core.xml
index deadfe7..371d8f3 100644
--- a/core.xml
+++ b/core.xml
@@ -12,7 +12,7 @@
 				this:RegisterEvent("AUCTION_HOUSE_CLOSED")
 			</OnLoad>
 			<OnEvent> 
-				Auctionator_OnEvent()
+				Aux_OnEvent()
 			</OnEvent> 
 		</Scripts> 
 	</Frame>
diff --git a/options.lua b/options.lua
index e0cb7a4..25b07cf 100644
--- a/options.lua
+++ b/options.lua
@@ -1,88 +1,88 @@
 local BoolToString, BoolToNum, NumToBool
 
-function Auctionator_ShowDescriptionFrame()
-	AuctionatorDescriptionFrame:Show()
+function Aux_ShowDescriptionFrame()
+	AuxDescriptionFrame:Show()
 	
-	AuctionatorDescriptionHTML:SetText("<html><body>"
-			.."<h1>What is Auctionator?</h1><br/>"
+	AuxDescriptionHTML:SetText("<html><body>"
+			.."<h1>What is Aux?</h1><br/>"
 			.."<p>"
 			.."Figuring out a good buyout price when posting auctions can be tedious and time-consuming.  If you're like most people, you first browse the current "
 			.."auctions to get a sense of how much your item is currently selling for.  Then you undercut the lowest price by a bit. If you're creating multiple auctions "
 			.."you're bouncing back and forth between the Browse tab and the Auctions tab, doing lots of division in "
 			.."your head, and doing lots of clicking and typing."
 			.."</p><br/><h1>How it works</h1><br/><p>"
-			.."The Auctionator Sell panel makes this whole process easy and streamlined.  When you select an item to auction, Auctionator displays a summary of all the current auctions for "
-			.."that item sorted by per-item price. Auctionator also calculates a recommended buyout price based on the cheapest per-item price for your item. If you're "
-			.."selling a stack rather than a single item, Auctionator bases its recommended buyout price on the cheapest stack of the same size."
+			.."The Aux Sell panel makes this whole process easy and streamlined.  When you select an item to auction, Aux displays a summary of all the current auctions for "
+			.."that item sorted by per-item price. Aux also calculates a recommended buyout price based on the cheapest per-item price for your item. If you're "
+			.."selling a stack rather than a single item, Aux bases its recommended buyout price on the cheapest stack of the same size."
 			.."</p><br/><p>"
-			.."If you don't like Auctionator's recommendation, you can click on any line in the summary and Auctionator will recalculate the recommended buyout price based "
-			.."on that auction.  Of course, you can always override Auctionator's recommendation by just typing in your own buyout price."
+			.."If you don't like Aux's recommendation, you can click on any line in the summary and Aux will recalculate the recommended buyout price based "
+			.."on that auction.  Of course, you can always override Aux's recommendation by just typing in your own buyout price."
 			.."</p><br/><p>"
-			.."With Auctionator, creating an auction is usually just a matter of picking an item to auction and clicking the Create Auction button."
+			.."With Aux, creating an auction is usually just a matter of picking an item to auction and clicking the Create Auction button."
 			.."</p><br/><p>"
-			.."Additionally the Auctionator Buy panel lets you make mass purchases from a list of items sorted by unit price."
+			.."Additionally the Aux Buy panel lets you make mass purchases from a list of items sorted by unit price."
 			.."</p>"
 			.."</body></html>")
 			
-	AuctionatorDescriptionHTML:SetSpacing(3)
+	AuxDescriptionHTML:SetSpacing(3)
 	
-	AuctionatorAuthorText:SetText("Authors: "..AuctionatorAuthors)
+	AuxAuthorText:SetText("Authors: "..AuxAuthors)
 end
 
 -----------------------------------------
 
-function Auctionator_ShowOptionsFrame()
+function Aux_ShowOptionsFrame()
 
-	AuctionatorOptionsFrame:Show()
-	AuctionatorOptionsFrame:SetBackdropColor(0,0,0,100)
+	AuxOptionsFrame:Show()
+	AuxOptionsFrame:SetBackdropColor(0,0,0,100)
 	
-	AuctionatorConfigFrameTitle:SetText("Auctionator Options for "..UnitName("player"))
+	AuxConfigFrameTitle:SetText("Aux Options for "..UnitName("player"))
 
-	AuctionatorExplanation:SetText("Auctionator is an addon designed to make it easier and faster to setup your auctions and find the best deals at the auction house.")
+	AuxExplanation:SetText("Aux is an addon designed to make it easier and faster to setup your auctions and find the best deals at the auction house.")
 
 
-	AuctionatorVersionText:SetText("Version: "..AuctionatorVersion)
+	AuxVersionText:SetText("Version: "..AuxVersion)
 	
-	AuctionatorOption_Enable_Alt:SetChecked(AUCTIONATOR_ENABLE_ALT)
-	AuctionatorOption_Open_First:SetChecked(AUCTIONATOR_OPEN_FIRST)
-	AuctionatorOption_Instant_Buyout:SetChecked(AUCTIONATOR_INSTANT_BUYOUT)
+	AuxOption_Enable_Alt:SetChecked(AUCTIONATOR_ENABLE_ALT)
+	AuxOption_Open_First:SetChecked(AUCTIONATOR_OPEN_FIRST)
+	AuxOption_Instant_Buyout:SetChecked(AUCTIONATOR_INSTANT_BUYOUT)
 end
 
 -----------------------------------------
 
-function AuctionatorOptionsSave()
+function AuxOptionsSave()
 
-	AUCTIONATOR_ENABLE_ALT = AuctionatorOption_Enable_Alt:GetChecked()
-	AUCTIONATOR_OPEN_FIRST = AuctionatorOption_Open_First:GetChecked()
-	AUCTIONATOR_INSTANT_BUYOUT = AuctionatorOption_Instant_Buyout:GetChecked()
+	AUCTIONATOR_ENABLE_ALT = AuxOption_Enable_Alt:GetChecked()
+	AUCTIONATOR_OPEN_FIRST = AuxOption_Open_First:GetChecked()
+	AUCTIONATOR_INSTANT_BUYOUT = AuxOption_Instant_Buyout:GetChecked()
 	
 end
 
 -----------------------------------------
 
-function Auctionator_ShowTooltip_EnableAlt()
+function Aux_ShowTooltip_EnableAlt()
 
 	GameTooltip:SetOwner(this, "ANCHOR_BOTTOM")
 	GameTooltip:SetText("Enable ALT-key shortcut", 0.9, 1.0, 1.0)
-	GameTooltip:AddLine("If this option is checked, holding the Alt key down while clicking an item in your bags will switch to the Auctionator Sell panel, place the item in the Auction Item area, and suggest a price.", 0.5, 0.5, 1.0, 1)
+	GameTooltip:AddLine("If this option is checked, holding the Alt key down while clicking an item in your bags will switch to the Aux Sell panel, place the item in the Auction Item area, and suggest a price.", 0.5, 0.5, 1.0, 1)
 	GameTooltip:Show()
 
 end
 
 -----------------------------------------
 
-function Auctionator_ShowTooltip_OpenFirst()
+function Aux_ShowTooltip_OpenFirst()
 
 	GameTooltip:SetOwner(this, "ANCHOR_BOTTOM")
-	GameTooltip:SetText("Automatically open Auctionator Sell panel", 0.9, 1.0, 1.0)
-	GameTooltip:AddLine("If this option is checked, the Auctionator Sell panel will display first whenever you open the Auction House window.", 0.5, 0.5, 1.0, 1)
+	GameTooltip:SetText("Automatically open Aux Sell panel", 0.9, 1.0, 1.0)
+	GameTooltip:AddLine("If this option is checked, the Aux Sell panel will display first whenever you open the Auction House window.", 0.5, 0.5, 1.0, 1)
 	GameTooltip:Show()
 
 end
 
 -----------------------------------------
 
-function Auctionator_ShowTooltip_InstantBuyout()
+function Aux_ShowTooltip_InstantBuyout()
 
 	GameTooltip:SetOwner(this, "ANCHOR_BOTTOM")
 	GameTooltip:SetText("Enable right-click instant buyout", 0.9, 1.0, 1.0)
diff --git a/options.xml b/options.xml
index cf6921a..d44e8fa 100644
--- a/options.xml
+++ b/options.xml
@@ -2,7 +2,7 @@
 
 	<Script file="Options.lua"/> 
 	
-	<Frame name="AuctionatorOptionsButtonTemplate" virtual="true" hidden="true">
+	<Frame name="AuxOptionsButtonTemplate" virtual="true" hidden="true">
 		<Size>
 			<AbsDimension x="1" y="1"/>
 		</Size>
@@ -14,19 +14,19 @@
 			</Anchor>
 		</Anchors>
 		<Frames>
-			<Button name="AuctionatorOptionsButton" inherits="UIPanelButtonTemplate" text="Auctionator">
+			<Button name="AuxOptionsButton" inherits="UIPanelButtonTemplate" text="Aux">
 				<Size><AbsDimension x="126" y="22"/></Size>
 				<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="682" y="-12"/></Offset></Anchor></Anchors>
 				<Scripts>
 					<OnClick>
-						Auctionator_ShowOptionsFrame()
+						Aux_ShowOptionsFrame()
 					</OnClick>
 				</Scripts>
 			</Button>
 		</Frames>
 	</Frame>
 			
-	<Frame name="AuctionatorOptionsFrame" frameStrata="HIGH" toplevel="true" parent="UIParent" enableMouse="true" hidden="true">
+	<Frame name="AuxOptionsFrame" frameStrata="HIGH" toplevel="true" parent="UIParent" enableMouse="true" hidden="true">
 		<Size><AbsDimension x="400" y="375"/></Size>		
 		<Anchors><Anchor point="TOP"><Offset><AbsDimension x="0" y="-170"/></Offset></Anchor></Anchors>
 
@@ -38,13 +38,13 @@
 
 		<Layers>
 			<Layer level="ARTWORK">
-				<Texture name="AuctionatorConfigFrameHeader" file="Interface\DialogFrame\UI-DialogBox-Header">
+				<Texture name="AuxConfigFrameHeader" file="Interface\DialogFrame\UI-DialogBox-Header">
 					<Size x="256" y="64"/>
 					<Anchors><Anchor point="TOP"><Offset x="0" y="12"/></Anchor></Anchors>
 				</Texture>
-				<FontString inherits="GameFontNormal" text="Auctionator">
+				<FontString inherits="GameFontNormal" text="Aux">
 					<Anchors>
-						<Anchor point="TOP" relativeTo="AuctionatorConfigFrameHeader">
+						<Anchor point="TOP" relativeTo="AuxConfigFrameHeader">
 							<Offset x="0" y="-14"/>
 						</Anchor>
 					</Anchors>
@@ -53,7 +53,7 @@
 		</Layers>
 
 		<Frames>
-			<Frame name="AuctionatorAboutTitleText">
+			<Frame name="AuxAboutTitleText">
 				<Size><AbsDimension y="30" /></Size>		
 				<Anchors>
 					<Anchor point="TOP"><Offset><AbsDimension y="-50"/></Offset></Anchor>
@@ -62,7 +62,7 @@
 				</Anchors>
 				<Layers>
 					<Layer level="BACKGROUND">
-						<FontString inherits="GameFontNormal" text="About Auctionator" justifyH="LEFT" justifyV="TOP"></FontString>
+						<FontString inherits="GameFontNormal" text="About Aux" justifyH="LEFT" justifyV="TOP"></FontString>
 					</Layer>
 				</Layers>
 			</Frame>
@@ -71,13 +71,13 @@
 			<Frame>
 				<Size><AbsDimension y="35" /></Size>		
 				<Anchors>
-					<Anchor point="TOP" relativeTo="AuctionatorAboutTitleText" relativePoint="BOTTOM"><Offset><AbsDimension y="-5"/></Offset></Anchor>
+					<Anchor point="TOP" relativeTo="AuxAboutTitleText" relativePoint="BOTTOM"><Offset><AbsDimension y="-5"/></Offset></Anchor>
 					<Anchor point="LEFT"><Offset><AbsDimension x="30"/></Offset></Anchor>
 					<Anchor point="RIGHT"><Offset><AbsDimension x="-30"/></Offset></Anchor>
 				</Anchors> 
 				<Layers>
 					<Layer level="BACKGROUND">
-						<FontString name="AuctionatorExplanation" inherits="GameFontHighlight" justifyH="LEFT" justifyV="TOP" >
+						<FontString name="AuxExplanation" inherits="GameFontHighlight" justifyH="LEFT" justifyV="TOP" >
 						<Anchors>
 							<Anchor point="TOPLEFT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
 							<Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
@@ -87,21 +87,21 @@
 				</Layers>
 			</Frame>
 			
-			<Button name="AuctionatorOptionsButton_More" inherits="UIPanelButtonTemplate" text="Read More">
+			<Button name="AuxOptionsButton_More" inherits="UIPanelButtonTemplate" text="Read More">
 				<Size><AbsDimension x="80" y="18"/>	</Size>
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="AuctionatorExplanation" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="-3" y="-5"/></Offset></Anchor>
+					<Anchor point="TOPLEFT" relativeTo="AuxExplanation" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="-3" y="-5"/></Offset></Anchor>
 				</Anchors> 
 				<NormalFont inherits="GameFontNormalSmall"/>
 				<HighlightFont inherits="GameFontHighlightSmall"/>
 				<Scripts>
 					<OnClick>
-						Auctionator_ShowDescriptionFrame()
+						Aux_ShowDescriptionFrame()
 					</OnClick>
 				</Scripts>
 			</Button>
 			
-			<Frame name="AuctionatorOption_Title">
+			<Frame name="AuxOption_Title">
 				<Size><AbsDimension y="30" /></Size>		
 				<Anchors>
 					<Anchor point="TOP"  ><Offset><AbsDimension y="-180"/></Offset></Anchor>
@@ -110,23 +110,23 @@
 				</Anchors>
 				<Layers>
 					<Layer level="BACKGROUND">
-						<FontString name="AuctionatorConfigFrameTitle" inherits="GameFontNormal" justifyH="LEFT" justifyV="TOP" text="Options">
+						<FontString name="AuxConfigFrameTitle" inherits="GameFontNormal" justifyH="LEFT" justifyV="TOP" text="Options">
 						</FontString>
 					</Layer>
 				</Layers>
 			</Frame>
 			
-			<Frame name="AuctionatorOption_Enable_Alt_Box">
+			<Frame name="AuxOption_Enable_Alt_Box">
 				<Size><AbsDimension y="40" /></Size>		
 				<Anchors>
-					<Anchor point="TOP" relativeTo="AuctionatorOption_Title" relativePoint="BOTTOM" ><Offset><AbsDimension y="-5"/></Offset></Anchor>
+					<Anchor point="TOP" relativeTo="AuxOption_Title" relativePoint="BOTTOM" ><Offset><AbsDimension y="-5"/></Offset></Anchor>
 					<Anchor point="LEFT" ><Offset><AbsDimension x="40"/></Offset></Anchor>
 					<Anchor point="RIGHT"><Offset><AbsDimension x="-20"/></Offset></Anchor>
 				</Anchors>
 				
 				<Scripts>
 					<OnEnter>
-						Auctionator_ShowTooltip_EnableAlt()
+						Aux_ShowTooltip_EnableAlt()
 					</OnEnter>
 					<OnLeave>
 						GameTooltip:Hide()
@@ -135,13 +135,13 @@
 
 				<Frames>
 
-					<CheckButton name="AuctionatorOption_Enable_Alt" inherits="UICheckButtonTemplate">
+					<CheckButton name="AuxOption_Enable_Alt" inherits="UICheckButtonTemplate">
 						<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>
 						<Layers>
 							<Layer level="BACKGROUND">
 								<FontString inherits="GameFontHighlight" text="Enable ALT-key shortcut">
 									<Anchors>
-										<Anchor point="LEFT" relativePoint="RIGHT" relativeTo="AuctionatorOption_Enable_Alt">
+										<Anchor point="LEFT" relativePoint="RIGHT" relativeTo="AuxOption_Enable_Alt">
 											<Offset><AbsDimension x="8" y="1"/></Offset>
 										</Anchor>
 									</Anchors>
@@ -150,7 +150,7 @@
 						</Layers>
 						<Scripts>
 							<OnEnter>
-								Auctionator_ShowTooltip_EnableAlt()
+								Aux_ShowTooltip_EnableAlt()
 							</OnEnter>
 							<OnLeave>
 								GameTooltip:Hide()
@@ -161,17 +161,17 @@
 				</Frames>
 			</Frame>
 
-			<Frame name="AuctionatorOption_Open_First_Box">
+			<Frame name="AuxOption_Open_First_Box">
 				<Size><AbsDimension y="40" /></Size>		
 				<Anchors>
-					<Anchor point="TOP" relativeTo="AuctionatorOption_Title" relativePoint="BOTTOM" ><Offset><AbsDimension y="-35"/></Offset></Anchor>
+					<Anchor point="TOP" relativeTo="AuxOption_Title" relativePoint="BOTTOM" ><Offset><AbsDimension y="-35"/></Offset></Anchor>
 					<Anchor point="LEFT" ><Offset><AbsDimension x="40"/></Offset></Anchor>
 					<Anchor point="RIGHT"><Offset><AbsDimension x="-20"/></Offset></Anchor>
 				</Anchors>
 				
 				<Scripts>
 					<OnEnter>
-						Auctionator_ShowTooltip_OpenFirst()
+						Aux_ShowTooltip_OpenFirst()
 					</OnEnter>
 					<OnLeave>
 						GameTooltip:Hide()
@@ -179,13 +179,13 @@
 				</Scripts>
 				
 				<Frames>
-					<CheckButton name="AuctionatorOption_Open_First" inherits="UICheckButtonTemplate">
+					<CheckButton name="AuxOption_Open_First" inherits="UICheckButtonTemplate">
 						<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>
 						<Layers>
 							<Layer level="BACKGROUND">
-								<FontString inherits="GameFontHighlight" text="Automatically open Auctionator Sell panel">
+								<FontString inherits="GameFontHighlight" text="Automatically open Aux Sell panel">
 									<Anchors>
-										<Anchor point="LEFT" relativePoint="RIGHT" relativeTo="AuctionatorOption_Open_First">
+										<Anchor point="LEFT" relativePoint="RIGHT" relativeTo="AuxOption_Open_First">
 											<Offset><AbsDimension x="8" y="1"/></Offset>
 										</Anchor>
 									</Anchors>
@@ -194,7 +194,7 @@
 						</Layers>
 						<Scripts>
 							<OnEnter>
-								Auctionator_ShowTooltip_OpenFirst()
+								Aux_ShowTooltip_OpenFirst()
 							</OnEnter>
 							<OnLeave>
 								GameTooltip:Hide()
@@ -205,17 +205,17 @@
 				</Frames>
 			</Frame>
 			
-			<Frame name="AuctionatorOption_Instant_Buyout_Box">
+			<Frame name="AuxOption_Instant_Buyout_Box">
 				<Size><AbsDimension y="40" /></Size>		
 				<Anchors>
-					<Anchor point="TOP" relativeTo="AuctionatorOption_Title" relativePoint="BOTTOM" ><Offset><AbsDimension y="-65"/></Offset></Anchor>
+					<Anchor point="TOP" relativeTo="AuxOption_Title" relativePoint="BOTTOM" ><Offset><AbsDimension y="-65"/></Offset></Anchor>
 					<Anchor point="LEFT" ><Offset><AbsDimension x="40"/></Offset></Anchor>
 					<Anchor point="RIGHT"><Offset><AbsDimension x="-20"/></Offset></Anchor>
 				</Anchors>
 				
 				<Scripts>
 					<OnEnter>
-						Auctionator_ShowTooltip_InstantBuyout()
+						Aux_ShowTooltip_InstantBuyout()
 					</OnEnter>
 					<OnLeave>
 						GameTooltip:Hide()
@@ -223,13 +223,13 @@
 				</Scripts>
 				
 				<Frames>
-					<CheckButton name="AuctionatorOption_Instant_Buyout" inherits="UICheckButtonTemplate">
+					<CheckButton name="AuxOption_Instant_Buyout" inherits="UICheckButtonTemplate">
 						<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>
 						<Layers>
 							<Layer level="BACKGROUND">
 								<FontString inherits="GameFontHighlight" text="Enable right-click instant buyout">
 									<Anchors>
-										<Anchor point="LEFT" relativePoint="RIGHT" relativeTo="AuctionatorOption_Instant_Buyout">
+										<Anchor point="LEFT" relativePoint="RIGHT" relativeTo="AuxOption_Instant_Buyout">
 											<Offset><AbsDimension x="8" y="1"/></Offset>
 										</Anchor>
 									</Anchors>
@@ -238,7 +238,7 @@
 						</Layers>
 						<Scripts>
 							<OnEnter>
-								Auctionator_ShowTooltip_InstantBuyout()
+								Aux_ShowTooltip_InstantBuyout()
 							</OnEnter>
 							<OnLeave>
 								GameTooltip:Hide()
@@ -256,28 +256,28 @@
 				</Anchors> 
 				<Layers>
 					<Layer level="BACKGROUND">
-						<FontString name="AuctionatorVersionText" inherits="GameFontDisableSmall" justifyH="LEFT" justifyV="TOP"></FontString>
+						<FontString name="AuxVersionText" inherits="GameFontDisableSmall" justifyH="LEFT" justifyV="TOP"></FontString>
 					</Layer>
 				</Layers>
 			</Frame>
 			
-			<Button name="AuctionatorOptionsButton_Cancel" inherits="UIPanelButtonTemplate" text="Cancel">
+			<Button name="AuxOptionsButton_Cancel" inherits="UIPanelButtonTemplate" text="Cancel">
 				<Size><AbsDimension x="80" y="22"/>	</Size>
 				<Anchors><Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="-20" y="15"/></Offset></Anchor></Anchors>
 				<Scripts>
 					<OnClick>
-						AuctionatorOptionsFrame:Hide()
+						AuxOptionsFrame:Hide()
 					</OnClick>
 				</Scripts>
 			</Button>
 
-			<Button name="AuctionatorOptionsButton_Okay" inherits="UIPanelButtonTemplate" text="Okay">
+			<Button name="AuxOptionsButton_Okay" inherits="UIPanelButtonTemplate" text="Okay">
 				<Size><AbsDimension x="80" y="22"/>	</Size>
-				<Anchors><Anchor point="RIGHT" relativePoint="LEFT" relativeTo="AuctionatorOptionsButton_Cancel"><Offset><AbsDimension x="-3" y="0"/></Offset></Anchor></Anchors>
+				<Anchors><Anchor point="RIGHT" relativePoint="LEFT" relativeTo="AuxOptionsButton_Cancel"><Offset><AbsDimension x="-3" y="0"/></Offset></Anchor></Anchors>
 				<Scripts>
 					<OnClick>
-						AuctionatorOptionsSave()
-						AuctionatorOptionsFrame:Hide()
+						AuxOptionsSave()
+						AuxOptionsFrame:Hide()
 					</OnClick>
 				</Scripts>
 			</Button>
diff --git a/scan.lua b/scan.lua
index d25e17f..ba014cd 100644
--- a/scan.lua
+++ b/scan.lua
@@ -18,13 +18,13 @@ local submitQuery, processQueryResults
 
 -----------------------------------------
 
-function Auctionator_Scan_IsIdle()
+function Aux_Scan_IsIdle()
 	return state == STATE_IDLE
 end
 
 -----------------------------------------
 
-function Auctionator_Scan_Complete()
+function Aux_Scan_Complete()
 	if state ~= STATE_IDLE then
 		if currentJob.onComplete then
 			currentJob.onComplete(scanData)
@@ -39,7 +39,7 @@ end
 
 -----------------------------------------
 
-function Auctionator_Scan_Abort()
+function Aux_Scan_Abort()
 	if state ~= STATE_IDLE then
 		if currentJob and currentJob.onAbort then
 			currentJob.onAbort()
@@ -54,12 +54,12 @@ end
 
 -----------------------------------------
 
-function Auctionator_Scan_Start(job)
+function Aux_Scan_Start(job)
 
-	Auctionator_SetMessage("Scanning auctions ...")
+	Aux_SetMessage("Scanning auctions ...")
 
 	if state ~= STATE_IDLE then
-		Auctionator_Scan_Abort()
+		Aux_Scan_Abort()
 	end
 	
 	currentJob = job
@@ -69,7 +69,7 @@ end
 
 -----------------------------------------
 
-function Auctionator_Scan_CreateQuery(parameterMap)
+function Aux_Scan_CreateQuery(parameterMap)
 	local query = {
 		name = nil,
 		minLevel = "",
@@ -117,16 +117,16 @@ function processQueryResults()
 	
 	local numBatchAuctions, totalAuctions = GetNumAuctionItems("list")
 
-	Auctionator_SetMessage("Scanning auctions: page "..currentPage.." ...")
+	Aux_SetMessage("Scanning auctions: page "..currentPage.." ...")
 			
 	for i = 1, numBatchAuctions do
 	
 		local name, texture, count, quality, canUse, level, minBid, minIncrement, buyoutPrice, bidAmount, highBidder, owner = GetAuctionItemInfo("list", i)
 		local duration = GetAuctionItemTimeLeft("list", i)
-		AuctionatorScanTooltip:SetOwner(UIParent, "ANCHOR_NONE");
-		AuctionatorScanTooltip:SetAuctionItem("list", i)
-		AuctionatorScanTooltip:Show()
-		local chargesLabel = getglobal("AuctionatorScanTooltipTextLeft"..4):GetText()
+		AuxScanTooltip:SetOwner(UIParent, "ANCHOR_NONE");
+		AuxScanTooltip:SetAuctionItem("list", i)
+		AuxScanTooltip:Show()
+		local chargesLabel = getglobal("AuxScanTooltipTextLeft"..4):GetText()
 		local chargesString = gsub(chargesLabel and chargesLabel or "", "(%d+) Charges", "%1")
 		local charges = tonumber(chargesString)
 
@@ -161,13 +161,13 @@ function processQueryResults()
 	if numBatchAuctions == NUM_AUCTION_ITEMS_PER_PAGE then			
 		state = STATE_PREQUERY
 	else
-		Auctionator_Scan_Complete()
+		Aux_Scan_Complete()
 	end
 end
 
 -----------------------------------------
 
-function Auctionator_Scan_OnEvent()
+function Aux_Scan_OnEvent()
 	if event == "AUCTION_ITEM_LIST_UPDATE" then
 		if state == STATE_POSTQUERY then
 			state = STATE_PROCESSING
@@ -178,7 +178,7 @@ end
 
 -----------------------------------------
 
-function Auctionator_Scan_OnUpdate()
+function Aux_Scan_OnUpdate()
 	if state == STATE_PREQUERY and GetTime() - timeOfLastUpdate > 0.5 then
 	
 		timeOfLastUpdate = GetTime()
diff --git a/scan.xml b/scan.xml
index 200a2a0..16c6732 100644
--- a/scan.xml
+++ b/scan.xml
@@ -9,12 +9,12 @@
 				this:RegisterEvent("AUCTION_ITEM_LIST_UPDATE")
 			</OnLoad>
 			<OnEvent> 
-				Auctionator_Scan_OnEvent()
+				Aux_Scan_OnEvent()
 			</OnEvent>
 			<OnUpdate>
-				Auctionator_Scan_OnUpdate()
+				Aux_Scan_OnUpdate()
 			</OnUpdate>
 		</Scripts> 
 	</Frame>
-	<GameTooltip name="AuctionatorScanTooltip" inherits="GameTooltipTemplate"/>
+	<GameTooltip name="AuxScanTooltip" inherits="GameTooltipTemplate"/>
 </Ui>
\ No newline at end of file
diff --git a/sell.lua b/sell.lua
index e5cf398..19d21c5 100644
--- a/sell.lua
+++ b/sell.lua
@@ -1,9 +1,9 @@
-auctionatorEntries = {} -- persisted
+auxEntries = {} -- persisted
 
 -----------------------------------------
 
 local bestPriceOurStackSize
-local selectedAuctionatorEntry
+local selectedAuxEntry
 
 local currentAuctionItemName = nil
 local currentAuctionItemTexture = nil
@@ -18,18 +18,18 @@ local processScanResults, undercut, ItemType2AuctionClass, SubType2AuctionSubcla
 
 -----------------------------------------
 
-function Auctionator_Sell_OnEvent()
+function Aux_Sell_OnEvent()
 	if event == "AUCTION_OWNED_LIST_UPDATE" then
-		Auctionator_OnAuctionOwnedUpdate()
+		Aux_OnAuctionOwnedUpdate()
 	end
 end
 
 -----------------------------------------
 
-function Auctionator_AuctionFrameAuctions_Update()
-	Auctionator.orig.AuctionFrameAuctions_Update()
-	if PanelTemplates_GetSelectedTab(AuctionFrame) == Auctionator.tabs.sell.index and AuctionFrame:IsShown() then
-		Auctionator_HideElems(Auctionator.tabs.sell.hiddenElements)
+function Aux_AuctionFrameAuctions_Update()
+	Aux.orig.AuctionFrameAuctions_Update()
+	if PanelTemplates_GetSelectedTab(AuctionFrame) == Aux.tabs.sell.index and AuctionFrame:IsShown() then
+		Aux_HideElems(Aux.tabs.sell.hiddenElements)
 	end	
 end
 
@@ -38,114 +38,114 @@ end
 -- that we can note the auction values
 -----------------------------------------
 
-function Auctionator_AuctionsCreateAuctionButton_OnClick()	
-	if PanelTemplates_GetSelectedTab(AuctionFrame) == Auctionator.tabs.sell.index  and AuctionFrame:IsShown() then	
+function Aux_AuctionsCreateAuctionButton_OnClick()	
+	if PanelTemplates_GetSelectedTab(AuctionFrame) == Aux.tabs.sell.index  and AuctionFrame:IsShown() then	
 		lastBuyoutPrice = MoneyInputFrame_GetCopper(BuyoutPrice)
 		lastItemPosted = currentAuctionItemName
 	end
-	Auctionator.orig.AuctionsCreateAuctionButton_OnClick()
+	Aux.orig.AuctionsCreateAuctionButton_OnClick()
 end
 
 -----------------------------------------
 
-function Auctionator_OnAuctionOwnedUpdate()
+function Aux_OnAuctionOwnedUpdate()
 	if lastItemPosted then	
-		Auctionator_Recommend_Text:SetText("Auction Created for "..lastItemPosted)
+		Aux_Recommend_Text:SetText("Auction Created for "..lastItemPosted)
 
-		MoneyFrame_Update("Auctionator_RecommendPerStack_Price", lastBuyoutPrice)
+		MoneyFrame_Update("Aux_RecommendPerStack_Price", lastBuyoutPrice)
 
-		Auctionator_RecommendPerStack_Price:Show()
-		Auctionator_RecommendPerItem_Price:Hide()
-		Auctionator_RecommendPerItem_Text:Hide()
-		Auctionator_Recommend_Basis_Text:Hide()
+		Aux_RecommendPerStack_Price:Show()
+		Aux_RecommendPerItem_Price:Hide()
+		Aux_RecommendPerItem_Text:Hide()
+		Aux_Recommend_Basis_Text:Hide()
 	end
 	
 end
 
 -----------------------------------------
 
-function Auctionator_AuctionSellItemButton_OnEvent()
-	Auctionator.orig.AuctionSellItemButton_OnEvent()
-	Auctionator_OnNewAuctionUpdate()
+function Aux_AuctionSellItemButton_OnEvent()
+	Aux.orig.AuctionSellItemButton_OnEvent()
+	Aux_OnNewAuctionUpdate()
 end
 
 -----------------------------------------
 
-function Auctionator_SetupHookFunctions()
+function Aux_SetupHookFunctions()
 	
-	Auctionator.orig.BrowseButton_OnClick = BrowseButton_OnClick
-	BrowseButton_OnClick = Auctionator_BrowseButton_OnClick
+	Aux.orig.BrowseButton_OnClick = BrowseButton_OnClick
+	BrowseButton_OnClick = Aux_BrowseButton_OnClick
 	
 	BrowseButton1:RegisterForClicks("LeftButtonUp", "RightButtonDown")
-	BrowseButton1:SetScript("OnMouseDown", Auctionator_BrowseButton_OnMouseDown)
+	BrowseButton1:SetScript("OnMouseDown", Aux_BrowseButton_OnMouseDown)
 	BrowseButton2:RegisterForClicks("LeftButtonUp", "RightButtonDown")
-	BrowseButton2:SetScript("OnMouseDown", Auctionator_BrowseButton_OnMouseDown)
+	BrowseButton2:SetScript("OnMouseDown", Aux_BrowseButton_OnMouseDown)
 	BrowseButton3:RegisterForClicks("LeftButtonUp", "RightButtonDown")
-	BrowseButton3:SetScript("OnMouseDown", Auctionator_BrowseButton_OnMouseDown)
+	BrowseButton3:SetScript("OnMouseDown", Aux_BrowseButton_OnMouseDown)
 	BrowseButton4:RegisterForClicks("LeftButtonUp", "RightButtonDown")
-	BrowseButton4:SetScript("OnMouseDown", Auctionator_BrowseButton_OnMouseDown)
+	BrowseButton4:SetScript("OnMouseDown", Aux_BrowseButton_OnMouseDown)
 	BrowseButton5:RegisterForClicks("LeftButtonUp", "RightButtonDown")
-	BrowseButton5:SetScript("OnMouseDown", Auctionator_BrowseButton_OnMouseDown)
+	BrowseButton5:SetScript("OnMouseDown", Aux_BrowseButton_OnMouseDown)
 	BrowseButton6:RegisterForClicks("LeftButtonUp", "RightButtonDown")
-	BrowseButton6:SetScript("OnMouseDown", Auctionator_BrowseButton_OnMouseDown)
+	BrowseButton6:SetScript("OnMouseDown", Aux_BrowseButton_OnMouseDown)
 	BrowseButton7:RegisterForClicks("LeftButtonUp", "RightButtonDown")
-	BrowseButton7:SetScript("OnMouseDown", Auctionator_BrowseButton_OnMouseDown)
+	BrowseButton7:SetScript("OnMouseDown", Aux_BrowseButton_OnMouseDown)
 	BrowseButton8:RegisterForClicks("LeftButtonUp", "RightButtonDown")
-	BrowseButton8:SetScript("OnMouseDown", Auctionator_BrowseButton_OnMouseDown)
+	BrowseButton8:SetScript("OnMouseDown", Aux_BrowseButton_OnMouseDown)
 
-	Auctionator.orig.AuctionSellItemButton_OnEvent = AuctionSellItemButton_OnEvent
-	AuctionSellItemButton_OnEvent = Auctionator_AuctionSellItemButton_OnEvent
+	Aux.orig.AuctionSellItemButton_OnEvent = AuctionSellItemButton_OnEvent
+	AuctionSellItemButton_OnEvent = Aux_AuctionSellItemButton_OnEvent
 	
-	Auctionator.orig.AuctionFrameTab_OnClick = AuctionFrameTab_OnClick
-	AuctionFrameTab_OnClick = Auctionator_AuctionFrameTab_OnClick
+	Aux.orig.AuctionFrameTab_OnClick = AuctionFrameTab_OnClick
+	AuctionFrameTab_OnClick = Aux_AuctionFrameTab_OnClick
 	
-	Auctionator.orig.ContainerFrameItemButton_OnClick = ContainerFrameItemButton_OnClick
-	ContainerFrameItemButton_OnClick = Auctionator_ContainerFrameItemButton_OnClick
+	Aux.orig.ContainerFrameItemButton_OnClick = ContainerFrameItemButton_OnClick
+	ContainerFrameItemButton_OnClick = Aux_ContainerFrameItemButton_OnClick
 	
-	Auctionator.orig.AuctionFrameAuctions_Update = AuctionFrameAuctions_Update
-	AuctionFrameAuctions_Update = Auctionator_AuctionFrameAuctions_Update
+	Aux.orig.AuctionFrameAuctions_Update = AuctionFrameAuctions_Update
+	AuctionFrameAuctions_Update = Aux_AuctionFrameAuctions_Update
 	
-	Auctionator.orig.AuctionsCreateAuctionButton_OnClick = AuctionsCreateAuctionButton_OnClick
-	AuctionsCreateAuctionButton_OnClick = Auctionator_AuctionsCreateAuctionButton_OnClick
+	Aux.orig.AuctionsCreateAuctionButton_OnClick = AuctionsCreateAuctionButton_OnClick
+	AuctionsCreateAuctionButton_OnClick = Aux_AuctionsCreateAuctionButton_OnClick
 	
 end
 
 -----------------------------------------
 
-function Auctionator_SetMessage(msg)
-	Auctionator_HideElems(Auctionator.tabs.sell.shownElements)
-	AuctionatorMessage:SetText(msg)
-	AuctionatorMessage:Show()
-	AuctionatorBuyMessage:SetText(msg) -- TODO doesn't belong here
-	AuctionatorBuyMessage:Show()
+function Aux_SetMessage(msg)
+	Aux_HideElems(Aux.tabs.sell.shownElements)
+	AuxMessage:SetText(msg)
+	AuxMessage:Show()
+	AuxBuyMessage:SetText(msg) -- TODO doesn't belong here
+	AuxBuyMessage:Show()
 end
 
 -----------------------------------------
 
-function Auctionator_SelectAuctionatorEntry()
+function Aux_SelectAuxEntry()
 	
-	if not currentAuctionItemName or not auctionatorEntries[currentAuctionItemName] then
-		selectedAuctionatorEntry = nil
+	if not currentAuctionItemName or not auxEntries[currentAuctionItemName] then
+		selectedAuxEntry = nil
 	else
 		local bestPrice	= {} -- a table with one entry per stacksize that is the cheapest auction for that particular stacksize
 		local absoluteBest -- the overall cheapest auction
 
 		----- find the best price per stacksize and overall -----
 		
-		for _,auctionatorEntry in ipairs(auctionatorEntries[currentAuctionItemName]) do
-			if not bestPrice[auctionatorEntry.stackSize] or bestPrice[auctionatorEntry.stackSize].itemPrice >= auctionatorEntry.itemPrice then
-				bestPrice[auctionatorEntry.stackSize] = auctionatorEntry
+		for _,auxEntry in ipairs(auxEntries[currentAuctionItemName]) do
+			if not bestPrice[auxEntry.stackSize] or bestPrice[auxEntry.stackSize].itemPrice >= auxEntry.itemPrice then
+				bestPrice[auxEntry.stackSize] = auxEntry
 			end
 		
-			if not absoluteBest or absoluteBest.itemPrice > auctionatorEntry.itemPrice then
-				absoluteBest = auctionatorEntry
+			if not absoluteBest or absoluteBest.itemPrice > auxEntry.itemPrice then
+				absoluteBest = auxEntry
 			end	
 		end
 		
-		selectedAuctionatorEntry = absoluteBest
+		selectedAuxEntry = absoluteBest
 
 		if bestPrice[currentAuctionItemStackSize] then
-			selectedAuctionatorEntry = bestPrice[currentAuctionItemStackSize]
+			selectedAuxEntry = bestPrice[currentAuctionItemStackSize]
 			bestPriceOurStackSize = bestPrice[currentAuctionItemStackSize]
 		end
 	end
@@ -153,128 +153,128 @@ end
 
 -----------------------------------------
 
-function Auctionator_UpdateRecommendation()
+function Aux_UpdateRecommendation()
 
 	if not currentAuctionItemName then
-		AuctionatorSellRefreshButton:Disable()
-		Auctionator_SetMessage("Drag an item to the Auction Item area\n\nto see recommended pricing information")
+		AuxSellRefreshButton:Disable()
+		Aux_SetMessage("Drag an item to the Auction Item area\n\nto see recommended pricing information")
 	else
-		AuctionatorSellRefreshButton:Enable()	
+		AuxSellRefreshButton:Enable()	
 		
-		if selectedAuctionatorEntry then
-			local newBuyoutPrice = selectedAuctionatorEntry.itemPrice * currentAuctionItemStackSize
+		if selectedAuxEntry then
+			local newBuyoutPrice = selectedAuxEntry.itemPrice * currentAuctionItemStackSize
 
-			if selectedAuctionatorEntry.numYours < selectedAuctionatorEntry.count then
+			if selectedAuxEntry.numYours < selectedAuxEntry.count then
 				newBuyoutPrice = undercut(newBuyoutPrice)
 			end
 			
 			local newStartPrice = newBuyoutPrice * 0.95 
 			
-			AuctionatorMessage:Hide()	
-			Auctionator_ShowElems(Auctionator.tabs.sell.shownElements)
+			AuxMessage:Hide()	
+			Aux_ShowElems(Aux.tabs.sell.shownElements)
 			
-			Auctionator_Recommend_Text:SetText("Recommended Buyout Price")
-			Auctionator_RecommendPerStack_Text:SetText("for your stack of "..currentAuctionItemStackSize)
+			Aux_Recommend_Text:SetText("Recommended Buyout Price")
+			Aux_RecommendPerStack_Text:SetText("for your stack of "..currentAuctionItemStackSize)
 			
 			if currentAuctionItemTexture then
-				Auctionator_RecommendItem_Tex:SetNormalTexture(currentAuctionItemTexture)
+				Aux_RecommendItem_Tex:SetNormalTexture(currentAuctionItemTexture)
 				if currentAuctionItemStackSize > 1 then
-					Auctionator_RecommendItem_TexCount:SetText(currentAuctionItemStackSize)
-					Auctionator_RecommendItem_TexCount:Show()
+					Aux_RecommendItem_TexCount:SetText(currentAuctionItemStackSize)
+					Aux_RecommendItem_TexCount:Show()
 				else
-					Auctionator_RecommendItem_TexCount:Hide()
+					Aux_RecommendItem_TexCount:Hide()
 				end
 			else
-				Auctionator_RecommendItem_Tex:Hide()
+				Aux_RecommendItem_Tex:Hide()
 			end
 			
-			MoneyFrame_Update("Auctionator_RecommendPerItem_Price",  Auctionator_Round(newBuyoutPrice / currentAuctionItemStackSize))
-			MoneyFrame_Update("Auctionator_RecommendPerStack_Price", Auctionator_Round(newBuyoutPrice))
+			MoneyFrame_Update("Aux_RecommendPerItem_Price",  Aux_Round(newBuyoutPrice / currentAuctionItemStackSize))
+			MoneyFrame_Update("Aux_RecommendPerStack_Price", Aux_Round(newBuyoutPrice))
 			
 			MoneyInputFrame_SetCopper(BuyoutPrice, newBuyoutPrice)
 			MoneyInputFrame_SetCopper(StartPrice, newStartPrice)
 			
-			if selectedAuctionatorEntry.stackSize == auctionatorEntries[currentAuctionItemName][1].stackSize and selectedAuctionatorEntry.buyoutPrice == auctionatorEntries[currentAuctionItemName][1].buyoutPrice then
-				Auctionator_Recommend_Basis_Text:SetText("(based on cheapest)")
-			elseif bestPriceOurStackSize and selectedAuctionatorEntry.stackSize == bestPriceOurStackSize.stackSize and selectedAuctionatorEntry.buyoutPrice == bestPriceOurStackSize.buyoutPrice then
-				Auctionator_Recommend_Basis_Text:SetText("(based on cheapest stack of the same size)")
+			if selectedAuxEntry.stackSize == auxEntries[currentAuctionItemName][1].stackSize and selectedAuxEntry.buyoutPrice == auxEntries[currentAuctionItemName][1].buyoutPrice then
+				Aux_Recommend_Basis_Text:SetText("(based on cheapest)")
+			elseif bestPriceOurStackSize and selectedAuxEntry.stackSize == bestPriceOurStackSize.stackSize and selectedAuxEntry.buyoutPrice == bestPriceOurStackSize.buyoutPrice then
+				Aux_Recommend_Basis_Text:SetText("(based on cheapest stack of the same size)")
 			else
-				Auctionator_Recommend_Basis_Text:SetText("(based on auction selected below)")
+				Aux_Recommend_Basis_Text:SetText("(based on auction selected below)")
 			end
-		elseif auctionatorEntries[currentAuctionItemName] then
-			Auctionator_SetMessage("No auctions were found for \n\n"..currentAuctionItemName)
+		elseif auxEntries[currentAuctionItemName] then
+			Aux_SetMessage("No auctions were found for \n\n"..currentAuctionItemName)
 		else 
-			Auctionator_HideElems(Auctionator.tabs.sell.shownElements)
+			Aux_HideElems(Aux.tabs.sell.shownElements)
 		end
 	end
 	
-	Auctionator_ScrollbarUpdate()
+	Aux_ScrollbarUpdate()
 end
 
 -----------------------------------------
 
-function Auctionator_OnNewAuctionUpdate()
+function Aux_OnNewAuctionUpdate()
 
-	if PanelTemplates_GetSelectedTab(AuctionFrame) ~= Auctionator.tabs.sell.index then
+	if PanelTemplates_GetSelectedTab(AuctionFrame) ~= Aux.tabs.sell.index then
 		return
 	end
 	
-	if not Auctionator_Scan_IsIdle() then
-		Auctionator_Scan_Abort()
+	if not Aux_Scan_IsIdle() then
+		Aux_Scan_Abort()
 	end
 	
 	currentAuctionItemName, currentAuctionItemTexture, currentAuctionItemStackSize = GetAuctionSellItemInfo()
 	
-	if currentAuctionItemName and not auctionatorEntries[currentAuctionItemName] then
-		Auctionator_RefreshEntries()
+	if currentAuctionItemName and not auxEntries[currentAuctionItemName] then
+		Aux_RefreshEntries()
 	end
 	
-	Auctionator_SelectAuctionatorEntry()
-	Auctionator_UpdateRecommendation()
+	Aux_SelectAuxEntry()
+	Aux_UpdateRecommendation()
 end
 
 -----------------------------------------
 
-function Auctionator_RefreshEntries()
-	auctionatorEntries[currentAuctionItemName] = nil
-	selectedAuctionatorEntry = nil
+function Aux_RefreshEntries()
+	auxEntries[currentAuctionItemName] = nil
+	selectedAuxEntry = nil
 	
 	local sName, sLink, iRarity, iLevel, iMinLevel, sType, sSubType, iStackCount = GetItemInfo(currentAuctionItemName)
 
 	local currentAuctionClass		= ItemType2AuctionClass(sType)
 	local currentAuctionSubclass	= nil -- SubType2AuctionSubclass(currentAuctionClass, sSubType)
 	
-	Auctionator_Scan_Start{
-			query = Auctionator_Scan_CreateQuery{
+	Aux_Scan_Start{
+			query = Aux_Scan_CreateQuery{
 					name = currentAuctionItemName,
 					classIndex = currentAuctionClass,
 					subclassIndex = currentAuctionSubclass
 			},
 			onComplete = function(data)
 				processScanResults(data, currentAuctionItemName)
-				Auctionator_SelectAuctionatorEntry()
-				Auctionator_UpdateRecommendation()
+				Aux_SelectAuxEntry()
+				Aux_UpdateRecommendation()
 			end
 	}	
 end
 	
 -----------------------------------------
 
-function Auctionator_ScrollbarUpdate()
+function Aux_ScrollbarUpdate()
 
 	local numrows
-	if not currentAuctionItemName or not auctionatorEntries[currentAuctionItemName] then
+	if not currentAuctionItemName or not auxEntries[currentAuctionItemName] then
 		numrows = 0
 	else
-		numrows = getn(auctionatorEntries[currentAuctionItemName])
+		numrows = getn(auxEntries[currentAuctionItemName])
 	end
 	
-	FauxScrollFrame_Update(AuctionatorScrollFrame, numrows, 12, 16);
+	FauxScrollFrame_Update(AuxScrollFrame, numrows, 12, 16);
 
 	for line = 1,12 do
 
-		local dataOffset = line + FauxScrollFrame_GetOffset(AuctionatorScrollFrame)	
-		local lineEntry = getglobal("AuctionatorSellEntry"..line)
+		local dataOffset = line + FauxScrollFrame_GetOffset(AuxScrollFrame)	
+		local lineEntry = getglobal("AuxSellEntry"..line)
 		
 		if numrows <= 12 then
 			lineEntry:SetWidth(603)
@@ -284,15 +284,15 @@ function Auctionator_ScrollbarUpdate()
 		
 		lineEntry:SetID(dataOffset)
 		
-		if currentAuctionItemName and dataOffset <= numrows and auctionatorEntries[currentAuctionItemName] then
+		if currentAuctionItemName and dataOffset <= numrows and auxEntries[currentAuctionItemName] then
 			
-			local entry = auctionatorEntries[currentAuctionItemName][dataOffset]
+			local entry = auxEntries[currentAuctionItemName][dataOffset]
 
-			local lineEntry_avail	= getglobal("AuctionatorSellEntry"..line.."_Availability")
-			local lineEntry_comm	= getglobal("AuctionatorSellEntry"..line.."_Comment")
-			local lineEntry_stack	= getglobal("AuctionatorSellEntry"..line.."_StackPrice")
+			local lineEntry_avail	= getglobal("AuxSellEntry"..line.."_Availability")
+			local lineEntry_comm	= getglobal("AuxSellEntry"..line.."_Comment")
+			local lineEntry_stack	= getglobal("AuxSellEntry"..line.."_StackPrice")
 
-			if selectedAuctionatorEntry and entry.itemPrice == selectedAuctionatorEntry.itemPrice and entry.stackSize == selectedAuctionatorEntry.stackSize then
+			if selectedAuxEntry and entry.itemPrice == selectedAuxEntry.itemPrice and entry.stackSize == selectedAuxEntry.stackSize then
 				lineEntry:LockHighlight()
 			else
 				lineEntry:UnlockHighlight()
@@ -313,11 +313,11 @@ function Auctionator_ScrollbarUpdate()
 				lineEntry_comm:SetText("yours: "..entry.numYours)
 			end
 						
-			local tx = string.format("%i %s of %i", entry.count, Auctionator_PluralizeIf("stack", entry.count), entry.stackSize)
+			local tx = string.format("%i %s of %i", entry.count, Aux_PluralizeIf("stack", entry.count), entry.stackSize)
 			lineEntry_avail:SetText(tx)
 
-			MoneyFrame_Update("AuctionatorSellEntry"..line.."_UnitPrice", Auctionator_Round(entry.buyoutPrice/entry.stackSize))
-			MoneyFrame_Update("AuctionatorSellEntry"..line.."_TotalPrice", Auctionator_Round(entry.buyoutPrice))
+			MoneyFrame_Update("AuxSellEntry"..line.."_UnitPrice", Aux_Round(entry.buyoutPrice/entry.stackSize))
+			MoneyFrame_Update("AuxSellEntry"..line.."_TotalPrice", Aux_Round(entry.buyoutPrice))
 
 			lineEntry:Show()
 		else
@@ -328,30 +328,30 @@ end
 
 -----------------------------------------
 
-function AuctionatorSellEntry_OnClick()
+function AuxSellEntry_OnClick()
 	local entryIndex = this:GetID()
 
-	selectedAuctionatorEntry = auctionatorEntries[currentAuctionItemName][entryIndex]
+	selectedAuxEntry = auxEntries[currentAuctionItemName][entryIndex]
 
-	Auctionator_UpdateRecommendation()
+	Aux_UpdateRecommendation()
 
 	PlaySound("igMainMenuOptionCheckBoxOn")
 end
 
 -----------------------------------------
 
-function AuctionatorSellRefreshButton_OnClick()
-	if not Auctionator_Scan_IsIdle() then
-		Auctionator_Scan_Abort()
+function AuxSellRefreshButton_OnClick()
+	if not Aux_Scan_IsIdle() then
+		Aux_Scan_Abort()
 	end
-	Auctionator_RefreshEntries()
-	Auctionator_SelectAuctionatorEntry()
-	Auctionator_UpdateRecommendation()
+	Aux_RefreshEntries()
+	Aux_SelectAuxEntry()
+	Aux_UpdateRecommendation()
 end
 
 -----------------------------------------
 
-function AuctionatorMoneyFrame_OnLoad()
+function AuxMoneyFrame_OnLoad()
 	this.small = 1
 	SmallMoneyFrame_OnLoad()
 	MoneyFrame_SetType("AUCTION")
@@ -366,7 +366,7 @@ end
 
 function processScanResults(rawData, auctionItemName)
 
-	auctionatorEntries[auctionItemName] = {}
+	auxEntries[auctionItemName] = {}
 	
 	----- Condense the scan rawData into a table that has only a single entry per stacksize/price combo
 	
@@ -394,11 +394,11 @@ function processScanResults(rawData, auctionItemName)
 	
 	local n = 1
 	for _,condDatum in pairs(condData) do
-		auctionatorEntries[auctionItemName][n] = condDatum
+		auxEntries[auctionItemName][n] = condDatum
 		n = n + 1
 	end
 	
-	table.sort(auctionatorEntries[auctionItemName], function(a,b) return a.itemPrice < b.itemPrice end)
+	table.sort(auxEntries[auctionItemName], function(a,b) return a.itemPrice < b.itemPrice end)
 end
 
 -----------------------------------------
@@ -421,7 +421,7 @@ function ItemType2AuctionClass(itemType)
 			end
 		end
 	else
-		Auctionator_Log("Can't GetAuctionItemClasses")
+		Aux_Log("Can't GetAuctionItemClasses")
 	end
 end
 
diff --git a/sell.xml b/sell.xml
index 94bc306..c882711 100644
--- a/sell.xml
+++ b/sell.xml
@@ -9,12 +9,12 @@
 				this:RegisterEvent("AUCTION_OWNED_LIST_UPDATE")
 			</OnLoad>
 			<OnEvent> 
-				Auctionator_Sell_OnEvent()
+				Aux_Sell_OnEvent()
 			</OnEvent> 
 		</Scripts> 
 	</Frame> 
 
-	<Button name="AuctionatorSellEntryTemplate" virtual="true" hidden="true">
+	<Button name="AuxSellEntryTemplate" virtual="true" hidden="true">
 		<Size><AbsDimension y="16" /></Size>		
 		<Frames>
 			<Frame>
@@ -80,12 +80,12 @@
 		</HighlightTexture>
 		<Scripts>
 			<OnClick>
-				AuctionatorSellEntry_OnClick()
+				AuxSellEntry_OnClick()
 			</OnClick>
 		</Scripts>
 	</Button>
 
-	<Frame name="AuctionatorSellTemplate" virtual="true" hidden="true">
+	<Frame name="AuxSellTemplate" virtual="true" hidden="true">
 		<Size>
 			<AbsDimension x="694" y="447"/>
 		</Size>
@@ -99,28 +99,28 @@
 
 		<Layers>
 			<Layer level="BACKGROUND">
-				<FontString inherits="GameFontNormal" text="Auctionator Sell">
+				<FontString inherits="GameFontNormal" text="Aux Sell">
 					<Anchors><Anchor point="TOP"><Offset><AbsDimension x="20" y="-18"/></Offset></Anchor></Anchors>
 				</FontString>
 
-				<FontString name="AuctionatorMessage" inherits="GameFontNormal">
+				<FontString name="AuxMessage" inherits="GameFontNormal">
 					<Anchors><Anchor point="TOP"><Offset><AbsDimension x="170" y="-100"/></Offset></Anchor></Anchors>
 				</FontString>
 
-				<FontString name="Auctionator_Recommend_Text" inherits="GameFontNormal" text="Recommended buyout price">
+				<FontString name="Aux_Recommend_Text" inherits="GameFontNormal" text="Recommended buyout price">
 					<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="287" y="-98"/></Offset></Anchor></Anchors>
 				</FontString>
 
-				<FontString name="Auctionator_Recommend_Basis_Text" inherits="GameFontHighlightSmall" text="based on">
-					<Anchors><Anchor point="LEFT" relativePoint="RIGHT" relativeTo="Auctionator_Recommend_Text"><Offset><AbsDimension x="20" y="-2"/></Offset></Anchor></Anchors>
+				<FontString name="Aux_Recommend_Basis_Text" inherits="GameFontHighlightSmall" text="based on">
+					<Anchors><Anchor point="LEFT" relativePoint="RIGHT" relativeTo="Aux_Recommend_Text"><Offset><AbsDimension x="20" y="-2"/></Offset></Anchor></Anchors>
 				</FontString>
 
-				<FontString name="Auctionator_RecommendPerStack_Text" inherits="GameFontHighlightSmall" text="per stack">
-					<Anchors><Anchor point="TOPLEFT" relativeTo="Auctionator_Recommend_Text"><Offset><AbsDimension x="152" y="-28"/></Offset></Anchor></Anchors>
+				<FontString name="Aux_RecommendPerStack_Text" inherits="GameFontHighlightSmall" text="per stack">
+					<Anchors><Anchor point="TOPLEFT" relativeTo="Aux_Recommend_Text"><Offset><AbsDimension x="152" y="-28"/></Offset></Anchor></Anchors>
 				</FontString>
 
-				<FontString name="Auctionator_RecommendPerItem_Text" inherits="GameFontHighlightSmall" text="per item">
-					<Anchors><Anchor point="TOPLEFT" relativeTo="Auctionator_Recommend_Text"><Offset><AbsDimension x="152" y="-51"/></Offset></Anchor></Anchors>
+				<FontString name="Aux_RecommendPerItem_Text" inherits="GameFontHighlightSmall" text="per item">
+					<Anchors><Anchor point="TOPLEFT" relativeTo="Aux_Recommend_Text"><Offset><AbsDimension x="152" y="-51"/></Offset></Anchor></Anchors>
 				</FontString>
 			</Layer>
 			<Layer level="ARTWORK">
@@ -170,7 +170,7 @@
 					</OnLoad>
 					<OnEvent>
 						if event == "NEW_AUCTION_UPDATE" then
-							Auctionator_Hilite1:Hide()
+							Aux_Hilite1:Hide()
 						end
 					</OnEvent>
 					<OnClick>
@@ -183,15 +183,15 @@
 						AuctionsFrameAuctions_ValidateAuction()
 					</OnReceiveDrag>
 					<OnEnter>
-						Auctionator_Hilite1:Show()
+						Aux_Hilite1:Show()
 					</OnEnter>
 					<OnLeave>
-						Auctionator_Hilite1:Hide()
+						Aux_Hilite1:Hide()
 					</OnLeave>
 				</Scripts>
 				
 				<Frames>
-					<Frame name="Auctionator_Hilite1" hidden="true">
+					<Frame name="Aux_Hilite1" hidden="true">
 						<Anchors>
 							<Anchor point="TOPLEFT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
 							<Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
@@ -206,7 +206,7 @@
 				</Frames>		
 			</Button>
 
-			<Button name="Auctionator_RecommendItem_Tex">
+			<Button name="Aux_RecommendItem_Tex">
 				<Size><AbsDimension x="37" y="37"/></Size>
 				<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="234" y="-87"/></Offset></Anchor></Anchors>
 				<Layers>
@@ -227,15 +227,15 @@
 			<Frame>
 				<Size><AbsDimension x="120" y="20"/></Size>
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="Auctionator_Recommend_Text">
+					<Anchor point="TOPLEFT" relativeTo="Aux_Recommend_Text">
 						<Offset><AbsDimension x="32" y="-24"/></Offset>
 					</Anchor>
 				</Anchors>
 				<Frames>
-					<Frame name="Auctionator_RecommendPerStack_Price" inherits="SmallMoneyFrameTemplate">
+					<Frame name="Aux_RecommendPerStack_Price" inherits="SmallMoneyFrameTemplate">
 						<Size><AbsDimension x="120" y="16" /></Size>
 						<Anchors><Anchor point="RIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>
-						<Scripts><OnLoad>AuctionatorMoneyFrame_OnLoad()</OnLoad></Scripts>
+						<Scripts><OnLoad>AuxMoneyFrame_OnLoad()</OnLoad></Scripts>
 					</Frame>
 				</Frames>
 			</Frame>
@@ -243,20 +243,20 @@
 			<Frame>
 				<Size><AbsDimension x="120" y="20"/></Size>
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="Auctionator_Recommend_Text">
+					<Anchor point="TOPLEFT" relativeTo="Aux_Recommend_Text">
 						<Offset><AbsDimension x="32" y="-46"/></Offset>
 					</Anchor>
 				</Anchors>
 				<Frames>
-					<Frame name="Auctionator_RecommendPerItem_Price" inherits="SmallMoneyFrameTemplate">
+					<Frame name="Aux_RecommendPerItem_Price" inherits="SmallMoneyFrameTemplate">
 						<Size><AbsDimension x="120" y="16" /></Size>
 						<Anchors><Anchor point="RIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>
-						<Scripts><OnLoad>AuctionatorMoneyFrame_OnLoad()</OnLoad></Scripts>
+						<Scripts><OnLoad>AuxMoneyFrame_OnLoad()</OnLoad></Scripts>
 					</Frame>
 				</Frames>
 			</Frame>
 
-			<Button name="AuctionatorSellRefreshButton" inherits="UIPanelButtonTemplate" text="Refresh">
+			<Button name="AuxSellRefreshButton" inherits="UIPanelButtonTemplate" text="Refresh">
 				<Size><AbsDimension x="126" y="22"/></Size>
 				<Anchors>
 					<Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT">
@@ -267,39 +267,39 @@
 				</Anchors>
 				<Scripts>
 					<OnClick>
-						AuctionatorSellRefreshButton_OnClick()
+						AuxSellRefreshButton_OnClick()
 					</OnClick>
 				</Scripts>
 			</Button>
 			
-			<ScrollFrame name="AuctionatorScrollFrame" inherits="FauxScrollFrameTemplate">
+			<ScrollFrame name="AuxScrollFrame" inherits="FauxScrollFrameTemplate">
 				<Size><AbsDimension x="588" y="194"/></Size>
 				<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="210" y="-213"/></Offset></Anchor></Anchors>
 
 				<Scripts>
 					<OnVerticalScroll>
-						FauxScrollFrame_OnVerticalScroll(16, Auctionator_ScrollbarUpdate)
+						FauxScrollFrame_OnVerticalScroll(16, Aux_ScrollbarUpdate)
 					</OnVerticalScroll>
 					<OnShow>
-						<!--Auctionator_ScrollbarUpdate();-->
+						<!--Aux_ScrollbarUpdate();-->
 					</OnShow>
 				</Scripts>
 			</ScrollFrame>
 
-			<Button name="AuctionatorSellEntry1" inherits="AuctionatorSellEntryTemplate">
-			<Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorScrollFrame" relativePoint="TOPLEFT"><Offset><AbsDimension x="8" y="0"/></Offset></Anchor></Anchors>
+			<Button name="AuxSellEntry1" inherits="AuxSellEntryTemplate">
+			<Anchors><Anchor point="TOPLEFT" relativeTo="AuxScrollFrame" relativePoint="TOPLEFT"><Offset><AbsDimension x="8" y="0"/></Offset></Anchor></Anchors>
 			</Button>
-			<Button name="AuctionatorSellEntry2"  inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry1"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-			<Button name="AuctionatorSellEntry3"  inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry2"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-			<Button name="AuctionatorSellEntry4"  inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry3"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-			<Button name="AuctionatorSellEntry5"  inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry4"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-			<Button name="AuctionatorSellEntry6"  inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry5"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-			<Button name="AuctionatorSellEntry7"  inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry6"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-			<Button name="AuctionatorSellEntry8"  inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry7"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-			<Button name="AuctionatorSellEntry9"  inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry8"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-			<Button name="AuctionatorSellEntry10" inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry9"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
-			<Button name="AuctionatorSellEntry11" inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry10" relativePoint="BOTTOMLEFT"/></Anchors></Button>
-			<Button name="AuctionatorSellEntry12" inherits="AuctionatorSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuctionatorSellEntry11" relativePoint="BOTTOMLEFT"/></Anchors></Button>   
+			<Button name="AuxSellEntry2"  inherits="AuxSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxSellEntry1"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+			<Button name="AuxSellEntry3"  inherits="AuxSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxSellEntry2"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+			<Button name="AuxSellEntry4"  inherits="AuxSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxSellEntry3"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+			<Button name="AuxSellEntry5"  inherits="AuxSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxSellEntry4"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+			<Button name="AuxSellEntry6"  inherits="AuxSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxSellEntry5"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+			<Button name="AuxSellEntry7"  inherits="AuxSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxSellEntry6"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+			<Button name="AuxSellEntry8"  inherits="AuxSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxSellEntry7"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+			<Button name="AuxSellEntry9"  inherits="AuxSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxSellEntry8"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+			<Button name="AuxSellEntry10" inherits="AuxSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxSellEntry9"  relativePoint="BOTTOMLEFT"/></Anchors></Button>
+			<Button name="AuxSellEntry11" inherits="AuxSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxSellEntry10" relativePoint="BOTTOMLEFT"/></Anchors></Button>
+			<Button name="AuxSellEntry12" inherits="AuxSellEntryTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="AuxSellEntry11" relativePoint="BOTTOMLEFT"/></Anchors></Button>   
 		</Frames>
 	</Frame>
 </Ui>