diff --git a/groups b/groups
index 5cb19fc31..9b9135d3d 100644
--- a/groups
+++ b/groups
@@ -3,4 +3,4 @@
 db95ce11b379445ac8c5806ea0b61195555b338d	flashrom developers
 user:Nico                               	user/Nico Huber (Nico)
 user:dhendrix                           	user/David Hendricks (dhendrix)
-user:stefanct                           	user/Stefan Tauner (stefanct)
+user:stefanct                           	user/Stefan T (stefanct)
diff --git a/project.config b/project.config
index 43c3744d1..bbd9ff988 100644
--- a/project.config
+++ b/project.config
@@ -29,24 +29,24 @@
 [access "refs/*"]
 	label-Verified = -1..+1 group user/David Hendricks (dhendrix)
 	label-Verified = -1..+1 group user/Nico Huber (Nico)
-	label-Verified = -1..+1 group user/Stefan Tauner (stefanct)
+	label-Verified = -1..+1 group user/Stefan T (stefanct)
 	submit = group user/David Hendricks (dhendrix)
 	submit = group user/Nico Huber (Nico)
-	submit = group user/Stefan Tauner (stefanct)
+	submit = group user/Stefan T (stefanct)
 	label-Code-Review = -2..+2 group user/David Hendricks (dhendrix)
 	label-Code-Review = -2..+2 group user/Nico Huber (Nico)
-	label-Code-Review = -2..+2 group user/Stefan Tauner (stefanct)
+	label-Code-Review = -2..+2 group user/Stefan T (stefanct)
 	owner = group user/David Hendricks (dhendrix)
 	owner = group user/Nico Huber (Nico)
-	owner = group user/Stefan Tauner (stefanct)
+	owner = group user/Stefan T (stefanct)
 [access "refs/heads/*"]
 	exclusiveGroupPermissions = create delete submit
 	create = group user/David Hendricks (dhendrix)
 	create = group user/Nico Huber (Nico)
-	create = group user/Stefan Tauner (stefanct)
+	create = group user/Stefan T (stefanct)
 	delete = group user/David Hendricks (dhendrix)
 	delete = group user/Nico Huber (Nico)
-	delete = group user/Stefan Tauner (stefanct)
+	delete = group user/Stefan T (stefanct)
 	submit = group flashrom developers
 [access "refs/for/refs/heads/stable"]
 	exclusiveGroupPermissions = push