diff --git a/builtin/logical/database/dbplugin/server.go b/builtin/logical/database/dbplugin/server.go
index 04cc3d7e90..32c377e131 100644
--- a/builtin/logical/database/dbplugin/server.go
+++ b/builtin/logical/database/dbplugin/server.go
@@ -7,10 +7,10 @@ import (
 	"github.com/hashicorp/vault/helper/pluginutil"
 )
 
-// NewPluginServer is called from within a plugin and wraps the provided
+// Serve is called from within a plugin and wraps the provided
 // Database implementation in a databasePluginRPCServer object and starts a
 // RPC server.
-func NewPluginServer(db Database) {
+func Serve(db Database) {
 	dbPlugin := &DatabasePlugin{
 		impl: db,
 	}
diff --git a/plugins/database/mssql/mssql.go b/plugins/database/mssql/mssql.go
index b608428e5c..d82efce6f7 100644
--- a/plugins/database/mssql/mssql.go
+++ b/plugins/database/mssql/mssql.go
@@ -45,7 +45,7 @@ func Run() error {
 		return err
 	}
 
-	dbplugin.NewPluginServer(dbType.(*MSSQL))
+	dbplugin.Serve(dbType.(*MSSQL))
 
 	return nil
 }
diff --git a/plugins/database/mysql/mysql.go b/plugins/database/mysql/mysql.go
index 6485aaa862..7eb680759f 100644
--- a/plugins/database/mysql/mysql.go
+++ b/plugins/database/mysql/mysql.go
@@ -48,7 +48,7 @@ func Run() error {
 		return err
 	}
 
-	dbplugin.NewPluginServer(dbType.(*MySQL))
+	dbplugin.Serve(dbType.(*MySQL))
 
 	return nil
 }
diff --git a/plugins/database/postgresql/postgresql.go b/plugins/database/postgresql/postgresql.go
index e90e0f8cbc..0889a86f55 100644
--- a/plugins/database/postgresql/postgresql.go
+++ b/plugins/database/postgresql/postgresql.go
@@ -41,7 +41,7 @@ func Run() error {
 		return err
 	}
 
-	dbplugin.NewPluginServer(dbType.(*PostgreSQL))
+	dbplugin.Serve(dbType.(*PostgreSQL))
 
 	return nil
 }