diff --git a/chrome.manifest b/chrome.manifest
index b89945479..31d355a81 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,6 +1,6 @@
-content	zotero				chrome/chromeFiles/content/zotero/
-locale	zotero	en-US		chrome/chromeFiles/locale/en-US/zotero/
-skin	zotero	default		chrome/chromeFiles/skin/default/zotero/
+content	zotero				chrome/content/zotero/
+locale	zotero	en-US		chrome/locale/en-US/zotero/
+skin	zotero	default		chrome/skin/default/zotero/
 
 overlay	chrome://browser/content/browser.xul	chrome://zotero/content/overlay.xul
 overlay	chrome://browser/content/browser.xul	chrome://zotero/content/ingester/browser.xul
diff --git a/chrome/content/zotero/bindings/scholarsearch.xml b/chrome/content/zotero/bindings/zoterosearch.xml
similarity index 100%
rename from chrome/content/zotero/bindings/scholarsearch.xml
rename to chrome/content/zotero/bindings/zoterosearch.xml
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 36cc09284..7c8ac1af0 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -23,6 +23,7 @@
 		<command id="cmd_zotero_search" oncommand="ZoteroPane.search();"/>
 	</commandset>
 	<toolbarpalette id="BrowserToolbarPalette">
+		<toolbarbutton id="scholar-toolbar-button"/> <!-- May be necessary to keep pre-1.0b2 installs from breaking -->
 		<toolbarbutton id="zotero-toolbar-button" class="toolbarbutton-1"
 						label="&zotero.name;"
 						oncommand="ZoteroPane.toggleDisplay();"/>
diff --git a/chrome/content/zotero/xpcom/scholar.js b/chrome/content/zotero/xpcom/zotero.js
similarity index 100%
rename from chrome/content/zotero/xpcom/scholar.js
rename to chrome/content/zotero/xpcom/zotero.js
diff --git a/chrome/locale/en-US/zotero/scholar.dtd b/chrome/locale/en-US/zotero/zotero.dtd
similarity index 100%
rename from chrome/locale/en-US/zotero/scholar.dtd
rename to chrome/locale/en-US/zotero/zotero.dtd
diff --git a/chrome/locale/en-US/zotero/scholar.properties b/chrome/locale/en-US/zotero/zotero.properties
similarity index 100%
rename from chrome/locale/en-US/zotero/scholar.properties
rename to chrome/locale/en-US/zotero/zotero.properties
diff --git a/components/chnmIZoteroService.js b/components/chnmIZoteroService.js
index 4f4a4c256..009741a30 100644
--- a/components/chnmIZoteroService.js
+++ b/components/chnmIZoteroService.js
@@ -16,79 +16,79 @@ var ZoteroWrapped = this;
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/scholar.js");
+	.loadSubScript("chrome://zotero/content/xpcom/zotero.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/db.js");
+	.loadSubScript("chrome://zotero/content/xpcom/db.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/schema.js");
+	.loadSubScript("chrome://zotero/content/xpcom/schema.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/data_access.js");
+	.loadSubScript("chrome://zotero/content/xpcom/data_access.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/attachments.js");
+	.loadSubScript("chrome://zotero/content/xpcom/attachments.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/notifier.js");
+	.loadSubScript("chrome://zotero/content/xpcom/notifier.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/history.js");
+	.loadSubScript("chrome://zotero/content/xpcom/history.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/search.js");
+	.loadSubScript("chrome://zotero/content/xpcom/search.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/ingester.js");
+	.loadSubScript("chrome://zotero/content/xpcom/ingester.js");
 	
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/translate.js");
+	.loadSubScript("chrome://zotero/content/xpcom/translate.js");
 	
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/cite.js");
+	.loadSubScript("chrome://zotero/content/xpcom/cite.js");
 	
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/utilities.js");
+	.loadSubScript("chrome://zotero/content/xpcom/utilities.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/integration.js");
+	.loadSubScript("chrome://zotero/content/xpcom/integration.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/file.js");
+	.loadSubScript("chrome://zotero/content/xpcom/file.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/fulltext.js");
+	.loadSubScript("chrome://zotero/content/xpcom/fulltext.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/mime.js");
+	.loadSubScript("chrome://zotero/content/xpcom/mime.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/itemTreeView.js");
+	.loadSubScript("chrome://zotero/content/xpcom/itemTreeView.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/collectionTreeView.js");
+	.loadSubScript("chrome://zotero/content/xpcom/collectionTreeView.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
-	.loadSubScript("chrome://scholar/content/xpcom/progressWindow.js");
+	.loadSubScript("chrome://zotero/content/xpcom/progressWindow.js");
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)