diff --git a/cchat.go b/cchat.go
index a9b0170..f5ad229 100644
--- a/cchat.go
+++ b/cchat.go
@@ -202,10 +202,6 @@ type Attachments interface {
 //    	break // success
 //    }
 type Authenticator interface {
-	// Namer returns a short and concise name of this Authenticator method. The name
-	// should not include the name of the Service.
-	Namer
-
 	// Authenticate will be called with a list of values with indices correspond to
 	// the returned slice of AuthenticateEntry.
 	Authenticate([]string) (Session, error) // Blocking
@@ -214,6 +210,9 @@ type Authenticator interface {
 	AuthenticateForm() []AuthenticateEntry
 	// Description returns the description of this authenticator method.
 	Description() text.Rich
+	// Name returns a short and concise name of this Authenticator method. The name
+	// should not include the name of the Service.
+	Name() text.Rich
 }
 
 // Author is the interface for an identifiable author. The interface defines
diff --git a/repository/main.go b/repository/main.go
index ae35c45..2ca4fda 100644
--- a/repository/main.go
+++ b/repository/main.go
@@ -706,14 +706,20 @@ var Main = Packages{
 					}
 			`},
 			Name: "Authenticator",
-			Embeds: []EmbeddedInterface{{
-				Comment: Comment{`
-					Namer returns a short and concise name of this Authenticator
-					method. The name should not include the name of the Service.
-				`},
-				InterfaceName: "Namer",
-			}},
 			Methods: []Method{
+				GetterMethod{
+					method: method{
+						Comment: Comment{`
+							Name returns a short and concise name of this
+							Authenticator method. The name should not include
+							the name of the Service.
+						`},
+						Name: "Name",
+					},
+					Returns: []NamedType{{
+						Type: MakeQual("text", "Rich"),
+					}},
+				},
 				GetterMethod{
 					method: method{
 						Comment: Comment{`