diff --git a/groups b/groups
index faf43fe..c149e65 100644
--- a/groups
+++ b/groups
@@ -1,8 +1,8 @@
 # UUID                                  	Group Name
 #
+04eec2cab7bdccc1c2170f48562f5366c7ddee71	ON.Lab ONOS Developers
 3d9cb6ba9b28b81863c5ac82dba1268dee3fa7bf	Administrators
+8105bff62d6c3fe856dc8820947293d9a3d5a2a6	External ONOS Developers
 a6e3134e08eb39ad331956432902676456c592a6	Event Streaming Users
-bd988dea76fab6597c708797c1b888b354a0930f	External Developer
 e0bc180b4e2c094e414c0f6b3b20edd3f5050ec8	Non-Interactive Users
-f3702f880462a010a9215ddb25c3fb06fd59c634	ON.Lab Developer
 global:Project-Owners                   	Project Owners
diff --git a/project.config b/project.config
index c5363f5..6801433 100644
--- a/project.config
+++ b/project.config
@@ -12,28 +12,28 @@
 	streamEvents = group Event Streaming Users
 [access "refs/*"]
 	read = group Administrators
-	read = group External Developer
+	read = group External ONOS Developers
 	read = group Non-Interactive Users
-	read = group ON.Lab Developer
+	read = group ON.Lab ONOS Developers
 [access "refs/for/refs/*"]
-	push = group External Developer
-	push = group ON.Lab Developer
-	pushMerge = group External Developer
-	pushMerge = group ON.Lab Developer
+	push = group External ONOS Developers
+	push = group ON.Lab ONOS Developers
+	pushMerge = group External ONOS Developers
+	pushMerge = group ON.Lab ONOS Developers
 [access "refs/heads/*"]
 	create = group Administrators
 	create = group Project Owners
-	forgeAuthor = group External Developer
-	forgeAuthor = group ON.Lab Developer
+	forgeAuthor = group External ONOS Developers
+	forgeAuthor = group ON.Lab ONOS Developers
 	forgeCommitter = group Administrators
 	forgeCommitter = group Project Owners
 	push = group Administrators
 	push = group Project Owners
 	label-Code-Review = -2..+2 group Administrators
 	label-Code-Review = -2..+2 group Project Owners
-	label-Code-Review = -1..+1 group External Developer
+	label-Code-Review = -1..+1 group External ONOS Developers
 	label-Code-Review = -1..+1 group Non-Interactive Users
-	label-Code-Review = -1..+1 group ON.Lab Developer
+	label-Code-Review = -1..+1 group ON.Lab ONOS Developers
 	submit = group Administrators
 	submit = group Project Owners
 	editTopicName = +force group Administrators