diff --git a/.mailmap b/.mailmap
index 7cf13e67174..2439fd362ad 100644
--- a/.mailmap
+++ b/.mailmap
@@ -25,6 +25,8 @@ Dimitrie O. Paun <dimi@bigfoot.com>
 Dimitrie O. Paun <dimi@lattica.com>
 EA Durbin <eadurbin@freebsd.org>
 Eduardo García <eduardo.garcia@gmx.com>
+Elizabeth Figura <z.figura12@gmail.com>
+Elizabeth Figura <zfigura@codeweavers.com>
 Erich Hoover <erich.e.hoover@gmail.com>
 Erich Hoover <erich.e.hoover@wine-staging.com>
 Erwin Wolff <erwinwolffnl@microformatica.com>
@@ -156,7 +158,6 @@ William Poetra Yoga Hadisoesen <williampoetra@yahoo.com>
 Won Kyu Park <wkpark@kldp.org>
 Yuri Kozlov <yuriy.kozlov@gmail.com>
 Zachary Brown <zac@zacbrown.org>
-Zebediah Figura <zfigura@codeweavers.com>
 Zoltan Nagy <nagyzoli@drotposta.hu>
 unidentified <9700584@cs.stadia.fi>
 unidentified <develop@stueben.com>
diff --git a/AUTHORS b/AUTHORS
index da301ba9d1a..117940d75ce 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -490,6 +490,7 @@ Ekaterine Papava
 Elias Benali
 Elias Ross
 Elie Morisse
+Elizabeth Figura
 Emilio Cobos Álvarez
 Emmanuel Maillard
 Enol Puente
@@ -1896,7 +1897,6 @@ Zachary Brown
 Zach Goldberg
 Zach Gorman
 Zach Smith
-Zebediah Figura
 Zhangrong Huang
 Zhang Shuai
 Zhan Jianyu
diff --git a/MAINTAINERS b/MAINTAINERS
index 34c2acdd56b..22979d93ea1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -66,7 +66,7 @@ P:	Henri Verbeet <hverbeet@codeweavers.com>
 F:	dlls/d2d*/
 
 Direct3D
-M:	Zebediah Figura <z.figura12@gmail.com>
+M:	Elizabeth Figura <zfigura@codeweavers.com>
 M:	Jan Sikorski <jsikorski@codeweavers.com>
 P:	Henri Verbeet <hverbeet@codeweavers.com>
 P:	Stefan Dösinger <stefan@codeweavers.com>
@@ -106,7 +106,7 @@ F:	dlls/dpnet/
 F:	dlls/dpwsockx/
 
 DirectShow
-M:	Zebediah Figura <z.figura12@gmail.com>
+M:	Elizabeth Figura <zfigura@codeweavers.com>
 P:	Rémi Bernon <rbernon@codeweavers.com>
 F:	dlls/amstream/
 F:	dlls/devenum/
@@ -159,7 +159,7 @@ M:	Marcus Meissner <marcus@jet.franken.de>
 F:	dlls/gphoto2.ds/
 
 GStreamer multimedia backend
-M:	Zebediah Figura <z.figura12@gmail.com>
+M:	Elizabeth Figura <zfigura@codeweavers.com>
 P:	Rémi Bernon <rbernon@codeweavers.com>
 F:	dlls/winegstreamer/
 
@@ -173,7 +173,7 @@ F:	dlls/mouhid.sys/
 F:	dlls/winehid.sys/
 
 HTTP server
-M:	Zebediah Figura <z.figura12@gmail.com>
+M:	Elizabeth Figura <zfigura@codeweavers.com>
 F:	dlls/httpapi/
 F:	dlls/http.sys/
 
@@ -214,7 +214,7 @@ F:	dlls/msacm32/
 Media Foundation GStreamer backend
 M:	Rémi Bernon <rbernon@codeweavers.com>
 P:	Nikolay Sivov <nsivov@codeweavers.com>
-P:	Zebediah Figura <z.figura12@gmail.com>
+P:	Elizabeth Figura <zfigura@codeweavers.com>
 F:	dlls/mf/tests/transform.c
 F:	dlls/winegstreamer/aac_decoder.c
 F:	dlls/winegstreamer/color_convert.c
@@ -238,7 +238,7 @@ F:	dlls/vcruntime140_1/
 
 MSI installers
 M:	Hans Leidekker <hans@codeweavers.com>
-P:	Zebediah Figura <z.figura12@gmail.com>
+P:	Elizabeth Figura <zfigura@codeweavers.com>
 F:	dlls/msi/
 
 Netstat
@@ -288,7 +288,7 @@ P:	Huw Davies <huw@codeweavers.com>
 F:	dlls/oleaut32/typelib.c
 
 Plug and Play
-P:	Zebediah Figura <z.figura12@gmail.com>
+P:	Elizabeth Figura <zfigura@codeweavers.com>
 F:	dlls/newdev/
 F:	dlls/ntoskrnl.exe/pnp.c
 F:	dlls/setupapi/devinst.c
@@ -310,7 +310,7 @@ F:	dlls/riched20/
 
 RPC Runtime
 P:	Huw Davies <huw@codeweavers.com>
-P:	Zebediah Figura <z.figura12@gmail.com>
+P:	Elizabeth Figura <zfigura@codeweavers.com>
 F:	dlls/rpcrt4/
 
 Theming
@@ -349,7 +349,7 @@ F:	dlls/shdocvw/
 WIDL
 P:	Huw Davies <huw@codeweavers.com>
 P:	Rémi Bernon <rbernon@codeweavers.com>
-P:	Zebediah Figura <z.figura12@gmail.com>
+P:	Elizabeth Figura <zfigura@codeweavers.com>
 F:	tools/widl/
 
 Windows Imaging Component
@@ -365,7 +365,7 @@ F:	dlls/wbemprox/
 F:	dlls/wmiutils/
 
 Windows Media Format
-M:	Zebediah Figura <z.figura12@gmail.com>
+M:	Elizabeth Figura <zfigura@codeweavers.com>
 P:	Rémi Bernon <rbernon@codeweavers.com>
 F:	dlls/wmp/
 F:	dlls/wmvcore/
@@ -431,7 +431,7 @@ W:	https://wiki.winehq.org/StableRules
 
 Staging Branch
 M:	Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-P:	Zebediah Figura <z.figura12@gmail.com>
+P:	Elizabeth Figura <zfigura@codeweavers.com>
 P:	Paul Gofman <gofmanp@gmail.com>
 P:	Erich E. Hoover <erich.e.hoover@wine-staging.com>
 W:	https://wine-staging.com/