diff --git a/main.go b/main.go
index c0b7c2fbadc..e5a4c1bc725 100644
--- a/main.go
+++ b/main.go
@@ -31,8 +31,8 @@ func main() {
 	app.Name = "Grafana Backend"
 	app.Usage = "grafana web"
 	app.Version = version
-	app.Commands = []cli.Command{cmd.CmdWeb, cmd.CmdImportJson,
-		cmd.CmdListAccounts, cmd.CmdCreateAccount, cmd.CmdDeleteAccount}
+	app.Commands = []cli.Command{cmd.Web, cmd.ImportJson,
+		cmd.ListAccounts, cmd.CreateAccount, cmd.DeleteAccount}
 	app.Flags = append(app.Flags, []cli.Flag{}...)
 	app.Run(os.Args)
 
diff --git a/pkg/cmd/accounts.go b/pkg/cmd/accounts.go
index 90bff0a8f4d..cc5de2ae18d 100644
--- a/pkg/cmd/accounts.go
+++ b/pkg/cmd/accounts.go
@@ -12,7 +12,7 @@ import (
 	"text/tabwriter"
 )
 
-var CmdListAccounts = cli.Command{
+var ListAccounts = cli.Command{
 	Name:        "account",
 	Usage:       "list accounts",
 	Description: "Lists the accounts in the system",
@@ -26,7 +26,7 @@ var CmdListAccounts = cli.Command{
 	},
 }
 
-var CmdCreateAccount = cli.Command{
+var CreateAccount = cli.Command{
 	Name:        "account:create",
 	Usage:       "create a new account",
 	Description: "Creates a new account",
@@ -40,7 +40,7 @@ var CmdCreateAccount = cli.Command{
 	},
 }
 
-var CmdDeleteAccount = cli.Command{
+var DeleteAccount = cli.Command{
 	Name:        "account:delete",
 	Usage:       "delete an existing account",
 	Description: "Deletes an existing account",
diff --git a/pkg/cmd/import.go b/pkg/cmd/import.go
index aeea8cb17ed..14818d784a8 100644
--- a/pkg/cmd/import.go
+++ b/pkg/cmd/import.go
@@ -14,7 +14,7 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-var CmdImportJson = cli.Command{
+var ImportJson = cli.Command{
 	Name:        "import-json",
 	Usage:       "grafana import",
 	Description: "Starts Grafana import process",
diff --git a/pkg/cmd/web.go b/pkg/cmd/web.go
index d76e7858302..0b02b2011b4 100644
--- a/pkg/cmd/web.go
+++ b/pkg/cmd/web.go
@@ -22,7 +22,7 @@ import (
 	"github.com/grafana/grafana/pkg/social"
 )
 
-var CmdWeb = cli.Command{
+var Web = cli.Command{
 	Name:        "web",
 	Usage:       "grafana web",
 	Description: "Starts Grafana backend & web server",