diff --git a/groups b/groups
index 8d88d4d..9fee20a 100644
--- a/groups
+++ b/groups
@@ -2,7 +2,7 @@
 #
 00be9a32fee39a950622104b18e8f2e496e59d98	Event Streaming Users
 2801fa2e0515dd3f9d2819e4f66d490af2c1b5d3	Administrators
-988788adbfd283215fb06f9674c424ad35917942	Non-Interactive Users
+988788adbfd283215fb06f9674c424ad35917942	Service Users
 c29a3613218ad1e64b0f3acf16193621100a08a4	NDN folks
 global:Anonymous-Users                  	Anonymous Users
 global:Project-Owners                   	Project Owners
diff --git a/project.config b/project.config
index 45e64ba..295aa02 100644
--- a/project.config
+++ b/project.config
@@ -10,7 +10,7 @@
 [access "refs/*"]
 	read = group Administrators
 	read = group Anonymous Users
-	read = group Non-Interactive Users
+	read = group Service Users
 	revert = group Registered Users
 [access "refs/for/refs/*"]
 	push = group Registered Users
@@ -23,7 +23,7 @@
 	forgeCommitter = group Project Owners
 	push = +force group Administrators
 	label-Code-Review = -2..+2 group Administrators
-	label-Code-Review = -2..+2 group Non-Interactive Users
+	label-Code-Review = -2..+2 group Service Users
 	label-Code-Review = -2..+2 group Project Owners
 	label-Code-Review = -1..+1 group Registered Users
 	submit = group Administrators
@@ -31,10 +31,10 @@
 	editTopicName = +force group Administrators
 	editTopicName = +force group Project Owners
 	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-Code-Style = -1..+1 group Administrators
-	label-Code-Style = -1..+1 group Non-Interactive Users
+	label-Code-Style = -1..+1 group Service Users
 	label-Code-Style = -1..+1 group Project Owners
 [access "refs/meta/config"]
 	exclusiveGroupPermissions = read