diff --git a/pkg/cmd/grafana-server/commands/cli.go b/pkg/cmd/grafana-server/commands/cli.go
index fb2cc84c45e..6821aa61548 100644
--- a/pkg/cmd/grafana-server/commands/cli.go
+++ b/pkg/cmd/grafana-server/commands/cli.go
@@ -103,7 +103,7 @@ func RunServer(opts ServerOptions) error {
 		return err
 	}
 
-	s, err := server.InitializeModuleServer(
+	s, err := server.Initialize(
 		cfg,
 		server.Options{
 			PidFile:     PidFile,
@@ -132,7 +132,7 @@ func validPackaging(packaging string) string {
 	return "unknown"
 }
 
-func listenToSystemSignals(ctx context.Context, s *server.ModuleServer) {
+func listenToSystemSignals(ctx context.Context, s *server.Server) {
 	signalChan := make(chan os.Signal, 1)
 	sighupChan := make(chan os.Signal, 1)
 
diff --git a/pkg/server/module_server.go b/pkg/server/module_server.go
index 4da29457ba2..6906e270913 100644
--- a/pkg/server/module_server.go
+++ b/pkg/server/module_server.go
@@ -11,11 +11,11 @@ import (
 	"sync"
 
 	"github.com/grafana/dskit/services"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 
 	"github.com/grafana/grafana/pkg/api"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/modules"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	grafanaapiserver "github.com/grafana/grafana/pkg/services/grafana-apiserver"
 	"github.com/grafana/grafana/pkg/setting"
 )