diff --git a/.bra.toml b/.bra.toml
index cf3b9a80b..d329363f3 100644
--- a/.bra.toml
+++ b/.bra.toml
@@ -11,7 +11,7 @@ graceful_kill = false
 init_cmds = [
   ["make", "build"],
   [
-    "./bin/reva-webdav",
+    "./bin/ocis-webdav",
     "--log-level",
     "debug",
     "server"
@@ -21,7 +21,7 @@ init_cmds = [
 cmds = [
   ["make", "build"],
   [
-    "./bin/reva-webdav",
+    "./bin/ocis-webdav",
     "--log-level",
     "debug",
     "server"
diff --git a/.drone.starlark b/.drone.starlark
index 05be500c7..480cd9c0e 100644
--- a/.drone.starlark
+++ b/.drone.starlark
@@ -189,7 +189,7 @@ def docker(arch):
           'tags': 'linux-%s' % arch,
           'auto_tag_suffix': 'linux-%s' % arch,
           'dockerfile': 'docker/Dockerfile.linux.%s' % arch,
-          'repo': 'owncloud/reva-webdav',
+          'repo': 'owncloud/ocis-webdav',
         },
         'when': {
           'event': [
@@ -211,7 +211,7 @@ def docker(arch):
           'auto_tag': True,
           'auto_tag_suffix': 'linux-%s' % arch,
           'dockerfile': 'docker/Dockerfile.linux.%s' % arch,
-          'repo': 'owncloud/reva-webdav',
+          'repo': 'owncloud/ocis-webdav',
         },
         'when': {
           'event': {
@@ -310,7 +310,7 @@ def binary(name):
           'path_style': True,
           'strip_prefix': 'dist/release/',
           'source': 'dist/release/*',
-          'target': '/reva/webdav/testing'
+          'target': '/ocis/webdav/testing'
         },
         'when': {
           'event': [
@@ -338,7 +338,7 @@ def binary(name):
           'path_style': True,
           'strip_prefix': 'dist/release/',
           'source': 'dist/release/*',
-          'target': '/reva/webdav/${DRONE_TAG##v}'
+          'target': '/ocis/webdav/${DRONE_TAG##v}'
         },
         'when': {
           'event': [
@@ -358,7 +358,7 @@ def binary(name):
             'dist/release/*'
           ],
           'title': '${DRONE_TAG}',
-          'note': 'You can find the detailed changelog at https://github.com/owncloud/reva-webdav/blob/master/CHANGELOG.md',
+          'note': 'You can find the detailed changelog at https://github.com/owncloud/ocis-webdav/blob/master/CHANGELOG.md',
           'overwrite': True
         },
         'when': {
diff --git a/.drone.yml b/.drone.yml
index 5adaa71da..faba6af95 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -114,7 +114,7 @@ steps:
     auto_tag_suffix: linux-amd64
     dockerfile: docker/Dockerfile.linux.amd64
     dry_run: true
-    repo: owncloud/reva-webdav
+    repo: owncloud/ocis-webdav
     tags: linux-amd64
   when:
     event:
@@ -129,7 +129,7 @@ steps:
     dockerfile: docker/Dockerfile.linux.amd64
     password:
       from_secret: docker_password
-    repo: owncloud/reva-webdav
+    repo: owncloud/ocis-webdav
     username:
       from_secret: docker_username
   when:
@@ -185,7 +185,7 @@ steps:
     auto_tag_suffix: linux-arm64
     dockerfile: docker/Dockerfile.linux.arm64
     dry_run: true
-    repo: owncloud/reva-webdav
+    repo: owncloud/ocis-webdav
     tags: linux-arm64
   when:
     event:
@@ -200,7 +200,7 @@ steps:
     dockerfile: docker/Dockerfile.linux.arm64
     password:
       from_secret: docker_password
-    repo: owncloud/reva-webdav
+    repo: owncloud/ocis-webdav
     username:
       from_secret: docker_username
   when:
@@ -256,7 +256,7 @@ steps:
     auto_tag_suffix: linux-arm
     dockerfile: docker/Dockerfile.linux.arm
     dry_run: true
-    repo: owncloud/reva-webdav
+    repo: owncloud/ocis-webdav
     tags: linux-arm
   when:
     event:
@@ -271,7 +271,7 @@ steps:
     dockerfile: docker/Dockerfile.linux.arm
     password:
       from_secret: docker_password
-    repo: owncloud/reva-webdav
+    repo: owncloud/ocis-webdav
     username:
       from_secret: docker_username
   when:
@@ -344,7 +344,7 @@ steps:
       from_secret: aws_secret_access_key
     source: dist/release/*
     strip_prefix: dist/release/
-    target: /reva/webdav/testing
+    target: /ocis/webdav/testing
   when:
     event:
     - push
@@ -364,7 +364,7 @@ steps:
       from_secret: aws_secret_access_key
     source: dist/release/*
     strip_prefix: dist/release/
-    target: /reva/webdav/${DRONE_TAG##v}
+    target: /ocis/webdav/${DRONE_TAG##v}
   when:
     event:
     - tag
@@ -377,7 +377,7 @@ steps:
       from_secret: github_token
     files:
     - dist/release/*
-    note: You can find the detailed changelog at https://github.com/owncloud/reva-webdav/blob/master/CHANGELOG.md
+    note: You can find the detailed changelog at https://github.com/owncloud/ocis-webdav/blob/master/CHANGELOG.md
     overwrite: true
     title: ${DRONE_TAG}
   when:
@@ -449,7 +449,7 @@ steps:
       from_secret: aws_secret_access_key
     source: dist/release/*
     strip_prefix: dist/release/
-    target: /reva/webdav/testing
+    target: /ocis/webdav/testing
   when:
     event:
     - push
@@ -469,7 +469,7 @@ steps:
       from_secret: aws_secret_access_key
     source: dist/release/*
     strip_prefix: dist/release/
-    target: /reva/webdav/${DRONE_TAG##v}
+    target: /ocis/webdav/${DRONE_TAG##v}
   when:
     event:
     - tag
@@ -482,7 +482,7 @@ steps:
       from_secret: github_token
     files:
     - dist/release/*
-    note: You can find the detailed changelog at https://github.com/owncloud/reva-webdav/blob/master/CHANGELOG.md
+    note: You can find the detailed changelog at https://github.com/owncloud/ocis-webdav/blob/master/CHANGELOG.md
     overwrite: true
     title: ${DRONE_TAG}
   when:
@@ -554,7 +554,7 @@ steps:
       from_secret: aws_secret_access_key
     source: dist/release/*
     strip_prefix: dist/release/
-    target: /reva/webdav/testing
+    target: /ocis/webdav/testing
   when:
     event:
     - push
@@ -574,7 +574,7 @@ steps:
       from_secret: aws_secret_access_key
     source: dist/release/*
     strip_prefix: dist/release/
-    target: /reva/webdav/${DRONE_TAG##v}
+    target: /ocis/webdav/${DRONE_TAG##v}
   when:
     event:
     - tag
@@ -587,7 +587,7 @@ steps:
       from_secret: github_token
     files:
     - dist/release/*
-    note: You can find the detailed changelog at https://github.com/owncloud/reva-webdav/blob/master/CHANGELOG.md
+    note: You can find the detailed changelog at https://github.com/owncloud/ocis-webdav/blob/master/CHANGELOG.md
     overwrite: true
     title: ${DRONE_TAG}
   when: