diff --git a/src/xmpp/stream.go b/src/xmpp/stream.go
index 0b3d9c1..0a46c2c 100644
--- a/src/xmpp/stream.go
+++ b/src/xmpp/stream.go
@@ -30,7 +30,7 @@ type Stream struct {
 	incomingNamespace nsMap
 }
 
-// Create a XML stream connection. A Steam is used by an XMPP instance to
+// Create a XML stream connection. A Stream is used by an XMPP instance to
 // handle sending and receiving XML data over the net connection.
 func NewStream(addr string, config *StreamConfig) (*Stream, error) {
 
diff --git a/src/xmpp/xmpp.go b/src/xmpp/xmpp.go
index 02bca72..8215c36 100644
--- a/src/xmpp/xmpp.go
+++ b/src/xmpp/xmpp.go
@@ -76,8 +76,8 @@ func (fn MatcherFunc) Match(v interface{}) bool {
 	return fn(v)
 }
 
-// Uniquly identifies a stream fiter. Used to remove a filter that's no longer
-// needed.
+// Uniquely identifies a stream filter. Used to remove a filter that's no
+// longer needed.
 type FilterId int64
 
 // Implements the error interface for a FilterId.