diff --git a/services/ocs/README.md b/services/ocs/README.md
index 53c05b1e2..3d45aaa5e 100644
--- a/services/ocs/README.md
+++ b/services/ocs/README.md
@@ -12,7 +12,7 @@ To authenticate presigned URLs the proxy service needs to read the signing keys
 Possible stores that can be configured via `OCS_PRESIGNEDURL_SIGNING_KEYS_STORE` are:
   -   `nats-js-kv`: Stores data using key-value-store feature of [nats jetstream](https://docs.nats.io/nats-concepts/jetstream/key-value-store)
   -   `redis-sentinel`: Stores data in a configured Redis Sentinel cluster.
-  -   `ocisstoreservice`:  Stores data in the legacy ocis store service. Requires setting `OCS_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` to `eu.opencloud.api.store`.
+  -   `opencloudstoreservice`:  Stores data in the legacy OpenCloud store service. Requires setting `OCS_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` to `eu.opencloud.api.store`.
 
 The `memory` store cannot be used as it does not share the memory from the ocs service signing key memory store, even in a single process.
 
@@ -21,4 +21,4 @@ Make sure to configure the same store in the proxy service.
 Store specific notes:
   -   When using `redis-sentinel`, the Redis master to use is configured via e.g. `OCS_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` in the form of `<sentinel-host>:<sentinel-port>/<redis-master>` like `10.10.0.200:26379/mymaster`.
   -   When using `nats-js-kv` it is recommended to set `PROXY_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` to the same value as `OCS_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES`. That way the proxy uses the same nats instance as the ocs service.
-  -   When using `ocisstoreservice` the `OCS_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` must be set to the service name `eu.opencloud.api.store`. It does not support TTL and stores the presigning keys indefinitely. Also, the store service needs to be started.
+  -   When using `opencloudstoreservice` the `OCS_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` must be set to the service name `eu.opencloud.api.store`. It does not support TTL and stores the presigning keys indefinitely. Also, the store service needs to be started.
diff --git a/services/ocs/pkg/command/root.go b/services/ocs/pkg/command/root.go
index aeb24a129..b0465488a 100644
--- a/services/ocs/pkg/command/root.go
+++ b/services/ocs/pkg/command/root.go
@@ -22,11 +22,11 @@ func GetCommands(cfg *config.Config) cli.Commands {
 	}
 }
 
-// Execute is the entry point for the ocis-ocs command.
+// Execute is the entry point for the opencloud-ocs command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
 		Name:     "ocs",
-		Usage:    "Serve OCS API for oCIS",
+		Usage:    "Serve OCS API for OpenCloud",
 		Commands: GetCommands(cfg),
 	})
 
diff --git a/services/ocs/pkg/metrics/metrics.go b/services/ocs/pkg/metrics/metrics.go
index 2ed09458b..444b53d1c 100644
--- a/services/ocs/pkg/metrics/metrics.go
+++ b/services/ocs/pkg/metrics/metrics.go
@@ -4,7 +4,7 @@ import "github.com/prometheus/client_golang/prometheus"
 
 var (
 	// Namespace defines the namespace for the defines metrics.
-	Namespace = "ocis"
+	Namespace = "opencloud"
 
 	// Subsystem defines the subsystem for the defines metrics.
 	Subsystem = "ocs"
diff --git a/services/ocs/pkg/service/v0/response/version.go b/services/ocs/pkg/service/v0/response/version.go
index a8460693a..9d66fe662 100644
--- a/services/ocs/pkg/service/v0/response/version.go
+++ b/services/ocs/pkg/service/v0/response/version.go
@@ -42,7 +42,7 @@ func OcsV1StatusCodes(meta data.Meta) int {
 // see https://github.com/owncloud/core/blob/c08baf580927ecb8ec179028dda255fdd85b4568/lib/private/legacy/api.php#L528
 // also HTTP status codes for apps are the same as OCS codes
 // see https://github.com/owncloud/core/blob/b9ff4c93e051c94adfb301545098ae627e52ef76/lib/public/AppFramework/OCSController.php#L142-L150
-// I think this is a bug in the ocs v2 api, but since we are going to mimic bugs in ocis ... here goes
+// I think this is a bug in the ocs v2 api, but since we are going to mimic bugs in OpenCloud ... here goes
 func OcsV2StatusCodes(meta data.Meta) int {
 	sc := meta.StatusCode
 	switch sc {