diff --git a/src/autoscaler/api/cmd/api/api_suite_test.go b/src/autoscaler/api/cmd/api/api_suite_test.go
index 2cc648c415..b545e2f0ff 100644
--- a/src/autoscaler/api/cmd/api/api_suite_test.go
+++ b/src/autoscaler/api/cmd/api/api_suite_test.go
@@ -122,7 +122,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 			CACertFile: filepath.Join(testCertDir, "autoscaler-ca.crt"),
 		},
 	}
-	cfg.PublicApiServer = helpers.ServerConfig{
+	cfg.Server = helpers.ServerConfig{
 		Port: publicApiPort,
 		TLS: models.TLSCerts{
 			KeyFile:    filepath.Join(testCertDir, "api.key"),
@@ -131,15 +131,15 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 		},
 	}
 	cfg.Logging.Level = "info"
-	cfg.DB = make(map[string]db.DatabaseConfig)
+	cfg.Db = make(map[string]db.DatabaseConfig)
 	dbUrl := GetDbUrl()
-	cfg.DB[db.BindingDb] = db.DatabaseConfig{
+	cfg.Db[db.BindingDb] = db.DatabaseConfig{
 		URL:                   dbUrl,
 		MaxOpenConnections:    10,
 		MaxIdleConnections:    5,
 		ConnectionMaxLifetime: 10 * time.Second,
 	}
-	cfg.DB[db.PolicyDb] = db.DatabaseConfig{
+	cfg.Db[db.PolicyDb] = db.DatabaseConfig{
 		URL:                   dbUrl,
 		MaxOpenConnections:    10,
 		MaxIdleConnections:    5,
diff --git a/src/autoscaler/api/cmd/api/api_test.go b/src/autoscaler/api/cmd/api/api_test.go
index cced2671b1..89196c0b47 100644
--- a/src/autoscaler/api/cmd/api/api_test.go
+++ b/src/autoscaler/api/cmd/api/api_test.go
@@ -42,7 +42,7 @@ var _ = Describe("Api", func() {
 		healthHttpClient = &http.Client{}
 		apiHttpClient = NewPublicApiClient()
 
-		serverURL, err = url.Parse(fmt.Sprintf("https://127.0.0.1:%d", cfg.PublicApiServer.Port))
+		serverURL, err = url.Parse(fmt.Sprintf("https://127.0.0.1:%d", cfg.Server.Port))
 		Expect(err).NotTo(HaveOccurred())
 
 		brokerURL, err = url.Parse(fmt.Sprintf("https://127.0.0.1:%d", cfg.BrokerServer.Port))
@@ -95,9 +95,9 @@ var _ = Describe("Api", func() {
 				runner.startCheck = ""
 				missingConfig := cfg
 
-				missingConfig.DB = make(map[string]db.DatabaseConfig)
-				missingConfig.DB[db.PolicyDb] = db.DatabaseConfig{URL: ""}
-				missingConfig.DB[db.BindingDb] = db.DatabaseConfig{URL: ""}
+				missingConfig.Db = make(map[string]db.DatabaseConfig)
+				missingConfig.Db[db.PolicyDb] = db.DatabaseConfig{URL: ""}
+				missingConfig.Db[db.BindingDb] = db.DatabaseConfig{URL: ""}
 
 				var brokerCreds []config.BrokerCredentialsConfig
 				missingConfig.BrokerCredentials = brokerCreds
diff --git a/src/autoscaler/integration/components_test.go b/src/autoscaler/integration/components_test.go
index 3d911ca479..b63220fcbb 100644
--- a/src/autoscaler/integration/components_test.go
+++ b/src/autoscaler/integration/components_test.go
@@ -182,7 +182,7 @@ func (components *Components) PrepareGolangApiServerConfig(dbURI string, publicA
 		Logging: helpers.LoggingConfig{
 			Level: LOGLEVEL,
 		},
-		PublicApiServer: helpers.ServerConfig{
+		Server: helpers.ServerConfig{
 			Port: publicApiPort,
 			TLS: models.TLSCerts{
 				KeyFile:    filepath.Join(testCertDir, "api.key"),
@@ -352,7 +352,7 @@ func (components *Components) PrepareEventGeneratorConfig(dbUri string, port int
 			EvaluatorCount:            1,
 			TriggerArrayChannelSize:   1,
 		},
-		DB: egConfig.DBConfig{
+		Db: egConfig.DBConfig{
 			PolicyDB: db.DatabaseConfig{
 				URL: dbUri,
 			},