diff -r 62166e57800e -r 9d7fdb1d2fc1 xmpp/xmpp.go
--- a/xmpp/xmpp.go	Sun Sep 15 12:00:17 2013 -0600
+++ b/xmpp/xmpp.go	Sun Sep 15 12:31:37 2013 -0600
@@ -67,7 +67,7 @@
 	socketSync   sync.WaitGroup
 	saslExpected string
 	authDone     bool
-	handlers     chan *stanzaHandler
+	handlers     chan *callback
 	inputControl chan int
 	// Incoming XMPP stanzas from the remote will be published on
 	// this channel. Information which is used by this library to
@@ -137,7 +137,7 @@
 	cl.password = password
 	cl.Jid = *jid
 	cl.socket = tcp
-	cl.handlers = make(chan *stanzaHandler, 100)
+	cl.handlers = make(chan *callback, 100)
 	cl.inputControl = make(chan int)
 	cl.tlsConfig = tlsconf
 	cl.sendFilterAdd = make(chan Filter)
@@ -257,7 +257,7 @@
 		ch <- nil
 		return false
 	}
-	cl.HandleStanza(id, f)
+	cl.SetCallback(id, f)
 	cl.Send <- iq
 
 	// Now wait until the callback is called.