diff --git a/groups b/groups
index 30b98cb..6356e53 100644
--- a/groups
+++ b/groups
@@ -2,7 +2,7 @@
 #
 430436d2427c7705450b24d5ca5f99bff4dbb864	Internal
 5ce590f08a91e6117a430279c7d5e1490b276966	Reviewers
-5e163dd47a45d5e206b4fb62bfdde6a429ba7701	Non-Interactive Users
+5e163dd47a45d5e206b4fb62bfdde6a429ba7701	Service Users
 6ebf433b66a39e9bf69516c2f8169a06d3f3e7de	Administrators
 global:Anonymous-Users                  	Anonymous Users
 global:Project-Owners                   	Project Owners
diff --git a/project.config b/project.config
index 3ca050c..2a5f49b 100644
--- a/project.config
+++ b/project.config
@@ -71,7 +71,7 @@
 	addPatchSet = group Registered Users
 [capability]
 	administrateServer = 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
 	viewCaches = group Administrators