diff --git a/chrome/content/zotero/note.js b/chrome/content/zotero/note.js
index f3320ce0c..5807ea4dc 100644
--- a/chrome/content/zotero/note.js
+++ b/chrome/content/zotero/note.js
@@ -60,7 +60,7 @@ function onLoad()
 			noteEditor.collection = Zotero.Collections.get(collectionID);
 	}
 	
-	notifierUnregisterID = Zotero.Notifier.registerItemTree(NotifyCallback);
+	notifierUnregisterID = Zotero.Notifier.registerItemObserver(NotifyCallback);
 }
 
 function onUnload()
@@ -68,7 +68,7 @@ function onUnload()
 	if(noteEditor && noteEditor.value)
 		noteEditor.save();
 	
-	Zotero.Notifier.unregisterItemTree(notifierUnregisterID);
+	Zotero.Notifier.unregisterItemObserver(notifierUnregisterID);
 }
 
 var NotifyCallback = {
diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
index 3bf37ca45..f42bc2178 100644
--- a/chrome/content/zotero/xpcom/collectionTreeView.js
+++ b/chrome/content/zotero/xpcom/collectionTreeView.js
@@ -36,7 +36,7 @@ Zotero.CollectionTreeView = function()
 	this._treebox = null;
 	this.refresh();
 	
-	this._unregisterID = Zotero.Notifier.registerColumnTree(this);
+	this._unregisterID = Zotero.Notifier.registerCollectionObserver(this);
 }
 
 /*
@@ -209,7 +209,7 @@ Zotero.CollectionTreeView.prototype.notify = function(action, type, ids)
  */
 Zotero.CollectionTreeView.prototype.unregister = function()
 {
-	Zotero.Notifier.unregisterColumnTree(this._unregisterID);
+	Zotero.Notifier.unregisterCollectionObserver(this._unregisterID);
 }
 
 Zotero.CollectionTreeView.prototype.isLibrary = function(row)
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
index 1ba2dbfc9..045a620fe 100644
--- a/chrome/content/zotero/xpcom/itemTreeView.js
+++ b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -39,7 +39,7 @@ Zotero.ItemTreeView = function(itemGroup, sourcesOnly)
 	this._treebox = null;
 	this.refresh();
 	
-	this._unregisterID = Zotero.Notifier.registerItemTree(this);
+	this._unregisterID = Zotero.Notifier.registerItemObserver(this);
 }
 
 /*
@@ -270,7 +270,7 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids)
  */
 Zotero.ItemTreeView.prototype.unregister = function()
 {
-	Zotero.Notifier.unregisterItemTree(this._unregisterID);
+	Zotero.Notifier.unregisterItemObserver(this._unregisterID);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/content/zotero/xpcom/notifier.js b/chrome/content/zotero/xpcom/notifier.js
index 4e02f1618..e1ab8d2f1 100644
--- a/chrome/content/zotero/xpcom/notifier.js
+++ b/chrome/content/zotero/xpcom/notifier.js
@@ -23,32 +23,32 @@
 Zotero.Notifier = new function(){
 	var _observers = new Array();
 	var _disabled = false;
-	_observers['columnTree'] = new Zotero.Hash();
-	_observers['itemTree'] = new Zotero.Hash();
+	_observers['collectionObserver'] = new Zotero.Hash();
+	_observers['itemObserver'] = new Zotero.Hash();
 	
-	this.registerColumnTree = registerColumnTree;
-	this.registerItemTree = registerItemTree;
-	this.unregisterColumnTree = unregisterColumnTree;
-	this.unregisterItemTree = unregisterItemTree;
+	this.registerCollectionObserver = registerCollectionObserver;
+	this.registerItemObserver = registerItemObserver;
+	this.unregisterCollectionObserver = unregisterCollectionObserver;
+	this.unregisterItemObserver = unregisterItemObserver;
 	this.trigger = trigger;
 	this.disable = disable;
 	this.enable = enable;
 	this.isEnabled = isEnabled;
 	
-	function registerColumnTree(ref){
-		return _register('columnTree', ref);
+	function registerCollectionObserver(ref){
+		return _register('collectionObserver', ref);
 	}
 	
-	function registerItemTree(ref){
-		return _register('itemTree', ref);
+	function registerItemObserver(ref){
+		return _register('itemObserver', ref);
 	}
 	
-	function unregisterColumnTree(hash){
-		_unregister('columnTree', hash);
+	function unregisterCollectionObserver(hash){
+		_unregister('collectionObserver', hash);
 	}
 	
-	function unregisterItemTree(hash){
-		_unregister('itemTree', hash);
+	function unregisterItemObserver(hash){
+		_unregister('itemObserver', hash);
 	}
 	
 	/**
@@ -63,11 +63,11 @@ Zotero.Notifier = new function(){
 		
 		switch (type){
 			case 'item':
-				var treeType = 'itemTree';
+				var observerType = 'itemObserver';
 				break;
 			case 'collection':
 			case 'search':
-				var treeType = 'columnTree';
+				var observerType = 'collectionObserver';
 				break;
 			default:
 				throw('Invalid type ' + type + ' in Notifier.trigger()');
@@ -75,13 +75,13 @@ Zotero.Notifier = new function(){
 		
 		Zotero.debug("Notifier.trigger('" + event + "', '" + type + "', "
 			+ (typeof ids=='object' ? '[' + ids.join() + ']' : ids) + ") called "
-			+ "[column trees: " + _observers['columnTree'].length
-			+ ", item trees: " + _observers['itemTree'].length + "]");
+			+ "[collection observers: " + _observers['collectionObserver'].length
+			+ ", item observers: " + _observers['itemObserver'].length + "]");
 		
-		for (i in _observers[treeType].items){
-			Zotero.debug("Calling notify() on " + treeType + " with hash '"
+		for (i in _observers[observerType].items){
+			Zotero.debug("Calling notify() on " + observerType + " with hash '"
 				+ i + "'", 4);
-			_observers[treeType].get(i).notify(event, type, ids);
+			_observers[observerType].get(i).notify(event, type, ids);
 		}
 		
 		return true;