diff --git a/.drone.star b/.drone.star
index 133667091..188a2c7f3 100644
--- a/.drone.star
+++ b/.drone.star
@@ -55,7 +55,7 @@ config = {
         "extensions/glauth",
         "extensions/graph-explorer",
         "extensions/graph",
-        "extensions/group",
+        "extensions/groups",
         "extensions/idm",
         "extensions/idp",
         "extensions/nats",
@@ -71,7 +71,7 @@ config = {
         "extensions/storage-users",
         "extensions/store",
         "extensions/thumbnails",
-        "extensions/user",
+        "extensions/users",
         "extensions/web",
         "extensions/webdav",
         "ocis-pkg",
@@ -1721,7 +1721,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
             "SHARING_USER_OWNCLOUDSQL_DB_NAME": "owncloud",
             # General oCIS config
             # OCIS_RUN_EXTENSIONS specifies to start all extensions except glauth, idp and accounts. These are replaced by external services
-            "OCIS_RUN_EXTENSIONS": "settings,storage-system,graph,graph-explorer,ocs,store,thumbnails,web,webdav,frontend,gateway,user,group,auth-basic,auth-bearer,auth-machine,storage-users,storage-shares,storage-publiclink,app-provider,sharing,proxy,nats,ocdav",
+            "OCIS_RUN_EXTENSIONS": "settings,storage-system,graph,graph-explorer,ocs,store,thumbnails,web,webdav,frontend,gateway,users,groups,auth-basic,auth-bearer,auth-machine,storage-users,storage-shares,storage-publiclink,app-provider,sharing,proxy,nats,ocdav",
             "OCIS_LOG_LEVEL": "info",
             "OCIS_URL": OCIS_URL,
             "OCIS_BASE_DATA_PATH": "/mnt/data/ocis",
diff --git a/.vscode/launch.json b/.vscode/launch.json
index ac3a0f155..602fcae57 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -22,7 +22,7 @@
                 // demo users
                 "IDM_CREATE_DEMO_USERS": "true",
                 // OCIS_RUN_EXTENSIONS allows to start a subset of extensions even in the supervised mode
-                //"OCIS_RUN_EXTENSIONS": "settings,storage-system,glauth,graph,graph-explorer,idp,ocs,store,thumbnails,web,webdav,frontend,gateway,user,group,auth-basic,auth-bearer,storage-authmachine,storage-users,storage-shares,storage-publiclink,app-provider,sharing,accounts,proxy,ocdav",
+                //"OCIS_RUN_EXTENSIONS": "settings,storage-system,glauth,graph,graph-explorer,idp,ocs,store,thumbnails,web,webdav,frontend,gateway,users,groups,auth-basic,auth-bearer,storage-authmachine,storage-users,storage-shares,storage-publiclink,app-provider,sharing,accounts,proxy,ocdav",
 
                 /*
                  * Keep secrets and passwords in one block to allow easy uncommenting
diff --git a/Makefile b/Makefile
index c216f2d64..545323156 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ OCIS_MODULES = \
 	extensions/glauth \
 	extensions/graph \
 	extensions/graph-explorer \
-	extensions/group \
+	extensions/groups \
 	extensions/idm \
 	extensions/idp \
 	extensions/nats \
@@ -44,7 +44,7 @@ OCIS_MODULES = \
 	extensions/storage-users \
 	extensions/store \
 	extensions/thumbnails \
-	extensions/user \
+	extensions/users \
 	extensions/web \
 	extensions/webdav\
 	ocis \
diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml
index 84494d9cf..56886b6d2 100644
--- a/deployments/examples/oc10_ocis_parallel/docker-compose.yml
+++ b/deployments/examples/oc10_ocis_parallel/docker-compose.yml
@@ -108,7 +108,7 @@ services:
       OCIS_STORAGE_READ_ONLY: "false" # TODO: conflict with OWNCLOUDSQL -> https://github.com/owncloud/ocis/issues/2303
       # General oCIS config
       # OCIS_RUN_EXTENSIONS specifies to start all extensions except glauth, idp and accounts. These are replaced by external services
-      OCIS_RUN_EXTENSIONS: settings,storage-system,graph,graph-explorer,ocs,store,thumbnails,web,webdav,storage-frontend,storage-gateway,storage-userprovider,storage-groupprovider,storage-authbasic,storage-authbearer,storage-authmachine,storage-users,storage-shares,storage-public-link,app-provider,storage-sharing,proxy,nats
+      OCIS_RUN_EXTENSIONS: settings,storage-system,graph,graph-explorer,ocs,store,thumbnails,web,webdav,frontend,gateway,users,groups,auth-basic,auth-bearer,auth-machine,storage-users,storage-shares,storage-publiclink,app-provider,sharing,proxy,nats
       OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose
       OCIS_URL: https://${CLOUD_DOMAIN:-cloud.owncloud.test}
       PROXY_TLS: "false" # do not use SSL between Traefik and oCIS
diff --git a/deployments/examples/ocis_individual_services/docker-compose.yml b/deployments/examples/ocis_individual_services/docker-compose.yml
index 6d91722f1..2e845ec94 100644
--- a/deployments/examples/ocis_individual_services/docker-compose.yml
+++ b/deployments/examples/ocis_individual_services/docker-compose.yml
@@ -589,7 +589,7 @@ services:
       driver: "local"
     restart: always
 
-  storage-userprovider:
+  users:
     image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
     deploy:
       replicas: ${OCIS_SCALE:-1}
@@ -597,14 +597,14 @@ services:
       ocis-net:
     entrypoint:
       - ocis
-      - storage-userprovider
+      - users
       - server
     environment:
       OCIS_LOG_LEVEL: "${OCIS_LOG_LEVEL:-error}"
       OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
       OCIS_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}"
 
-      STORAGE_USERPROVIDER_ENDPOINT: storage-userprovider:9144
+      STORAGE_USERPROVIDER_ENDPOINT: users:9144
       STORAGE_USERPROVIDER_ADDR: 0.0.0.0:9144
 
       STORAGE_USERPROVIDER_DRIVER: ldap
@@ -619,7 +619,7 @@ services:
       driver: "local"
     restart: always
 
-  storage-groupprovider:
+  groups:
     image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
     deploy:
       replicas: ${OCIS_SCALE:-1}
@@ -627,14 +627,14 @@ services:
       ocis-net:
     entrypoint:
       - ocis
-      - storage-groupprovider
+      - groups
       - server
     environment:
       OCIS_LOG_LEVEL: "${OCIS_LOG_LEVEL:-error}"
       OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
       OCIS_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}"
 
-      STORAGE_GROUPPROVIDER_ENDPOINT: storage-groupprovider:9160
+      STORAGE_GROUPPROVIDER_ENDPOINT: groups:9160
       STORAGE_GROUPPROVIDER_ADDR: 0.0.0.0:9160
 
       STORAGE_GROUPPROVIDER_DRIVER: ldap
@@ -708,10 +708,10 @@ services:
       STORAGE_AUTH_MACHINE_ENDPOINT: storage-authmachine:9148
 
       STORAGE_SHARES_ENDPOINT: storage-shares:9154
-      STORAGE_SHARING_ENDPOINT: storage-sharing:9150
+      STORAGE_SHARING_ENDPOINT: sharing:9150
 
-      STORAGE_GROUPPROVIDER_ENDPOINT: storage-groupprovider:9160
-      STORAGE_USERPROVIDER_ENDPOINT: storage-userprovider:9144
+      STORAGE_GROUPPROVIDER_ENDPOINT: groups:9160
+      STORAGE_USERPROVIDER_ENDPOINT: users:9144
       STORAGE_PERMISSIONS_ENDPOINT: settings:9191
 
       STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
diff --git a/deployments/examples/ocis_individual_services/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/ocis_individual_services/monitoring_tracing/docker-compose-additions.yml
index 8faadf3b3..915d7e048 100644
--- a/deployments/examples/ocis_individual_services/monitoring_tracing/docker-compose-additions.yml
+++ b/deployments/examples/ocis_individual_services/monitoring_tracing/docker-compose-additions.yml
@@ -163,7 +163,7 @@ services:
       OCIS_TRACING_ENDPOINT: jaeger-agent:6831
       # metrics
       STORAGE_SHARING_DEBUG_ADDR: 0.0.0.0:9151
-  storage-userprovider:
+  users:
     environment:
       # tracing
       OCIS_TRACING_ENABLED: "true"
@@ -171,7 +171,7 @@ services:
       OCIS_TRACING_ENDPOINT: jaeger-agent:6831
       # metrics
       STORAGE_USERPROVIDER_DEBUG_ADDR: 0.0.0.0:9145
-  storage-groupprovider:
+  groups:
     environment:
       # tracing
       OCIS_TRACING_ENABLED: "true"
diff --git a/docs/extensions/group/_index.md b/docs/extensions/groups/_index.md
similarity index 80%
rename from docs/extensions/group/_index.md
rename to docs/extensions/groups/_index.md
index 00fabc8b7..2ac5a6f39 100644
--- a/docs/extensions/group/_index.md
+++ b/docs/extensions/groups/_index.md
@@ -3,7 +3,7 @@ title: Group
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/group
+geekdocEditPath: edit/master/docs/extensions/groups
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---
diff --git a/docs/extensions/user/configuration.md b/docs/extensions/groups/configuration.md
similarity index 51%
rename from docs/extensions/user/configuration.md
rename to docs/extensions/groups/configuration.md
index 683e05b24..ae71b8bf2 100644
--- a/docs/extensions/user/configuration.md
+++ b/docs/extensions/groups/configuration.md
@@ -3,13 +3,13 @@ title: Service Configuration
 date: 2018-05-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/user
+geekdocEditPath: edit/master/docs/extensions/groups
 geekdocFilePath: configuration.md
 geekdocCollapseSection: true
 ---
 
 ## Example YAML Config
 
-{{< include file="extensions/_includes/user-config-example.yaml"  language="yaml" >}}
+{{< include file="extensions/_includes/groups-config-example.yaml"  language="yaml" >}}
 
-{{< include file="extensions/_includes/user_configvars.md" >}}
+{{< include file="extensions/_includes/groups_configvars.md" >}}
diff --git a/docs/extensions/storage/ports.md b/docs/extensions/storage/ports.md
index b594dd85b..e27d50b93 100644
--- a/docs/extensions/storage/ports.md
+++ b/docs/extensions/storage/ports.md
@@ -34,8 +34,8 @@ For now, the storage service uses these ports to preconfigure those services:
 | 9159      | storage users debug                           |
 | 9160      | groups                                        |
 | 9161      | groups debug                                  |
-| 9164      | storage app-provider                           |
-| 9165      | storage app-provider debug                     |
+| 9164      | storage app-provider                          |
+| 9165      | storage app-provider debug                    |
 | 9178      | storage public link                           |
 | 9179      | storage public link data                      |
 | 9180      | accounts grpc                                 |
diff --git a/docs/extensions/user/_index.md b/docs/extensions/users/_index.md
similarity index 81%
rename from docs/extensions/user/_index.md
rename to docs/extensions/users/_index.md
index 8c4078068..3626724f7 100644
--- a/docs/extensions/user/_index.md
+++ b/docs/extensions/users/_index.md
@@ -3,7 +3,7 @@ title: User
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/user
+geekdocEditPath: edit/master/docs/extensions/users
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---
diff --git a/docs/extensions/group/configuration.md b/docs/extensions/users/configuration.md
similarity index 57%
rename from docs/extensions/group/configuration.md
rename to docs/extensions/users/configuration.md
index b177bf5a5..a8aa67a9b 100644
--- a/docs/extensions/group/configuration.md
+++ b/docs/extensions/users/configuration.md
@@ -3,13 +3,13 @@ title: Service Configuration
 date: 2018-05-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/group
+geekdocEditPath: edit/master/docs/extensions/users
 geekdocFilePath: configuration.md
 geekdocCollapseSection: true
 ---
 
 ## Example YAML Config
 
-{{< include file="extensions/_includes/group-config-example.yaml"  language="yaml" >}}
+{{< include file="extensions/_includes/users-config-example.yaml"  language="yaml" >}}
 
-{{< include file="extensions/_includes/group_configvars.md" >}}
+{{< include file="extensions/_includes/users_configvars.md" >}}
diff --git a/extensions/user/Makefile b/extensions/groups/Makefile
similarity index 98%
rename from extensions/user/Makefile
rename to extensions/groups/Makefile
index c249998fc..2f439211d 100644
--- a/extensions/user/Makefile
+++ b/extensions/groups/Makefile
@@ -1,5 +1,5 @@
 SHELL := bash
-NAME := user
+NAME := groups
 
 include ../../.make/recursion.mk
 
diff --git a/extensions/user/cmd/user/main.go b/extensions/groups/cmd/groups/main.go
similarity index 50%
rename from extensions/user/cmd/user/main.go
rename to extensions/groups/cmd/groups/main.go
index 1a554120e..f6a9bf09f 100644
--- a/extensions/user/cmd/user/main.go
+++ b/extensions/groups/cmd/groups/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/command"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config/defaults"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/command"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config/defaults"
 )
 
 func main() {
diff --git a/extensions/user/pkg/command/health.go b/extensions/groups/pkg/command/health.go
similarity index 84%
rename from extensions/user/pkg/command/health.go
rename to extensions/groups/pkg/command/health.go
index 245824ceb..756205dbe 100644
--- a/extensions/user/pkg/command/health.go
+++ b/extensions/groups/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config/parser"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/logging"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config/parser"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/logging"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/extensions/group/pkg/command/root.go b/extensions/groups/pkg/command/root.go
similarity index 91%
rename from extensions/group/pkg/command/root.go
rename to extensions/groups/pkg/command/root.go
index 3b57e0276..9488ae002 100644
--- a/extensions/group/pkg/command/root.go
+++ b/extensions/groups/pkg/command/root.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"os"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
 	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/thejerf/suture/v4"
@@ -48,9 +48,9 @@ type SutureService struct {
 
 // NewSutureService creates a new group.SutureService
 func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Group.Commons = cfg.Commons
+	cfg.Groups.Commons = cfg.Commons
 	return SutureService{
-		cfg: cfg.Group,
+		cfg: cfg.Groups,
 	}
 }
 
diff --git a/extensions/group/pkg/command/server.go b/extensions/groups/pkg/command/server.go
similarity index 89%
rename from extensions/group/pkg/command/server.go
rename to extensions/groups/pkg/command/server.go
index c83f427af..1a9b86836 100644
--- a/extensions/group/pkg/command/server.go
+++ b/extensions/groups/pkg/command/server.go
@@ -9,12 +9,12 @@ import (
 	"github.com/cs3org/reva/v2/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config/parser"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/logging"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/revaconfig"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/server/debug"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/tracing"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config/parser"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/logging"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/revaconfig"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/server/debug"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/tracing"
 	"github.com/owncloud/ocis/v2/ocis-pkg/ldap"
 	"github.com/owncloud/ocis/v2/ocis-pkg/service/external"
 	"github.com/owncloud/ocis/v2/ocis-pkg/sync"
diff --git a/extensions/group/pkg/command/version.go b/extensions/groups/pkg/command/version.go
similarity index 95%
rename from extensions/group/pkg/command/version.go
rename to extensions/groups/pkg/command/version.go
index dbb93521a..6fcf3e7f4 100644
--- a/extensions/group/pkg/command/version.go
+++ b/extensions/groups/pkg/command/version.go
@@ -8,7 +8,7 @@ import (
 	"github.com/owncloud/ocis/v2/ocis-pkg/version"
 
 	tw "github.com/olekukonko/tablewriter"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/extensions/group/pkg/config/config.go b/extensions/groups/pkg/config/config.go
similarity index 100%
rename from extensions/group/pkg/config/config.go
rename to extensions/groups/pkg/config/config.go
diff --git a/extensions/group/pkg/config/defaults/defaultconfig.go b/extensions/groups/pkg/config/defaults/defaultconfig.go
similarity index 97%
rename from extensions/group/pkg/config/defaults/defaultconfig.go
rename to extensions/groups/pkg/config/defaults/defaultconfig.go
index 6ac7e50a1..98ad82649 100644
--- a/extensions/group/pkg/config/defaults/defaultconfig.go
+++ b/extensions/groups/pkg/config/defaults/defaultconfig.go
@@ -3,7 +3,7 @@ package defaults
 import (
 	"path/filepath"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
 )
 
@@ -28,7 +28,7 @@ func DefaultConfig() *config.Config {
 			Protocol:  "tcp",
 		},
 		Service: config.Service{
-			Name: "group",
+			Name: "groups",
 		},
 		GroupMembersCacheExpiration: 5,
 		Reva: &config.Reva{
diff --git a/extensions/group/pkg/config/parser/parse.go b/extensions/groups/pkg/config/parser/parse.go
similarity index 88%
rename from extensions/group/pkg/config/parser/parse.go
rename to extensions/groups/pkg/config/parser/parse.go
index 999ee18ec..a55593fbb 100644
--- a/extensions/group/pkg/config/parser/parse.go
+++ b/extensions/groups/pkg/config/parser/parse.go
@@ -3,8 +3,8 @@ package parser
 import (
 	"errors"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config/defaults"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config/defaults"
 	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/shared"
 
diff --git a/extensions/group/pkg/config/reva.go b/extensions/groups/pkg/config/reva.go
similarity index 100%
rename from extensions/group/pkg/config/reva.go
rename to extensions/groups/pkg/config/reva.go
diff --git a/extensions/group/pkg/logging/logging.go b/extensions/groups/pkg/logging/logging.go
similarity index 85%
rename from extensions/group/pkg/logging/logging.go
rename to extensions/groups/pkg/logging/logging.go
index 634491bd7..8303ffbfa 100644
--- a/extensions/group/pkg/logging/logging.go
+++ b/extensions/groups/pkg/logging/logging.go
@@ -1,7 +1,7 @@
 package logging
 
 import (
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 )
 
diff --git a/extensions/group/pkg/revaconfig/config.go b/extensions/groups/pkg/revaconfig/config.go
similarity index 98%
rename from extensions/group/pkg/revaconfig/config.go
rename to extensions/groups/pkg/revaconfig/config.go
index d7dc200ba..4ccb98153 100644
--- a/extensions/group/pkg/revaconfig/config.go
+++ b/extensions/groups/pkg/revaconfig/config.go
@@ -1,7 +1,7 @@
 package revaconfig
 
 import (
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 )
 
 // GroupsConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.
diff --git a/extensions/group/pkg/server/debug/option.go b/extensions/groups/pkg/server/debug/option.go
similarity index 93%
rename from extensions/group/pkg/server/debug/option.go
rename to extensions/groups/pkg/server/debug/option.go
index a78c48b30..96aa7566a 100644
--- a/extensions/group/pkg/server/debug/option.go
+++ b/extensions/groups/pkg/server/debug/option.go
@@ -3,7 +3,7 @@ package debug
 import (
 	"context"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 )
 
diff --git a/extensions/user/pkg/server/debug/server.go b/extensions/groups/pkg/server/debug/server.go
similarity index 96%
rename from extensions/user/pkg/server/debug/server.go
rename to extensions/groups/pkg/server/debug/server.go
index 12bec6fb6..3c953f390 100644
--- a/extensions/user/pkg/server/debug/server.go
+++ b/extensions/groups/pkg/server/debug/server.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/service/debug"
 	"github.com/owncloud/ocis/v2/ocis-pkg/version"
 )
diff --git a/extensions/user/pkg/tracing/tracing.go b/extensions/groups/pkg/tracing/tracing.go
similarity index 87%
rename from extensions/user/pkg/tracing/tracing.go
rename to extensions/groups/pkg/tracing/tracing.go
index eac15c5dd..93f60b502 100644
--- a/extensions/user/pkg/tracing/tracing.go
+++ b/extensions/groups/pkg/tracing/tracing.go
@@ -1,7 +1,7 @@
 package tracing
 
 import (
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 	"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
 	"go.opentelemetry.io/otel/trace"
diff --git a/extensions/group/Makefile b/extensions/users/Makefile
similarity index 98%
rename from extensions/group/Makefile
rename to extensions/users/Makefile
index 4f446944e..1a5e7db4e 100644
--- a/extensions/group/Makefile
+++ b/extensions/users/Makefile
@@ -1,5 +1,5 @@
 SHELL := bash
-NAME := group
+NAME := users
 
 include ../../.make/recursion.mk
 
diff --git a/extensions/group/cmd/group/main.go b/extensions/users/cmd/user/main.go
similarity index 52%
rename from extensions/group/cmd/group/main.go
rename to extensions/users/cmd/user/main.go
index f01acb6fd..f0f1152dc 100644
--- a/extensions/group/cmd/group/main.go
+++ b/extensions/users/cmd/user/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/command"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config/defaults"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/command"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config/defaults"
 )
 
 func main() {
diff --git a/extensions/group/pkg/command/health.go b/extensions/users/pkg/command/health.go
similarity index 84%
rename from extensions/group/pkg/command/health.go
rename to extensions/users/pkg/command/health.go
index a4b5b822d..488565c1e 100644
--- a/extensions/group/pkg/command/health.go
+++ b/extensions/users/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config/parser"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/logging"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config/parser"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/logging"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/extensions/user/pkg/command/root.go b/extensions/users/pkg/command/root.go
similarity index 92%
rename from extensions/user/pkg/command/root.go
rename to extensions/users/pkg/command/root.go
index 3956add44..d88536de4 100644
--- a/extensions/user/pkg/command/root.go
+++ b/extensions/users/pkg/command/root.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"os"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
 	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/thejerf/suture/v4"
@@ -48,9 +48,9 @@ type SutureService struct {
 
 // NewSutureService creates a new user.SutureService
 func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.User.Commons = cfg.Commons
+	cfg.Users.Commons = cfg.Commons
 	return SutureService{
-		cfg: cfg.User,
+		cfg: cfg.Users,
 	}
 }
 
diff --git a/extensions/user/pkg/command/server.go b/extensions/users/pkg/command/server.go
similarity index 89%
rename from extensions/user/pkg/command/server.go
rename to extensions/users/pkg/command/server.go
index 032738a5f..30fba2c4e 100644
--- a/extensions/user/pkg/command/server.go
+++ b/extensions/users/pkg/command/server.go
@@ -9,12 +9,12 @@ import (
 	"github.com/cs3org/reva/v2/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config/parser"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/logging"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/revaconfig"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/server/debug"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/tracing"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config/parser"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/logging"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/revaconfig"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/server/debug"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/tracing"
 	"github.com/owncloud/ocis/v2/ocis-pkg/ldap"
 	"github.com/owncloud/ocis/v2/ocis-pkg/service/external"
 	"github.com/owncloud/ocis/v2/ocis-pkg/sync"
diff --git a/extensions/user/pkg/command/version.go b/extensions/users/pkg/command/version.go
similarity index 95%
rename from extensions/user/pkg/command/version.go
rename to extensions/users/pkg/command/version.go
index 954ab25b3..464159043 100644
--- a/extensions/user/pkg/command/version.go
+++ b/extensions/users/pkg/command/version.go
@@ -8,7 +8,7 @@ import (
 	"github.com/owncloud/ocis/v2/ocis-pkg/version"
 
 	tw "github.com/olekukonko/tablewriter"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/extensions/user/pkg/config/config.go b/extensions/users/pkg/config/config.go
similarity index 99%
rename from extensions/user/pkg/config/config.go
rename to extensions/users/pkg/config/config.go
index 55cb4c5d1..81f27896e 100644
--- a/extensions/user/pkg/config/config.go
+++ b/extensions/users/pkg/config/config.go
@@ -18,7 +18,7 @@ type Config struct {
 	TokenManager *TokenManager `yaml:"token_manager"`
 	Reva         *Reva         `yaml:"reva"`
 
-	SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"USER_SKIP_USER_GROUPS_IN_TOKEN"`
+	SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"USERS_SKIP_USER_GROUPS_IN_TOKEN"`
 
 	UsersCacheExpiration int     `yaml:"users_cache_expiration"`
 	Driver               string  `yaml:"driver"`
diff --git a/extensions/user/pkg/config/defaults/defaultconfig.go b/extensions/users/pkg/config/defaults/defaultconfig.go
similarity index 97%
rename from extensions/user/pkg/config/defaults/defaultconfig.go
rename to extensions/users/pkg/config/defaults/defaultconfig.go
index 0513df5a9..e3c55943b 100644
--- a/extensions/user/pkg/config/defaults/defaultconfig.go
+++ b/extensions/users/pkg/config/defaults/defaultconfig.go
@@ -3,7 +3,7 @@ package defaults
 import (
 	"path/filepath"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
 )
 
@@ -28,7 +28,7 @@ func DefaultConfig() *config.Config {
 			Protocol:  "tcp",
 		},
 		Service: config.Service{
-			Name: "user",
+			Name: "users",
 		},
 		UsersCacheExpiration: 5,
 		Reva: &config.Reva{
diff --git a/extensions/user/pkg/config/parser/parse.go b/extensions/users/pkg/config/parser/parse.go
similarity index 89%
rename from extensions/user/pkg/config/parser/parse.go
rename to extensions/users/pkg/config/parser/parse.go
index 6a78d37ba..f12fc1f97 100644
--- a/extensions/user/pkg/config/parser/parse.go
+++ b/extensions/users/pkg/config/parser/parse.go
@@ -3,8 +3,8 @@ package parser
 import (
 	"errors"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config/defaults"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config/defaults"
 	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/shared"
 
diff --git a/extensions/user/pkg/config/reva.go b/extensions/users/pkg/config/reva.go
similarity index 100%
rename from extensions/user/pkg/config/reva.go
rename to extensions/users/pkg/config/reva.go
diff --git a/extensions/user/pkg/logging/logging.go b/extensions/users/pkg/logging/logging.go
similarity index 85%
rename from extensions/user/pkg/logging/logging.go
rename to extensions/users/pkg/logging/logging.go
index 0726daa57..2fbc8a96c 100644
--- a/extensions/user/pkg/logging/logging.go
+++ b/extensions/users/pkg/logging/logging.go
@@ -1,7 +1,7 @@
 package logging
 
 import (
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 )
 
diff --git a/extensions/user/pkg/revaconfig/config.go b/extensions/users/pkg/revaconfig/config.go
similarity index 98%
rename from extensions/user/pkg/revaconfig/config.go
rename to extensions/users/pkg/revaconfig/config.go
index 7959ffeea..215e131d5 100644
--- a/extensions/user/pkg/revaconfig/config.go
+++ b/extensions/users/pkg/revaconfig/config.go
@@ -1,7 +1,7 @@
 package revaconfig
 
 import (
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 )
 
 // UsersConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.
diff --git a/extensions/user/pkg/server/debug/option.go b/extensions/users/pkg/server/debug/option.go
similarity index 93%
rename from extensions/user/pkg/server/debug/option.go
rename to extensions/users/pkg/server/debug/option.go
index 8b6c13c9e..7f59cbc36 100644
--- a/extensions/user/pkg/server/debug/option.go
+++ b/extensions/users/pkg/server/debug/option.go
@@ -3,7 +3,7 @@ package debug
 import (
 	"context"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 )
 
diff --git a/extensions/group/pkg/server/debug/server.go b/extensions/users/pkg/server/debug/server.go
similarity index 96%
rename from extensions/group/pkg/server/debug/server.go
rename to extensions/users/pkg/server/debug/server.go
index e283ca589..f624286de 100644
--- a/extensions/group/pkg/server/debug/server.go
+++ b/extensions/users/pkg/server/debug/server.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/service/debug"
 	"github.com/owncloud/ocis/v2/ocis-pkg/version"
 )
diff --git a/extensions/group/pkg/tracing/tracing.go b/extensions/users/pkg/tracing/tracing.go
similarity index 87%
rename from extensions/group/pkg/tracing/tracing.go
rename to extensions/users/pkg/tracing/tracing.go
index 228c9aadd..661aaff86 100644
--- a/extensions/group/pkg/tracing/tracing.go
+++ b/extensions/users/pkg/tracing/tracing.go
@@ -1,7 +1,7 @@
 package tracing
 
 import (
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 	"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
 	"go.opentelemetry.io/otel/trace"
diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go
index 4a055c112..ff3a4aaad 100644
--- a/ocis-pkg/config/config.go
+++ b/ocis-pkg/config/config.go
@@ -15,7 +15,7 @@ import (
 	glauth "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config"
 	graphExplorer "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config"
 	graph "github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
-	group "github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	groups "github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	idm "github.com/owncloud/ocis/v2/extensions/idm/pkg/config"
 	idp "github.com/owncloud/ocis/v2/extensions/idp/pkg/config"
 	nats "github.com/owncloud/ocis/v2/extensions/nats/pkg/config"
@@ -32,7 +32,7 @@ import (
 	storageusers "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config"
 	store "github.com/owncloud/ocis/v2/extensions/store/pkg/config"
 	thumbnails "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config"
-	user "github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	users "github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 	web "github.com/owncloud/ocis/v2/extensions/web/pkg/config"
 	webdav "github.com/owncloud/ocis/v2/extensions/webdav/pkg/config"
 )
@@ -86,7 +86,7 @@ type Config struct {
 	GLAuth            *glauth.Config        `yaml:"glauth"`
 	Graph             *graph.Config         `yaml:"graph"`
 	GraphExplorer     *graphExplorer.Config `yaml:"graph_explorer"`
-	Group             *group.Config         `yaml:"group"`
+	Groups            *groups.Config        `yaml:"groups"`
 	IDM               *idm.Config           `yaml:"idm"`
 	IDP               *idp.Config           `yaml:"idp"`
 	Nats              *nats.Config          `yaml:"nats"`
@@ -102,7 +102,7 @@ type Config struct {
 	StorageUsers      *storageusers.Config  `yaml:"storage_users"`
 	Store             *store.Config         `yaml:"store"`
 	Thumbnails        *thumbnails.Config    `yaml:"thumbnails"`
-	User              *user.Config          `yaml:"user"`
+	Users             *users.Config         `yaml:"users"`
 	Web               *web.Config           `yaml:"web"`
 	WebDAV            *webdav.Config        `yaml:"webdav"`
 	Search            *search.Config        `yaml:"search"`
diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go
index 665b5fdd3..6108b3a6b 100644
--- a/ocis-pkg/config/defaultconfig.go
+++ b/ocis-pkg/config/defaultconfig.go
@@ -13,7 +13,7 @@ import (
 	glauth "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config/defaults"
 	graphExplorer "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config/defaults"
 	graph "github.com/owncloud/ocis/v2/extensions/graph/pkg/config/defaults"
-	group "github.com/owncloud/ocis/v2/extensions/group/pkg/config/defaults"
+	groups "github.com/owncloud/ocis/v2/extensions/groups/pkg/config/defaults"
 	idm "github.com/owncloud/ocis/v2/extensions/idm/pkg/config/defaults"
 	idp "github.com/owncloud/ocis/v2/extensions/idp/pkg/config/defaults"
 	nats "github.com/owncloud/ocis/v2/extensions/nats/pkg/config/defaults"
@@ -30,7 +30,7 @@ import (
 	storageusers "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config/defaults"
 	store "github.com/owncloud/ocis/v2/extensions/store/pkg/config/defaults"
 	thumbnails "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config/defaults"
-	user "github.com/owncloud/ocis/v2/extensions/user/pkg/config/defaults"
+	users "github.com/owncloud/ocis/v2/extensions/users/pkg/config/defaults"
 	web "github.com/owncloud/ocis/v2/extensions/web/pkg/config/defaults"
 	webdav "github.com/owncloud/ocis/v2/extensions/webdav/pkg/config/defaults"
 )
@@ -54,7 +54,7 @@ func DefaultConfig() *Config {
 		GLAuth:            glauth.DefaultConfig(),
 		Graph:             graph.DefaultConfig(),
 		GraphExplorer:     graphExplorer.DefaultConfig(),
-		Group:             group.DefaultConfig(),
+		Groups:            groups.DefaultConfig(),
 		IDM:               idm.DefaultConfig(),
 		IDP:               idp.DefaultConfig(),
 		Nats:              nats.DefaultConfig(),
@@ -71,7 +71,7 @@ func DefaultConfig() *Config {
 		StorageUsers:      storageusers.DefaultConfig(),
 		Store:             store.DefaultConfig(),
 		Thumbnails:        thumbnails.DefaultConfig(),
-		User:              user.DefaultConfig(),
+		Users:             users.DefaultConfig(),
 		Web:               web.DefaultConfig(),
 		WebDAV:            webdav.DefaultConfig(),
 	}
diff --git a/ocis/pkg/command/group.go b/ocis/pkg/command/groups.go
similarity index 52%
rename from ocis/pkg/command/group.go
rename to ocis/pkg/command/groups.go
index b67ed713c..37ddaaeaf 100644
--- a/ocis/pkg/command/group.go
+++ b/ocis/pkg/command/groups.go
@@ -3,31 +3,31 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/command"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
 )
 
-// GroupCommand is the entrypoint for the Group command.
-func GroupCommand(cfg *config.Config) *cli.Command {
+// GroupsCommand is the entrypoint for the groups command.
+func GroupsCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
-		Name:     cfg.Group.Service.Name,
-		Usage:    subcommandDescription(cfg.Group.Service.Name),
+		Name:     cfg.Groups.Service.Name,
+		Usage:    subcommandDescription(cfg.Groups.Service.Name),
 		Category: "extensions",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
 				return err
 			}
-			cfg.Group.Commons = cfg.Commons
+			cfg.Groups.Commons = cfg.Commons
 			return nil
 		},
-		Subcommands: command.GetCommands(cfg.Group),
+		Subcommands: command.GetCommands(cfg.Groups),
 	}
 }
 
 func init() {
-	register.AddCommand(GroupCommand)
+	register.AddCommand(GroupsCommand)
 }
diff --git a/ocis/pkg/command/user.go b/ocis/pkg/command/users.go
similarity index 53%
rename from ocis/pkg/command/user.go
rename to ocis/pkg/command/users.go
index eb218f5bd..3c8b15ee5 100644
--- a/ocis/pkg/command/user.go
+++ b/ocis/pkg/command/users.go
@@ -3,31 +3,31 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/command"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
 	"github.com/urfave/cli/v2"
 )
 
-// UserCommand is the entrypoint for the User command.
-func UserCommand(cfg *config.Config) *cli.Command {
+// UsersCommand is the entrypoint for the users command.
+func UsersCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
-		Name:     cfg.User.Service.Name,
-		Usage:    subcommandDescription(cfg.User.Service.Name),
+		Name:     cfg.Users.Service.Name,
+		Usage:    subcommandDescription(cfg.Users.Service.Name),
 		Category: "extensions",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
 				return err
 			}
-			cfg.User.Commons = cfg.Commons
+			cfg.Users.Commons = cfg.Commons
 			return nil
 		},
-		Subcommands: command.GetCommands(cfg.User),
+		Subcommands: command.GetCommands(cfg.Users),
 	}
 }
 
 func init() {
-	register.AddCommand(UserCommand)
+	register.AddCommand(UsersCommand)
 }
diff --git a/ocis/pkg/init/init.go b/ocis/pkg/init/init.go
index af5ed2dc4..3ccd8768b 100644
--- a/ocis/pkg/init/init.go
+++ b/ocis/pkg/init/init.go
@@ -70,7 +70,7 @@ type AuthbearerExtension struct {
 	AuthProviders AuthProviderSettings `yaml:"auth_providers"`
 }
 
-type UserAndGroupExtension struct {
+type UsersAndGroupsExtension struct {
 	Drivers LdapBasedExtension
 }
 
@@ -109,8 +109,8 @@ type OcisConfig struct {
 	Frontend          FrontendExtension
 	AuthBasic         AuthbasicExtension  `yaml:"auth_basic"`
 	AuthBearer        AuthbearerExtension `yaml:"auth_bearer"`
-	User              UserAndGroupExtension
-	Group             UserAndGroupExtension
+	Users             UsersAndGroupsExtension
+	Groups            UsersAndGroupsExtension
 	StorageSystem     DataProviderInsecureSettings `yaml:"storage_system"`
 	StorageUsers      DataProviderInsecureSettings `yaml:"storage_users"`
 	Ocdav             InsecureExtension
@@ -232,14 +232,14 @@ func CreateConfig(insecure, forceOverwrite bool, configPath, adminPassword strin
 				},
 			},
 		},
-		Group: UserAndGroupExtension{
+		Groups: UsersAndGroupsExtension{
 			Drivers: LdapBasedExtension{
 				Ldap: LdapSettings{
 					Bind_password: revaServicePassword,
 				},
 			},
 		},
-		User: UserAndGroupExtension{
+		Users: UsersAndGroupsExtension{
 			Drivers: LdapBasedExtension{
 				Ldap: LdapSettings{
 					Bind_password: revaServicePassword,
diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go
index aed84df2f..4d5b30c61 100644
--- a/ocis/pkg/runtime/service/service.go
+++ b/ocis/pkg/runtime/service/service.go
@@ -30,7 +30,7 @@ import (
 	glauth "github.com/owncloud/ocis/v2/extensions/glauth/pkg/command"
 	graphExplorer "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/command"
 	graph "github.com/owncloud/ocis/v2/extensions/graph/pkg/command"
-	group "github.com/owncloud/ocis/v2/extensions/group/pkg/command"
+	groups "github.com/owncloud/ocis/v2/extensions/groups/pkg/command"
 	idm "github.com/owncloud/ocis/v2/extensions/idm/pkg/command"
 	idp "github.com/owncloud/ocis/v2/extensions/idp/pkg/command"
 	nats "github.com/owncloud/ocis/v2/extensions/nats/pkg/command"
@@ -47,7 +47,7 @@ import (
 	storageusers "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/command"
 	store "github.com/owncloud/ocis/v2/extensions/store/pkg/command"
 	thumbnails "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/command"
-	user "github.com/owncloud/ocis/v2/extensions/user/pkg/command"
+	users "github.com/owncloud/ocis/v2/extensions/users/pkg/command"
 	web "github.com/owncloud/ocis/v2/extensions/web/pkg/command"
 	webdav "github.com/owncloud/ocis/v2/extensions/webdav/pkg/command"
 	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
@@ -124,8 +124,8 @@ func NewService(options ...Option) (*Service, error) {
 	s.ServicesRegistry[opts.Config.OCDav.Service.Name] = ocdav.NewSutureService
 	s.ServicesRegistry[opts.Config.Gateway.Service.Name] = gateway.NewSutureService
 	s.ServicesRegistry[opts.Config.AppRegistry.Service.Name] = appRegistry.NewSutureService
-	s.ServicesRegistry[opts.Config.User.Service.Name] = user.NewSutureService
-	s.ServicesRegistry[opts.Config.Group.Service.Name] = group.NewSutureService
+	s.ServicesRegistry[opts.Config.Users.Service.Name] = users.NewSutureService
+	s.ServicesRegistry[opts.Config.Groups.Service.Name] = groups.NewSutureService
 	s.ServicesRegistry[opts.Config.AuthBasic.Service.Name] = authbasic.NewSutureService
 	s.ServicesRegistry[opts.Config.AuthBearer.Service.Name] = authbearer.NewSutureService
 	s.ServicesRegistry[opts.Config.AuthMachine.Service.Name] = authmachine.NewSutureService