diff --git a/cmd/xmpp_component/xmpp_component.go b/cmd/xmpp_component/xmpp_component.go
index ec400e8..4773ed1 100644
--- a/cmd/xmpp_component/xmpp_component.go
+++ b/cmd/xmpp_component/xmpp_component.go
@@ -7,8 +7,8 @@ import (
 )
 
 func main() {
-	component := MyComponent{Name: "MQTT Component", Category: "gateway", Type: "mqtt"}
-	component.xmpp = &xmpp.Component{Host: "mqtt.localhost", Secret: "mypass"}
+	component := MyComponent{Name: "Facebook Gateway", Category: "gateway", Type: "facebook"}
+	component.xmpp = &xmpp.Component{Host: "facebook.localhost", Secret: "mypass"}
 	component.xmpp.Connect("localhost:8888")
 
 	for {
@@ -29,12 +29,12 @@ func main() {
 
 			default:
 				fmt.Println("ignoring iq packet", inner)
-				xerror := xmpp.Err{
+				xError := xmpp.Err{
 					Code:   501,
 					Reason: "feature-not-implemented",
 					Type:   "cancel",
 				}
-				reply := p.MakeError(xerror)
+				reply := p.MakeError(xError)
 				component.xmpp.Send(&reply)
 			}
 		default:
diff --git a/iq.go b/iq.go
index 2ac7d0b..c2063f0 100644
--- a/iq.go
+++ b/iq.go
@@ -135,7 +135,7 @@ func (x Err) MarshalXML(e *xml.Encoder, start xml.StartElement) (err error) {
 	start.Attr = append(start.Attr, code, typ)
 	err = e.EncodeToken(start)
 
-	// Subtags
+	// SubTags
 	// Reason
 	if x.Reason != "" {
 		reason := xml.Name{Space: "urn:ietf:params:xml:ns:xmpp-stanzas", Local: x.Reason}