diff -r 7696e6a01709 -r 36287f2cf06e roster.go
--- a/roster.go	Sun Dec 16 22:17:49 2012 -0700
+++ b/roster.go	Sun Dec 16 22:36:53 2012 -0700
@@ -48,7 +48,7 @@
 func fetchRoster(client *Client) error {
 	rosterUpdate := rosterClients[client.Uid].rosterUpdate
 
-	iq := &Iq{Stanza: Stanza{From: client.Jid.String(), Type: "get",
+	iq := &Iq{Header: Header{From: client.Jid.String(), Type: "get",
 		Id: <-Id, Nested: []interface{}{RosterQuery{}}}}
 	ch := make(chan error)
 	f := func(v interface{}) bool {
@@ -128,7 +128,7 @@
 			rosterUpdate <- item
 		}
 		// Send a reply.
-		reply := &Iq{Stanza: Stanza{To: iq.From, Id: iq.Id,
+		reply := &Iq{Header: Header{To: iq.From, Id: iq.Id,
 			Type: "result"}}
 		client.Out <- reply
 	}