diff --git a/.mailmap b/.mailmap
index def2f4cfe9..d8ec4f8f51 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,44 +1,44 @@
-Adrian Spinei <aspinei@users.sourceforge.net> aspinei
+Adrian Spinei <aspinei@users.sourceforge.net>
 Alexander Ishmuradov <ishmuradov@gmail.com>
-Allan Brazute <ethraza@gmail.com> EthraZa
-André Eisenbach <int2str@users.sourceforge.net> int2str
-Bastian Pfenningschmidt <bpfennigschmidt@users.sourceforge.net> bpfennigschmidt
-Carlos Proensa <proensa@gmail.com> Carlos
-Cas Nuy <cas@nuy.info> CasN
+Allan Brazute <ethraza@gmail.com>
+André Eisenbach <int2str@users.sourceforge.net>
+Bastian Pfenningschmidt <bpfennigschmidt@users.sourceforge.net>
+Carlos Proensa <proensa@gmail.com>
+Cas Nuy <cas@nuy.info>
 Damien Regad <dregad@mantisbt.org> <dr_mantis@regad.org>
 Damien Regad <dregad@mantisbt.org> <damien.regad@merckgroup.com>
 Damien Regad <dregad@mantisbt.org> <damien.regad@merckserono.net>
 David Hicks <d@hx.id.au> <hickseydr@optusnet.com.au>
-David Newcomb <davidnewcomb@users.sourceforge.net> davidnewcomb
+David Newcomb <davidnewcomb@users.sourceforge.net>
 dependabot[bot] <support@dependabot.com> <dependabot[bot]@users.noreply.github.com>
 dependabot[bot] <support@dependabot.com> <27856297+dependabot-preview[bot]@users.noreply.github.com>
 dependabot[bot] <support@dependabot.com> <49699333+dependabot[bot]@users.noreply.github.com>
-Dmitriy V Kuranov <dkuranov@beeline.ru> DKuranov
+Dmitriy V Kuranov <dkuranov@beeline.ru>
 Frank Rodgers <frodgers@redcom.com> <frodgers@iowa.redcom.com>
-Gatis Ozols <ozols.gatis@gmail.com> gatis-ozols
-Grigoriy Ermolaev <igflocal@gmail.com> grigoriy
+Gatis Ozols <ozols.gatis@gmail.com>
+Grigoriy Ermolaev <igflocal@gmail.com>
 jeckyhl <jeckyhl@sourceforge.net> jeckyll <jeckyll@mantisbt.org>
-Jim Hanley <dgtlrift@users.sourceforge.net> dgtlrift
+Jim Hanley <dgtlrift@users.sourceforge.net>
 Johan Guilbaud <git@lapinkiller.fr>
 Johan Guilbaud <git@lapinkiller.fr> Lapinkiller <lapinkiller@hotmail.fr>
 John Reese <john@noswap.com> <jreese@leetcode.net>
 Kornel Lesinski <kornel@aardvarkmedia.co.uk>
-Lincoln Maskey <narcissus@users.sourceforge.net> narcissus
-Luke Lee <luke@mantishub.net> Luke
-Luke Lee <luke@mantishub.net> Luke <lr_dev@orientationsys.com>
-luzpaz <luzpaz@users.noreply.github.com> luz.paz
+Lincoln Maskey <narcissus@users.sourceforge.net>
+Luke Lee <luke@mantishub.net>
+Luke Lee <luke@mantishub.net> <lr_dev@orientationsys.com>
+luzpaz <luzpaz@users.noreply.github.com>
 luzpaz <luzpaz@users.noreply.github.com> <luzpaz@@users.noreply.github.com>
-Manilal <libregeek@gmail.com> libregeek
-Marcello Scata <marcelloscata@users.sourceforge.net> masc
+Manilal <libregeek@gmail.com>
+Marcello Scata <marcelloscata@users.sourceforge.net>
 Markus Schneider <schnueptus@schnueptus.de> <schnueptus@schnueptus-d430.(none)>
 mfoXen <inetgames@web.de> <mfoXen@users.noreply.github.com>
 Michael Lorer <info@01-scripts.de>
-Paul Richards <paul@mantisforge.org> grangeway <paul@minimoo.org>
-Paul Richards <paul@mantisforge.org> Paul
+Paul Richards <paul@mantisforge.org>
+Paul Richards <paul@mantisforge.org> <paul@minimoo.org>
 Paul Richards <paul@mantisforge.org> <Paul@.(none)>
 Paul Richards <paul@mantisforge.org> root <root@paul.shroudbox.com>
 Paul Richards <paul@mantisforge.org> <paul@issue-track.org>
-Rafik Robeal <rafik@mantishub.net> syncguru
+Rafik Robeal <rafik@mantishub.net>
 Rafik Robeal <rafik@mantishub.net> <rafik@futureadvisor.com>
 Rafik Robeal <rafik@mantishub.net> <rafik@mantishub.com>
 Rafik Robeal <rafik@mantishub.net> <rafikrobeal@gmail.com>
@@ -46,7 +46,7 @@ Rafik Robeal <rafik@mantishub.net> <syncguru@users.noreply.github.com>
 Robert Munteanu <robert@lmn.ro> <robert.munteanu@gmail.com>
 Robert Munteanu <robert@lmn.ro> <robert.munteanu@sdc.ro>
 Robert Munteanu <robert@lmn.ro> <rmuntean@adobe.com>
-Roland Becker <roland@atrol.de> atrol
+Roland Becker <roland@atrol.de>
 Roland Becker <roland@atrol.de> <roland.becker@atrol.de>
 Roland Becker <roland@atrol.de> <roland@Rolands-Air.fritz.box>
 Saga Musix <saga-games@arcor.de> <sagamusix@users.noreply.github.com>
@@ -58,13 +58,12 @@ Stéphane Veyret <sveyret@axway.com>
 Tamás Gulácsi <tgulacsi78@gmail.com> <gt-dev@gthomas.homelinux.org>
 Tamás Gulácsi <tgulacsi78@gmail.com> <tgulacsi78+acer@gmail.com>
 Tamás Gulácsi <tgulacsi78@gmail.com> <tgulacsi@users.noreply.github.com>
-Tarik Sedlarevic <tazza70@users.sourceforge.net> tazza70
+Tarik Sedlarevic <tazza70@users.sourceforge.net>
 Véronique Maginot <veronique.maginot@credit-agricole-sa.fr>
-Victor Boctor <vboctor@gmail.com> root <root@localhost.localdomain>
+Victor Boctor <vboctor@gmail.com> <root@localhost.localdomain>
 Victor Boctor <vboctor@gmail.com> <vboctor@localhost.localdomain>
 Victor Boctor <vboctor@gmail.com> <vboctor@new-host-3.home>
 Victor Boctor <vboctor@gmail.com> <victor@mantishub.com>
 Victor Boctor <vboctor@gmail.com> <victor@mantishub.net>
-Vladimir Shulev <badfiles@mail.ru> badfiles
-Vladimir Shulev <badfiles@mail.ru> root
-Zipher04 <zipher04@yahoo.com.tw> Zipher
+Vladimir Shulev <badfiles@mail.ru>
+Zipher <zipher04@yahoo.com.tw>
diff --git a/doc/CREDITS b/doc/CREDITS
index 308860010f..c84f838889 100644
--- a/doc/CREDITS
+++ b/doc/CREDITS
@@ -122,7 +122,7 @@ Giovanni Giacobbi
 Jim Hanley
 Stéphane Veyret
 Val Kulkov
-Zipher04
+Zipher
 cyclespersecond
 scoates
 torija