diff -r 7696e6a01709 -r 36287f2cf06e roster_test.go
--- a/roster_test.go	Sun Dec 16 22:17:49 2012 -0700
+++ b/roster_test.go	Sun Dec 16 22:36:53 2012 -0700
@@ -13,7 +13,7 @@
 // This is mostly just tests of the roster data structures.
 
 func TestRosterIqMarshal(t *testing.T) {
-	iq := &Iq{Stanza: Stanza{From: "from", Lang: "en",
+	iq := &Iq{Header: Header{From: "from", Lang: "en",
 		Nested: []interface{}{RosterQuery{}}}}
 	exp := `<iq from="from" xml:lang="en"><query xmlns="` +
 		NsRoster + `"></query></iq>`
@@ -26,7 +26,7 @@
 	iq := Iq{}
 	xml.Unmarshal([]byte(str), &iq)
 	m := map[string]func(*xml.Name) interface{}{NsRoster: newRosterQuery}
-	err := parseExtended(&iq.Stanza, m)
+	err := parseExtended(&iq.Header, m)
 	if err != nil {
 		t.Fatalf("parseExtended: %v", err)
 	}