diff --git a/.mailmap b/.mailmap
index 974e2d2424e644..26c3f55577ce65 100644
--- a/.mailmap
+++ b/.mailmap
@@ -89,6 +89,8 @@ Charles <ineedpracticing@gmail.com> <cydjudge@users.noreply.github.com>
 Charles Rudolph <charles.rudolph@originate.com>
 Chen Gang <gangc.cxy@foxmail.com>
 Chen Gang <gangc.cxy@foxmail.com> <13298548+MoonBall@users.noreply.github.com>
+Chengzhong Wu <legendecas@gmail.com>
+Chengzhong Wu <legendecas@gmail.com> <chengzhong.wcz@alibaba-inc.com>
 Chew Choon Keat <choonkeat@gmail.com>
 Chris Andrews <cpandrews8@gmail.com>
 Chris Johnson <chris.s.johnson4@gmail.com>
@@ -221,7 +223,7 @@ James Hartig <fastest963@gmail.com> <james.hartig@grooveshark.com>
 James Ide <ide@jameside.com> <ide@expo.io>
 James M Snell <jasnell@gmail.com>
 James Nimlos <james@nimlos.com>
-James Sumners <james@sumners.email> <james.sumners@gmail.com> 
+James Sumners <james@sumners.email> <james.sumners@gmail.com>
 Jan Krems <jan.krems@gmail.com> <jan.krems@groupon.com>
 Jem Bezooyen <github@jem.dev> <jem@hipmedia.ca>
 Jem Bezooyen <github@jem.dev> <jem@sendwithus.com>
@@ -239,7 +241,7 @@ Jesús Leganés-Combarro 'piranna <piranna@gmail.com>
 Jimb Esser <wasteland@gmail.com> <jimb@railgun3d.com>
 Jithil P Ponnan <jithil@outlook.com>
 Jithil P Ponnan <jithil@outlook.com> <MrJithil@users.noreply.github.com>
-Jochen Eisinger <jochen@chromium.org> 
+Jochen Eisinger <jochen@chromium.org>
 Joe Shaw <joe@joeshaw.org> <joeshaw@litl.com>
 Johan Bergström <bugs@bergstroem.nu>
 Johan Dahlberg <jfd@distrop.com> <dahlberg.johan@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 185e540e26a6ee..91c110a0f13161 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2315,7 +2315,7 @@ Yongsheng Zhang <zyszys98@gmail.com>
 Neeraj Laad <neeraj.laad@uk.ibm.com>
 Scott Van Gilder <svangilder@gmail.com>
 Yaniv Friedensohn <yaniv.friedensohn@gmail.com>
-Lucas Woo <legendecas@gmail.com>
+Chengzhong Wu <legendecas@gmail.com>
 Troels Liebe Bentsen <troels@connectedcars.dk>
 pranshuchittora <pranshuchittora17@gmail.com>
 lakamsani <lakamsani@gmail.com>
@@ -3260,7 +3260,6 @@ Siddharth <siddharth.muscat@gmail.com>
 Cactysman <git@cactys.dev>
 David Brownman <beamneocube@gmail.com>
 Michael Rommel <rommel@layer-7.net>
-Chengzhong Wu <chengzhong.wcz@alibaba-inc.com>
 Andres <and.atencio@gmail.com>
 Jayden Seric <me@jaydenseric.com>
 divlo <contact@divlo.fr>