Update group names
diff --git a/groups b/groups
index 7784b6d..100bcf4 100644
--- a/groups
+++ b/groups
@@ -1,7 +1,7 @@
 # UUID                                  	Group Name
 #
 147b3de9543270b1b23526883b1bf91ec5ad42a0	Administrators
-2711f8677a316d19c7f15f30bcf25c2ffb706ead	Non-Interactive Users
+2711f8677a316d19c7f15f30bcf25c2ffb706ead	Service Users
 b588ccf0327cd98b42a4ac07213796de29f6205b	sysmocom branch access
 efb7efcf88b93f6d088d65a0194aee75e20381fd	Tag Delete/Overwrite
 f3f46fd3a6951dd36adfab6c1a6ebfced2d45e78	known users
diff --git a/project.config b/project.config
index 5d69947..3ac29cc 100644
--- a/project.config
+++ b/project.config
@@ -12,7 +12,7 @@
 [access "refs/*"]
 	read = group Administrators
 	read = group Anonymous Users
-	read = group Non-Interactive Users
+	read = group Service Users
 	push = group Administrators
 	revert = group Registered Users
 [access "refs/for/refs/*"]
@@ -34,7 +34,7 @@
 	label-Code-Review = -2..+2 group Project Owners
 	label-Code-Review = -2..+2 group Reviewers
 	label-Code-Review = -2..+2 group known users
-	label-Code-Review = -1..+1 group Non-Interactive Users
+	label-Code-Review = -1..+1 group Service Users
 	submit = group Administrators
 	submit = group Project Owners
 	submit = group Reviewers
@@ -43,7 +43,7 @@
 	editTopicName = +force group Project Owners
 	editTopicName = group known users
 	label-Verified = -1..+1 group Administrators
-	label-Verified = -1..+1 group Non-Interactive Users
+	label-Verified = -1..+1 group Service Users
 	label-Verified = -1..+1 group Project Owners
 	label-Verified = -1..+1 group known users
 [access "refs/meta/config"]
@@ -117,7 +117,7 @@
 [capability]
 	accessDatabase = group Administrators
 	administrateServer = group Administrators
-	priority = batch group Non-Interactive Users
-	streamEvents = group Non-Interactive Users
+	priority = batch group Service Users
+	streamEvents = group Service Users
 [notify "team"]
 	email = gerrit-log@lists.osmocom.org