diff --git a/deployments/examples/opencloud_full/inbucket.yml b/deployments/examples/opencloud_full/inbucket.yml
index 276b66857..7967d573a 100644
--- a/deployments/examples/opencloud_full/inbucket.yml
+++ b/deployments/examples/opencloud_full/inbucket.yml
@@ -4,7 +4,7 @@ services:
     environment:
       NOTIFICATIONS_SMTP_HOST: inbucket
       NOTIFICATIONS_SMTP_PORT: 2500
-      NOTIFICATIONS_SMTP_SENDER: oCIS notifications <notifications@${OC_DOMAIN:-cloud.opencloud.test}>
+      NOTIFICATIONS_SMTP_SENDER: OpenCloud notifications <notifications@${OC_DOMAIN:-cloud.opencloud.test}>
       NOTIFICATIONS_SMTP_USERNAME: notifications@${OC_DOMAIN:-cloud.opencloud.test}
       # the mail catcher uses self signed certificates
       NOTIFICATIONS_SMTP_INSECURE: "true"
diff --git a/deployments/examples/opencloud_full/monitoring_tracing/monitoring-oo.yml b/deployments/examples/opencloud_full/monitoring_tracing/monitoring-oo.yml
index 0ead76a5d..fc1608898 100644
--- a/deployments/examples/opencloud_full/monitoring_tracing/monitoring-oo.yml
+++ b/deployments/examples/opencloud_full/monitoring_tracing/monitoring-oo.yml
@@ -8,7 +8,7 @@ services:
       OC_TRACING_TYPE: "jaeger"
       OC_TRACING_ENDPOINT: jaeger-agent:6831
       # metrics
-      # if oCIS runs as a single process, all  <debug>/metrics endpoints
+      # if OpenCloud runs as a single process, all  <debug>/metrics endpoints
       # will expose the same metrics, so it's sufficient to query one endpoint
       PROXY_DEBUG_ADDR: 0.0.0.0:9205
 
diff --git a/deployments/examples/opencloud_full/monitoring_tracing/monitoring.yml b/deployments/examples/opencloud_full/monitoring_tracing/monitoring.yml
index a8b0eed8d..8a9e5f05c 100644
--- a/deployments/examples/opencloud_full/monitoring_tracing/monitoring.yml
+++ b/deployments/examples/opencloud_full/monitoring_tracing/monitoring.yml
@@ -8,7 +8,7 @@ services:
       OC_TRACING_TYPE: "jaeger"
       OC_TRACING_ENDPOINT: jaeger-agent:6831
       # metrics
-      # if oCIS runs as a single process, all  <debug>/metrics endpoints
+      # if OpenCloud runs as a single process, all  <debug>/metrics endpoints
       # will expose the same metrics, so it's sufficient to query one endpoint
       PROXY_DEBUG_ADDR: 0.0.0.0:9205
 
diff --git a/deployments/examples/opencloud_full/opencloud.yml b/deployments/examples/opencloud_full/opencloud.yml
index 0183b07f0..a29418730 100644
--- a/deployments/examples/opencloud_full/opencloud.yml
+++ b/deployments/examples/opencloud_full/opencloud.yml
@@ -24,11 +24,11 @@ services:
       OC_LOG_LEVEL: ${LOG_LEVEL:-info}
       OC_LOG_COLOR: "${LOG_PRETTY:-false}"
       OC_LOG_PRETTY: "${LOG_PRETTY:-false}"
-      # do not use SSL between Traefik and oCIS
+      # do not use SSL between Traefik and OpenCloud
       PROXY_TLS: "false"
       # make the REVA gateway accessible to the app drivers
       GATEWAY_GRPC_ADDR: 0.0.0.0:9142
-      # INSECURE: needed if oCIS / Traefik is using self generated certificates
+      # INSECURE: needed if OpenCloud / Traefik is using self generated certificates
       OC_INSECURE: "${INSECURE:-false}"
       # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect)
       PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}"
@@ -39,7 +39,7 @@ services:
       # email server (if configured)
       NOTIFICATIONS_SMTP_HOST: "${SMTP_HOST}"
       NOTIFICATIONS_SMTP_PORT: "${SMTP_PORT}"
-      NOTIFICATIONS_SMTP_SENDER: "${SMTP_SENDER:-oCIS notifications <notifications@${OC_DOMAIN:-cloud.opencloud.test}>}"
+      NOTIFICATIONS_SMTP_SENDER: "${SMTP_SENDER:-OpenCloud notifications <notifications@${OC_DOMAIN:-cloud.opencloud.test}>}"
       NOTIFICATIONS_SMTP_USERNAME: "${SMTP_USERNAME}"
       NOTIFICATIONS_SMTP_INSECURE: "${SMTP_INSECURE}"
       # make the registry available to the app provider containers
diff --git a/services/app-registry/README.md b/services/app-registry/README.md
index 6789aa982..24a04168e 100644
--- a/services/app-registry/README.md
+++ b/services/app-registry/README.md
@@ -142,7 +142,7 @@ HTTP status code: 200
 }
 ```
 
-### Open a File With ownCloud Web
+### Open a File With OpenCloud Web
 
 **Endpoint**: specified in the capabilities in `open_web_url`, currently `/app/open-with-web`
 
@@ -170,7 +170,7 @@ curl -X POST 'https://opencloud.test/app/open-with-web?file_id=ZmlsZTppZAo=&app_
 
 **Response examples**:
 
-The URI from the response JSON is intended to be opened with a GET request in a browser. If the user has not yet a session in the browser, a login flow is handled by ownCloud Web.
+The URI from the response JSON is intended to be opened with a GET request in a browser. If the user has not yet a session in the browser, a login flow is handled by OpenCloud Web.
 
 HTTP status code: 200
 
diff --git a/tests/acceptance/features/coreApiWebdavPreviews/previewsAutoAdustedSizing.feature b/tests/acceptance/features/coreApiWebdavPreviews/previewsAutoAdustedSizing.feature
index 85614da0e..9ed344cdb 100644
--- a/tests/acceptance/features/coreApiWebdavPreviews/previewsAutoAdustedSizing.feature
+++ b/tests/acceptance/features/coreApiWebdavPreviews/previewsAutoAdustedSizing.feature
@@ -4,7 +4,7 @@ Feature: sizing of previews of files downloaded through the webdav API
   I want the aspect-ratio of previews to be preserved even when I ask for an unusual preview size
   So that the previews always have a similar look-and-feel to the original file
 
-  This is optional behavior of an implementation. OCIS happens like this,
+  This is optional behavior of an implementation. OpenCloud happens like this,
   but oC10 does not do this auto-fix of the aspect ratio.
 
   Background: