diff -r c8c9e6a7e6c9 -r f6bb47ca12f2 structs_test.go
--- a/structs_test.go	Sun Jan 01 17:19:03 2012 -0700
+++ b/structs_test.go	Sun Jan 01 17:22:48 2012 -0700
@@ -97,14 +97,14 @@
 	if err != nil {
 		t.Fatalf("iq: %v", err)
 	}
-	assertEquals(t, "iq", st.XName())
-	assertEquals(t, "alice", st.XTo())
-	assertEquals(t, "bob", st.XFrom())
-	assertEquals(t, "1", st.XId())
-	assertEquals(t, "A", st.XType())
-	assertEquals(t, "en", st.XLang())
-	if st.XError() != nil {
-		t.Errorf("iq: error %v", st.XError())
+	assertEquals(t, "iq", st.GetName())
+	assertEquals(t, "alice", st.GetTo())
+	assertEquals(t, "bob", st.GetFrom())
+	assertEquals(t, "1", st.GetId())
+	assertEquals(t, "A", st.GetType())
+	assertEquals(t, "en", st.GetLang())
+	if st.GetError() != nil {
+		t.Errorf("iq: error %v", st.GetError())
 	}
 	if st.generic() == nil {
 		t.Errorf("iq: nil child")
@@ -117,13 +117,13 @@
 	if err != nil {
 		t.Fatalf("message: %v", err)
 	}
-	assertEquals(t, "message", st.XName())
-	assertEquals(t, "alice", st.XTo())
-	assertEquals(t, "bob", st.XFrom())
-	assertEquals(t, "", st.XId())
-	assertEquals(t, "", st.XLang())
-	if st.XError() != nil {
-		t.Errorf("message: error %v", st.XError())
+	assertEquals(t, "message", st.GetName())
+	assertEquals(t, "alice", st.GetTo())
+	assertEquals(t, "bob", st.GetFrom())
+	assertEquals(t, "", st.GetId())
+	assertEquals(t, "", st.GetLang())
+	if st.GetError() != nil {
+		t.Errorf("message: error %v", st.GetError())
 	}
 	if st.generic() != nil {
 		t.Errorf("message: child %v", st.generic())
@@ -134,5 +134,5 @@
 	if err != nil {
 		t.Fatalf("presence: %v", err)
 	}
-	assertEquals(t, "presence", st.XName())
+	assertEquals(t, "presence", st.GetName())
 }