diff --git a/builtin/logical/database/backend.go b/builtin/logical/database/backend.go
index 7d6ffe9c98..e8cf98ebbd 100644
--- a/builtin/logical/database/backend.go
+++ b/builtin/logical/database/backend.go
@@ -27,7 +27,7 @@ func Backend(conf *logical.BackendConfig) *databaseBackend {
 			pathConfigurePluginConnection(&b),
 			pathListRoles(&b),
 			pathRoles(&b),
-			pathRoleCreate(&b),
+			pathCredsCreate(&b),
 			pathResetConnection(&b),
 		},
 
diff --git a/builtin/logical/database/path_role_create.go b/builtin/logical/database/path_creds_create.go
similarity index 84%
rename from builtin/logical/database/path_role_create.go
rename to builtin/logical/database/path_creds_create.go
index a8da211f2e..341c61d67c 100644
--- a/builtin/logical/database/path_role_create.go
+++ b/builtin/logical/database/path_creds_create.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/vault/logical/framework"
 )
 
-func pathRoleCreate(b *databaseBackend) *framework.Path {
+func pathCredsCreate(b *databaseBackend) *framework.Path {
 	return &framework.Path{
 		Pattern: "creds/" + framework.GenericNameRegex("name"),
 		Fields: map[string]*framework.FieldSchema{
@@ -20,15 +20,15 @@ func pathRoleCreate(b *databaseBackend) *framework.Path {
 		},
 
 		Callbacks: map[logical.Operation]framework.OperationFunc{
-			logical.ReadOperation: b.pathRoleCreateRead(),
+			logical.ReadOperation: b.pathCredsCreateRead(),
 		},
 
-		HelpSynopsis:    pathRoleCreateReadHelpSyn,
-		HelpDescription: pathRoleCreateReadHelpDesc,
+		HelpSynopsis:    pathCredsCreateReadHelpSyn,
+		HelpDescription: pathCredsCreateReadHelpDesc,
 	}
 }
 
-func (b *databaseBackend) pathRoleCreateRead() framework.OperationFunc {
+func (b *databaseBackend) pathCredsCreateRead() framework.OperationFunc {
 	return func(req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
 		name := data.Get("name").(string)
 
@@ -58,7 +58,6 @@ func (b *databaseBackend) pathRoleCreateRead() framework.OperationFunc {
 		// Get the Database object
 		db, err := b.getOrCreateDBObj(req.Storage, role.DBName)
 		if err != nil {
-			// TODO: return a resp error instead?
 			return nil, fmt.Errorf("cound not retrieve db with name: %s, got error: %s", role.DBName, err)
 		}
 
@@ -82,11 +81,11 @@ func (b *databaseBackend) pathRoleCreateRead() framework.OperationFunc {
 	}
 }
 
-const pathRoleCreateReadHelpSyn = `
+const pathCredsCreateReadHelpSyn = `
 Request database credentials for a certain role.
 `
 
-const pathRoleCreateReadHelpDesc = `
+const pathCredsCreateReadHelpDesc = `
 This path reads database credentials for a certain role. The
 database credentials will be generated on demand and will be automatically
 revoked when the lease is up.