Update group names
diff --git a/groups b/groups
index 3e2af37..68d48fc 100644
--- a/groups
+++ b/groups
@@ -1,8 +1,7 @@
 # UUID                                  	Group Name
 #
-e6c7d43acfb1f19237de5b3a49807b7ee01e4073	trusted-firmware-a-next
-user:sandrine-bailleux-arm              	user/Sandrine Afsa (sandrine-bailleux-arm)
 3e2ea69d61ca1d8aec6b813951463433f507243e	trusted-firmware-a-next-approvers
-e6c7d43acfb1f19237de5b3a49807b7ee01e4073	trusted-firmware-a-next
 4db8267426bbc5d487c8dbdcf58a1c50202b1c92	trusted-firmware-a-arm-approvers
 7c05eb1a9b6d175b7b553af378f380423ff922e4	Bot Users
+e6c7d43acfb1f19237de5b3a49807b7ee01e4073	trusted-firmware-a-next
+user:sandrine-bailleux-arm              	user/Sandrine Afsa Bailleux (sandrine-bailleux-arm)
diff --git a/project.config b/project.config
index 317ea8f..775c693 100644
--- a/project.config
+++ b/project.config
@@ -18,7 +18,7 @@
 # Git refs
 ################################################################################
 [access "refs/*"]
-	owner = group user/Sandrine Afsa (sandrine-bailleux-arm)
+	owner = group user/Sandrine Afsa Bailleux (sandrine-bailleux-arm)
 	# Restrict visibility to a subset of developers.
 	read = group trusted-firmware-a-next
 	exclusiveGroupPermissions = read
@@ -59,31 +59,35 @@
 ################################################################################
 [label "Code-Owner-Review"]
 	value = -1 I would prefer this is not merged as is
-	value =  0 No score
+	value = 0 No score
 	value = +1 Looks good to me
 	defaultValue = 0
 	copyCondition = changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
+	function = MaxWithBlock
 
 [label "Unsafe-Review"]
 	value = -1 I would prefer this is not merged as is
-	value =  0 No score
+	value = 0 No score
 	value = +1 Looks good to me
 	defaultValue = 0
 	copyCondition = changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
+	function = MaxWithBlock
 
 [label "Maintainer-Review"]
 	value = -1 I would prefer this is not merged as is
-	value =  0 No score
+	value = 0 No score
 	value = +1 Looks good to me
 	defaultValue = 0
 	copyCondition = changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
+	function = MaxWithBlock
 
 [label "Verified"]
 	value = -1 Fails
-	value =  0 No score
+	value = 0 No score
 	value = +1 Verified
 	defaultValue = 0
 	copyCondition = changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
+	function = MaxWithBlock
 
 [submit-requirement "Submittable"]
 	applicableIf = -branch:refs/meta/config