diff --git a/services/ocdav/README.md b/services/ocdav/README.md
index e718b35db..7345418d6 100644
--- a/services/ocdav/README.md
+++ b/services/ocdav/README.md
@@ -1,3 +1,3 @@
 # ocDAV
 
-The ocdav service provides the WebDAV API which is required by ownCloud clients. Previews (thumbnails) are provided by the [WebDAV service](../webdav).
+The ocdav service provides the WebDAV API which is required by OpenCloud clients. Previews (thumbnails) are provided by the [WebDAV service](../webdav).
diff --git a/services/ocdav/pkg/command/root.go b/services/ocdav/pkg/command/root.go
index 5e4f23698..402a27d74 100644
--- a/services/ocdav/pkg/command/root.go
+++ b/services/ocdav/pkg/command/root.go
@@ -22,11 +22,11 @@ func GetCommands(cfg *config.Config) cli.Commands {
 	}
 }
 
-// Execute is the entry point for the ocis-ocdav command.
+// Execute is the entry point for the OpenCloud ocdav command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
 		Name:     "ocdav",
-		Usage:    "Provide a WebDav API for oCIS",
+		Usage:    "Provide a WebDav API for OpenCloud",
 		Commands: GetCommands(cfg),
 	})
 
diff --git a/services/ocdav/pkg/config/config.go b/services/ocdav/pkg/config/config.go
index cd9e12c64..a09e589f3 100644
--- a/services/ocdav/pkg/config/config.go
+++ b/services/ocdav/pkg/config/config.go
@@ -25,7 +25,7 @@ type Config struct {
 	SharesNamespace string `yaml:"shares_namespace" env:"OCDAV_SHARES_NAMESPACE" desc:"The human readable path for the share jail. Relative to a users personal space root. Upcased intentionally." introductionVersion:"pre5.0"`
 	OCMNamespace    string `yaml:"ocm_namespace" env:"OCDAV_OCM_NAMESPACE" desc:"The human readable path prefix for the ocm shares." introductionVersion:"5.0"`
 	// PublicURL used to redirect /s/{token} URLs to
-	PublicURL string `yaml:"public_url" env:"OC_URL;OCDAV_PUBLIC_URL" desc:"URL where oCIS is reachable for users." introductionVersion:"pre5.0"`
+	PublicURL string `yaml:"public_url" env:"OC_URL;OCDAV_PUBLIC_URL" desc:"URL where OpenCloud is reachable for users." introductionVersion:"pre5.0"`
 
 	// Insecure certificates allowed when making requests to the gateway
 	Insecure bool `yaml:"insecure" env:"OC_INSECURE;OCDAV_INSECURE" desc:"Allow insecure connections to the GATEWAY service." introductionVersion:"pre5.0"`
@@ -81,5 +81,5 @@ type Status struct {
 	Product        string
 	ProductName    string
 	ProductVersion string
-	Edition        string `yaml:"edition" env:"OC_EDITION;OCDAV_EDITION" desc:"Edition of oCIS. Used for branding purposes." introductionVersion:"pre5.0"`
+	Edition        string `yaml:"edition" env:"OC_EDITION;OCDAV_EDITION" desc:"Edition of OpenCloud. Used for branding purposes." introductionVersion:"pre5.0"`
 }
diff --git a/services/ocdav/pkg/config/defaults/defaultconfig.go b/services/ocdav/pkg/config/defaults/defaultconfig.go
index cd8aa867e..be19a0d2d 100644
--- a/services/ocdav/pkg/config/defaults/defaultconfig.go
+++ b/services/ocdav/pkg/config/defaults/defaultconfig.go
@@ -90,8 +90,8 @@ func DefaultConfig() *config.Config {
 			Version:        version.Legacy,
 			VersionString:  version.LegacyString,
 			ProductVersion: version.GetString(),
-			Product:        "Infinite Scale",
-			ProductName:    "Infinite Scale",
+			Product:        "OpenCloud",
+			ProductName:    "OpenCloud",
 			Edition:        "Community",
 		},
 	}