diff --git a/services/webdav/README.md b/services/webdav/README.md
index 0430401b0..75f7ea91b 100644
--- a/services/webdav/README.md
+++ b/services/webdav/README.md
@@ -10,13 +10,13 @@ Currently, the webdav service handles request for two functionalities, which are
 
 The webdav service provides various `GET` endpoints to get the thumbnails of a file in authenticated and unauthenticated contexts. It also provides thumbnails for spaces on different endpoints. 
 
-See the [thumbnail](https://github.com/owncloud/ocis/tree/master/services/thumbnails) service for more information about thumbnails.
+See the [thumbnail](https://github.com/opencloud-eu/opencloud/tree/master/services/thumbnails) service for more information about thumbnails.
 
 ### Search
 
 The webdav service provides access to the search functionality. It offers multiple `REPORT` endpoints for getting search results. 
 
-See the [search](https://github.com/owncloud/ocis/tree/master/services/search) service for more details about search functionality. 
+See the [search](https://github.com/opencloud-eu/opencloud/tree/master/services/search) service for more details about search functionality. 
 
 ## Scalability
 
diff --git a/services/webdav/pkg/command/root.go b/services/webdav/pkg/command/root.go
index 4e2a1abf6..1273ccae6 100644
--- a/services/webdav/pkg/command/root.go
+++ b/services/webdav/pkg/command/root.go
@@ -22,11 +22,11 @@ func GetCommands(cfg *config.Config) cli.Commands {
 	}
 }
 
-// Execute is the entry point for the ocis-webdav command.
+// Execute is the entry point for the opencloud-webdav command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
 		Name:     "webdav",
-		Usage:    "Serve WebDAV API for oCIS",
+		Usage:    "Serve WebDAV API for OpenCloud",
 		Commands: GetCommands(cfg),
 	})
 
diff --git a/services/webdav/pkg/config/config.go b/services/webdav/pkg/config/config.go
index 8aa424220..f4688b8e7 100644
--- a/services/webdav/pkg/config/config.go
+++ b/services/webdav/pkg/config/config.go
@@ -23,7 +23,7 @@ type Config struct {
 	HTTP HTTP `yaml:"http"`
 
 	DisablePreviews      bool            `yaml:"disablePreviews" env:"OC_DISABLE_PREVIEWS;WEBDAV_DISABLE_PREVIEWS" desc:"Set this option to 'true' to disable rendering of thumbnails triggered via webdav access. Note that when disabled, all access to preview related webdav paths will return a 404." introductionVersion:"pre5.0"`
-	OcisPublicURL        string          `yaml:"ocis_public_url" env:"OC_URL;OC_PUBLIC_URL" desc:"URL, where oCIS is reachable for users." introductionVersion:"pre5.0"`
+	OpenCloudPublicURL   string          `yaml:"opencloud_public_url" env:"OC_URL;OC_PUBLIC_URL" desc:"URL, where OpenCloud is reachable for users." introductionVersion:"pre5.0"`
 	WebdavNamespace      string          `yaml:"webdav_namespace" env:"WEBDAV_WEBDAV_NAMESPACE" desc:"CS3 path layout to use when forwarding /webdav requests" introductionVersion:"pre5.0"`
 	RevaGateway          string          `yaml:"reva_gateway" env:"OC_REVA_GATEWAY" desc:"CS3 gateway used to look up user metadata" introductionVersion:"pre5.0"`
 	RevaGatewayTLSMode   string          `yaml:"reva_gateway_tls_mode" env:"OC_REVA_GATEWAY_TLS_MODE" desc:"TLS mode for grpc connection to the CS3 gateway endpoint. Possible values are 'off', 'insecure' and 'on'. 'off': disables transport security for the clients. 'insecure' allows using transport security, but disables certificate verification (to be used with the autogenerated self-signed certificates). 'on' enables transport security, including server certificate verification." introductionVersion:"pre5.0"`
diff --git a/services/webdav/pkg/config/defaults/defaultconfig.go b/services/webdav/pkg/config/defaults/defaultconfig.go
index 6acda5eb4..d6b17ed78 100644
--- a/services/webdav/pkg/config/defaults/defaultconfig.go
+++ b/services/webdav/pkg/config/defaults/defaultconfig.go
@@ -39,9 +39,9 @@ func DefaultConfig() *config.Config {
 		Service: config.Service{
 			Name: "webdav",
 		},
-		OcisPublicURL:   "https://127.0.0.1:9200",
-		WebdavNamespace: "/users/{{.Id.OpaqueId}}",
-		RevaGateway:     shared.DefaultRevaConfig().Address,
+		OpenCloudPublicURL: "https://127.0.0.1:9200",
+		WebdavNamespace:    "/users/{{.Id.OpaqueId}}",
+		RevaGateway:        shared.DefaultRevaConfig().Address,
 	}
 }
 
diff --git a/services/webdav/pkg/service/v0/service.go b/services/webdav/pkg/service/v0/service.go
index ab3583594..4f31cd751 100644
--- a/services/webdav/pkg/service/v0/service.go
+++ b/services/webdav/pkg/service/v0/service.go
@@ -392,7 +392,7 @@ func (g Webdav) PublicThumbnail(w http.ResponseWriter, r *http.Request) {
 		Processor:     tr.Processor,
 		Source: &thumbnailssvc.GetThumbnailRequest_WebdavSource{
 			WebdavSource: &thumbnailsmsg.WebdavSource{
-				Url:             g.config.OcisPublicURL + r.URL.RequestURI(),
+				Url:             g.config.OpenCloudPublicURL + r.URL.RequestURI(),
 				IsPublicLink:    true,
 				PublicLinkToken: tr.PublicLinkToken,
 			},
@@ -437,7 +437,7 @@ func (g Webdav) PublicThumbnailHead(w http.ResponseWriter, r *http.Request) {
 		Processor:     tr.Processor,
 		Source: &thumbnailssvc.GetThumbnailRequest_WebdavSource{
 			WebdavSource: &thumbnailsmsg.WebdavSource{
-				Url:             g.config.OcisPublicURL + r.URL.RequestURI(),
+				Url:             g.config.OpenCloudPublicURL + r.URL.RequestURI(),
 				IsPublicLink:    true,
 				PublicLinkToken: tr.PublicLinkToken,
 			},