diff --git a/groups b/groups
index b6e0b29..48e05f8 100644
--- a/groups
+++ b/groups
@@ -2,7 +2,7 @@
 #
 2a10ec5934b3fecac3781fe7d5dedc172e21d459	GitHub Replication - OpenCord
 4f1094b130e3b9ae69e9d6ed6cef8707ee29efa1	OverrideVerify
-4f32b523380e68c8595bdf27a006c697ea17bade	Non-Interactive Users
+4f32b523380e68c8595bdf27a006c697ea17bade	Service Users
 61317511a4a11254cbbf9612896412663548965a	Administrators
 8b721006a49a00b0ba867e60d08dd5b13f1739a6	GitHub Replication - XOS-Project
 ea0401fd666860cbc94b2132ff9d30a0e10d60e9	GitHub Replication - Open-Cloud
diff --git a/project.config b/project.config
index b106119..3d75006 100644
--- a/project.config
+++ b/project.config
@@ -16,7 +16,7 @@
 	read = deny group GitHub Replication - XOS-Project
 	read = group Administrators
 	read = group Anonymous Users
-	read = group Non-Interactive Users
+	read = group Service Users
 	read = group Registered Users
 	viewDrafts = group user/Cloud Lab (cloudlab)
 	deleteDrafts = block group Read-only Users
@@ -35,7 +35,7 @@
 	submit = group Administrators
 	submit = 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 OverrideVerify
 [access "refs/meta/config"]
 	exclusiveGroupPermissions = read
@@ -52,12 +52,12 @@
 	create = group Project Owners
 [access "refs/tags/*"]
 	createTag = group Administrators
-	createTag = group Non-Interactive Users
+	createTag = group Service Users
 	createTag = group Project Owners
 	createSignedTag = group Administrators
-	createSignedTag = group Non-Interactive Users
+	createSignedTag = group Service Users
 	createSignedTag = group Project Owners
-	create = group Non-Interactive Users
+	create = group Service Users
 [label "Code-Review"]
 	function = MaxWithBlock
 	defaultValue = 0
@@ -92,8 +92,8 @@
 	accessDatabase = group user/Hung-Wei Chiu (hungwei)
 	administrateServer = group Administrators
 	modifyAccount = group Administrators
-	priority = batch group Non-Interactive Users
-	streamEvents = group Non-Interactive Users
+	priority = batch group Service Users
+	streamEvents = group Service Users
 	viewAllAccounts = group Administrators
 [plugin "reviewers-by-blame"]
 	ignoreDrafts = true