diff --git a/extensions/settings/pkg/config/defaults/defaultconfig.go b/extensions/settings/pkg/config/defaults/defaultconfig.go
index 6fee017ca..23173a8fc 100644
--- a/extensions/settings/pkg/config/defaults/defaultconfig.go
+++ b/extensions/settings/pkg/config/defaults/defaultconfig.go
@@ -50,7 +50,7 @@ func DefaultConfig() *config.Config {
 		},
 
 		Metadata: config.Metadata{
-			GatewayAddress: "127.0.0.1:9215", // metadata storage
+			GatewayAddress: "127.0.0.1:9215", // system storage
 			StorageAddress: "127.0.0.1:9215",
 			ServiceUserIDP: "internal",
 		},
diff --git a/extensions/storage-system/pkg/command/server.go b/extensions/storage-system/pkg/command/server.go
index 026f75bf3..e54864b8c 100644
--- a/extensions/storage-system/pkg/command/server.go
+++ b/extensions/storage-system/pkg/command/server.go
@@ -47,7 +47,7 @@ func Server(cfg *config.Config) *cli.Command {
 
 			pidFile := path.Join(os.TempDir(), "revad-"+cfg.Service.Name+"-"+uuid.Must(uuid.NewV4()).String()+".pid")
 
-			rcfg := revaconfig.StorageMetadataFromStruct(cfg)
+			rcfg := revaconfig.StorageSystemFromStruct(cfg)
 
 			gr.Add(func() error {
 				runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))
diff --git a/extensions/storage-system/pkg/revaconfig/config.go b/extensions/storage-system/pkg/revaconfig/config.go
index ab3424919..0489758df 100644
--- a/extensions/storage-system/pkg/revaconfig/config.go
+++ b/extensions/storage-system/pkg/revaconfig/config.go
@@ -5,8 +5,8 @@ import (
 	"github.com/owncloud/ocis/extensions/storage-system/pkg/config"
 )
 
-// StorageMetadataFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.
-func StorageMetadataFromStruct(cfg *config.Config) map[string]interface{} {
+// StorageSystemFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.
+func StorageSystemFromStruct(cfg *config.Config) map[string]interface{} {
 	rcfg := map[string]interface{}{
 		"core": map[string]interface{}{
 			"tracing_enabled":      cfg.Tracing.Enabled,
diff --git a/ocis/pkg/init/init.go b/ocis/pkg/init/init.go
index b88acc580..2651683e3 100644
--- a/ocis/pkg/init/init.go
+++ b/ocis/pkg/init/init.go
@@ -110,7 +110,7 @@ type OcisConfig struct {
 	AuthBearer        AuthbearerExtension `yaml:"auth_bearer"`
 	User              UserAndGroupExtension
 	Group             UserAndGroupExtension
-	StorageMetadata   DataProviderInsecureSettings `yaml:"storage_system"`
+	StorageSystem     DataProviderInsecureSettings `yaml:"storage_system"`
 	StorageUsers      DataProviderInsecureSettings `yaml:"storage_users"`
 	Ocdav             InsecureExtension
 	Thumbnails        ThumbNailExtension
@@ -271,7 +271,7 @@ func CreateConfig(insecure, forceOverwrite bool, configPath, adminPassword strin
 		cfg.Proxy = InsecureProxyExtension{
 			Insecure_backends: true,
 		}
-		cfg.StorageMetadata = DataProviderInsecureSettings{
+		cfg.StorageSystem = DataProviderInsecureSettings{
 			Data_provider_insecure: true,
 		}
 		cfg.StorageUsers = DataProviderInsecureSettings{