diff --git a/core/modules/startup.js b/core/modules/startup.js
index 91eaa9303..13fd2c494 100644
--- a/core/modules/startup.js
+++ b/core/modules/startup.js
@@ -64,11 +64,12 @@ exports.startup = function() {
 			$tw.modal.display(event.param);
 		},false);
 		// Install the syncer message mechanism
-		var handleSyncerEvent = function(event) {
-			$tw.wiki.handleSyncerEvent.call($tw.wiki,event);
-		};
-		document.addEventListener("tw-login",handleSyncerEvent,false);
-		document.addEventListener("tw-logout",handleSyncerEvent,false);
+		document.addEventListener("tw-login",function(event) {
+			$tw.wiki.invokeSyncers("handleLoginEvent",event);
+		},false);
+		document.addEventListener("tw-logout",function(event) {
+			$tw.wiki.invokeSyncers("handleLogoutEvent",event);
+		},false);
 		// Install the scroller
 		$tw.pageScroller = new $tw.utils.PageScroller();
 		document.addEventListener("tw-scroll",$tw.pageScroller,false);
diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index ad44051cb..73562f312 100644
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -627,20 +627,11 @@ exports.initServerConnections = function() {
 /*
 Invoke all the active server connections
 */
-exports.invokeServerConnections = function(method /* ,args */) {
+exports.invokeSyncers = function(method /* ,args */) {
 	var args = Array.prototype.slice.call(arguments,1);
-	for(var title in this.serverConnections) {
-		var connection = this.serverConnections[title];
-		connection.syncer[method].apply(connection.syncer,[connection.connection].concat(args));
-	}
-};
-
-/*
-Handle a syncer message
-*/
-exports.handleSyncerEvent = function(event) {
-	for(var syncer in this.syncers) {
-		this.syncers[syncer].handleEvent(event);
+	for(var name in this.syncers) {
+		var syncer = this.syncers[name];
+		syncer[method].apply(syncer,args);
 	}
 };
 
@@ -658,7 +649,7 @@ exports.getTiddlerText = function(title,defaultText) {
 		return tiddler.fields.text;
 	} else {
 		// Ask all the server connections to load the tiddler if they can
-		this.invokeServerConnections("lazyLoad",title,tiddler);
+		this.invokeSyncers("lazyLoad",title,tiddler);
 		// Indicate that the text is being loaded
 		return null;
 	}
diff --git a/plugins/tiddlywiki/tiddlyweb/tiddlyweb.js b/plugins/tiddlywiki/tiddlyweb/tiddlyweb.js
index 191c28862..777a8ab32 100644
--- a/plugins/tiddlywiki/tiddlyweb/tiddlyweb.js
+++ b/plugins/tiddlywiki/tiddlyweb/tiddlyweb.js
@@ -78,24 +78,10 @@ TiddlyWebSyncer.prototype.addConnection = function(connection) {
 	return ""; // We only support a single connection
 };
 
-/*
-Handle syncer messages
-*/
-TiddlyWebSyncer.prototype.handleEvent = function(event) {
-	switch(event.type) {
-		case "tw-login":
-			this.promptLogin();
-			break;
-		case "tw-logout":
-			this.logout();
-			break;
-	}
-};
-
 /*
 Lazily load a skinny tiddler if we can
 */
-TiddlyWebSyncer.prototype.lazyLoad = function(connection,title,tiddler) {
+TiddlyWebSyncer.prototype.lazyLoad = function(title,tiddler) {
 	// Queue up a sync task to load this tiddler
 	this.enqueueSyncTask({
 		type: "load",
@@ -149,7 +135,7 @@ TiddlyWebSyncer.prototype.getStatus = function(callback) {
 /*
 Dispay a password prompt and allow the user to login
 */
-TiddlyWebSyncer.prototype.promptLogin = function() {
+TiddlyWebSyncer.prototype.handleLoginEvent = function() {
 	var self = this;
 	this.getStatus(function(isLoggedIn,json) {
 		if(!isLoggedIn) {
@@ -203,7 +189,7 @@ TiddlyWebSyncer.prototype.login = function(username,password,callback) {
 /*
 Attempt to log out of TiddlyWeb
 */
-TiddlyWebSyncer.prototype.logout = function(options) {
+TiddlyWebSyncer.prototype.handleLogoutEvent = function(options) {
 	options = options || {};
 	this.log("Attempting to logout");
 	var self = this,