diff --git a/auth.go b/auth.go
index <HASH>..<HASH> 100644
--- a/auth.go
+++ b/auth.go
@@ -32,12 +32,13 @@ func (auth *PlainAuth) Response() string {
 	return fmt.Sprintf("\000%s\000%s", auth.Username, auth.Password)
 }
 
-// AMQPLAINAuth is similar to PlainAuth
+// AMQPlainAuth is similar to PlainAuth
 type AMQPlainAuth struct {
 	Username string
 	Password string
 }
 
+// Mechanism returns "AMQPLAIN"
 func (auth *AMQPlainAuth) Mechanism() string {
 	return "AMQPLAIN"
 }
diff --git a/uri.go b/uri.go
index <HASH>..<HASH> 100644
--- a/uri.go
+++ b/uri.go
@@ -125,7 +125,7 @@ func (uri URI) PlainAuth() *PlainAuth {
 	}
 }
 
-// PlainAuth returns a PlainAuth structure based on the parsed URI's
+// AMQPlainAuth returns a PlainAuth structure based on the parsed URI's
 // Username and Password fields.
 func (uri URI) AMQPlainAuth() *AMQPlainAuth {
 	return &AMQPlainAuth{
Fixes pre-existing golint issues