diff --git a/build-constraints.yaml b/build-constraints.yaml
index a9d1f46f..492b891f 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1,7 +1,7 @@
 ghc-major-version: "8.0"
 # Constraints for brand new builds
 packages:
-    "Winter Land <winterland1989@gmail.com>":
+    "Winter Land <winterland1989@gmail.com> @winterland1989":
         - tcp-streams
 
     "Harendra Kumar <harendra.kumar@gmail.com> @harendra-kumar":
@@ -35,7 +35,7 @@ packages:
     "Dmitry Bogatov <KAction@gnu.org>":
         - once
 
-    "David Johnson djohnson.m@gmail.com @dmjio":
+    "David Johnson <djohnson.m@gmail.com> @dmjio":
         # GHC 8 - envy
         - s3-signer
         # bounds - google-translate
@@ -131,7 +131,7 @@ packages:
         - hfsevents
         - Win32-notify
 
-    "Omari Norman <omari@smileystation.com>":
+    "Omari Norman <omari@smileystation.com> @massysett":
         - rainbow
         - rainbox
         - pipes-cliff
@@ -146,7 +146,7 @@ packages:
         - timelens
         - non-empty-sequence
 
-    "Neil Mitchell":
+    "Neil Mitchell @ndmitchell":
         - hlint
         - hoogle
         - shake
@@ -161,19 +161,19 @@ packages:
         - bake
         - ghcid
 
-    "Alan Zimmerman":
+    "Alan Zimmerman @alanz":
         - hjsmin
         - language-javascript
         - Strafunski-StrategyLib
         - HaRe
 
-    "Alfredo Di Napoli <alfredo.dinapoli@gmail.com>":
+    "Alfredo Di Napoli <alfredo.dinapoli@gmail.com> @adinapoli":
         - mandrill
 
     "Jon Schoning <jonschoning@gmail.com> @jonschoning":
         - pinboard
 
-    "Jasper Van der Jeugt":
+    "Jasper Van der Jeugt @jaspervdj":
         - blaze-html
         - blaze-markup
         - cabal-dependency-licenses
@@ -195,22 +195,22 @@ packages:
         - StateVar
         - ObjectName
 
-    "Antoine Latter":
+    "Antoine Latter @aslatter":
         - byteorder
         - uuid
 
-    "Philipp Middendorf <pmidden@secure.mailbox.org>":
+    "Philipp Middendorf <pmidden@secure.mailbox.org> @pmiddend":
         - clock
 
-    "Stefan Wehr <wehr@factisresearch.com>":
+    "Stefan Wehr <wehr@factisresearch.com> @skogsbaer":
         - HTF
         - xmlgen
         - stm-stats
 
-    "Bart Massey <bart.massey+stackage@gmail.com>":
+    "Bart Massey <bart.massey+stackage@gmail.com> @BartMassey":
         - parseargs
 
-    "Vincent Hanquez":
+    "Vincent Hanquez @vincenthz":
         - bytedump
         - cipher-aes
         - cipher-rc4
@@ -234,7 +234,7 @@ packages:
         - vhd
         - xenstore
 
-    "Chris Done":
+    "Chris Done @chrisdone":
         - ace
         - ical
         - check-email
@@ -269,7 +269,7 @@ packages:
         - transient-universe
         - ghcjs-hplay
 
-    "Edward Kmett <ekmett@gmail.com>":
+    "Edward Kmett <ekmett@gmail.com> @ekmett":
         - ad
         - adjunctions
         # GHC 8 & bounds - approximate
@@ -338,11 +338,11 @@ packages:
         - zlib-lens
         # GHC 8 - hyperloglog
 
-    "Andrew Farmer <afarmer@ittc.ku.edu>":
+    "Andrew Farmer <afarmer@ittc.ku.edu> @xich":
         - scotty
         - wai-middleware-static
 
-    "Simon Hengel <sol@typeful.net>":
+    "Simon Hengel <sol@typeful.net> @sol":
         - hspec
         - hspec-wai
         - hspec-wai-json
@@ -358,7 +358,7 @@ packages:
         - monoid-subclasses
         - picoparsec
 
-    "Brent Yorgey <byorgey@gmail.com>":
+    "Brent Yorgey <byorgey@gmail.com> @byorgey":
         - active
         # via haxr - BlogLiterately
         # GHC 8 - BlogLiterately-diagrams
@@ -379,7 +379,7 @@ packages:
         - MonadRandom
         - monoid-extras
 
-    "Vincent Berthoux <vincent.berthoux@gmail.com>":
+    "Vincent Berthoux <vincent.berthoux@gmail.com> @Twinside":
         - JuicyPixels
         - FontyFruity
         - Rasterific
@@ -387,10 +387,10 @@ packages:
         - rasterific-svg
         - asciidiagram
 
-    "Patrick Brisbin":
+    "Patrick Brisbin @pbrisbin":
         - gravatar
 
-    "Paul Harper <benekastah@gmail.com>":
+    "Paul Harper <benekastah@gmail.com> @benekastah":
         - yesod-auth-oauth2
 
     "Felipe Lessa <felipe.lessa@gmail.com> @meteficha":
@@ -413,17 +413,17 @@ packages:
         - yesod-fb
         # VERSION MISSING Compilation failure against aeson https://github.com/prowdsponsor/mangopay/issues/32 - yesod-mangopay
 
-    "Alexander Altman <alexanderaltman@me.com>":
+    "Alexander Altman <alexanderaltman@me.com> @pthariensflame":
         # Maintaining on behalf of @roelvandijk:
         - base-unicode-symbols
         - containers-unicode-symbols
         # My own packages:
         - ChannelT
 
-    "Trevor L. McDonell <tmcdonell@cse.unsw.edu.au>":
+    "Trevor L. McDonell <tmcdonell@cse.unsw.edu.au> @tmcdonell":
         - accelerate
 
-    # "Liam O'Connor <liamoc@cse.unsw.edu.au>":
+    # "Liam O'Connor <liamoc@cse.unsw.edu.au> @liamoc":
         # GHC 8 - patches-vector
         # GHC 8 - composition-tree
         # GHC 8 & bounds - dixi
@@ -461,7 +461,7 @@ packages:
         - post-mess-age
         - sorted-list
 
-    "Gabriel Gonzalez <Gabriel439@gmail.com>":
+    "Gabriel Gonzalez <Gabriel439@gmail.com> @Gabriel439":
         - optparse-generic
         - pipes
         - pipes-extras
@@ -472,13 +472,13 @@ packages:
         - foldl
         - morte
 
-    "Andrew Thaddeus Martin <andrew.thaddeus@gmail.com>":
+    "Andrew Thaddeus Martin <andrew.thaddeus@gmail.com> @andrewthad":
         - yesod-table
 
-    "Arash Rouhani <miffoljud@gmail.com>":
+    "Arash Rouhani <miffoljud@gmail.com> @Tarrasch":
         - yesod-text-markdown
 
-    "Chris Allen <cma@bitemyapp.com>":
+    "Chris Allen <cma@bitemyapp.com> bitemyapp":
         - bloodhound
 
     "Adam Bergmark <adam@bergmark.nl> @bergmark":
@@ -494,25 +494,25 @@ packages:
         - time-compat
         - through-text
 
-    "Sebastiaan Visser <haskell@fvisser.nl>":
+    "Sebastiaan Visser <haskell@fvisser.nl> @sebastiaanvisser":
         - clay
         - fclabels
 
-    "Rodrigo Setti <rodrigosetti@gmail.com>":
+    "Rodrigo Setti <rodrigosetti@gmail.com> @rodrigosetti":
         - messagepack
         - messagepack-rpc
 
-    # "Boris Lykah <lykahb@gmail.com>":
+    # "Boris Lykah <lykahb@gmail.com> @lykahb":
         # GHC 8 - groundhog
         # GHC 8 - groundhog-th
         # GHC 8 - groundhog-sqlite
         # GHC 8 - groundhog-postgresql
         # GHC 8 - groundhog-mysql
 
-    "Janne Hellsten <jjhellst@gmail.com>":
+    "Janne Hellsten <jjhellst@gmail.com> @nurpax":
         - sqlite-simple
 
-    "Michal J. Gajda <maintainer@migamake.com>":
+    "Michal J. Gajda <maintainer@migamake.com> @mgajda":
         - iterable
         - Octree
         - FenwickTree
@@ -523,14 +523,14 @@ packages:
         - json-autotype
         - posix-realtime
 
-    "Dom De Re <domdere@domdere.com>":
+    "Dom De Re <domdere@domdere.com> @domdere":
         - cassava-conduit
 
-    "Dominic Steinitz <dominic@steinitz.org>":
+    "Dominic Steinitz <dominic@steinitz.org> @idontgetoutmuch":
         - yarr
         - random-fu
 
-    "Ben Gamari <ben@smart-cactus.org>":
+    "Ben Gamari <ben@smart-cactus.org> @bgamari":
         - vector-fftw
 
     "Roman Cheplyaka <roma@ro-che.info> @feuerbach":
@@ -554,19 +554,19 @@ packages:
         - traverse-with-class
         - tuples-homogenous-h98
 
-    "George Giorgidze <giorgidze@gmail.com>":
+    "George Giorgidze <giorgidze@gmail.com> @giorgidze":
         - HCodecs
         - YampaSynth
         - set-monad
 
-    "Phil Hargett <phil@haphazardhouse.net>":
+    "Phil Hargett <phil@haphazardhouse.net> @hargettp":
         - courier
 
-    "Aycan iRiCAN <iricanaycan@gmail.com>":
+    "Aycan iRiCAN <iricanaycan@gmail.com> @aycanirican":
         - hdaemonize
         - hweblib
 
-    "Joachim Breitner <mail@joachim-breitner.de>":
+    "Joachim Breitner <mail@joachim-breitner.de> @nomeata":
         - circle-packing
         - arbtt
         - ghc-heap-view
@@ -578,7 +578,7 @@ packages:
         - RepLib
         - unbound
 
-    "Aditya Bhargava <adit@adit.io":
+    "Aditya Bhargava <adit@adit.io> @egonSchiele":
         - HandsomeSoup
 
     "Clint Adams <clint@debian.org> @clinty":
@@ -604,7 +604,7 @@ packages:
         - pipes-random
         # GHC 8 - kanji
 
-    "Ketil Malde":
+    "Ketil Malde @ketil-malde":
         - biocore
         - biofasta
         - biofastq
@@ -624,7 +624,7 @@ packages:
         # , "BiobaseTypes BiobaseFasta"
         # MC-Fold-DP
 
-    "Florian Eggenhofer <florian.eggenhofer@univie.ac.at>":
+    "Florian Eggenhofer <florian.eggenhofer@univie.ac.at> @eggzilla":
         - ClustalParser
         # GHC 8 - EntrezHTTP
         - Genbank
@@ -666,10 +666,10 @@ packages:
         # - hledger-web
         # via Diff - shelltestrunner
 
-    "Mihai Maruseac <mihai.maruseac@gmail.com>":
+    "Mihai Maruseac <mihai.maruseac@gmail.com> @mihaimaruseac":
         - io-manager
 
-    "Dimitri Sabadie <dimitri.sabadie@gmail.com":
+    "Dimitri Sabadie <dimitri.sabadie@gmail.com> @phaazon":
         # - al FIXME temporary, figure out why it's not working with stackage-build
         - event
         - hid
@@ -682,10 +682,10 @@ packages:
         # GHC 8 - wavefront
         - zero
 
-    "Thomas Schilling <nominolo@googlemail.com>":
+    "Thomas Schilling <nominolo@googlemail.com> @nominolo":
         - ghc-syb-utils
 
-    "Boris Buliga <d12frosted@icloud.com>":
+    "Boris Buliga <d12frosted@icloud.com> @d12frosted":
         - io-choice
         # UNKNOWN VERSION Compilation failure https://github.com/d12frosted/CanonicalPath/issues/5 - system-canonicalpath
 
@@ -693,7 +693,7 @@ packages:
         - ghc-mod
         - cabal-helper
 
-    "Yann Esposito <yann.esposito@gmail.com>":
+    "Yann Esposito <yann.esposito@gmail.com> yogsototh @yogsototh":
         - human-readable-duration
         - holy-project
         - wai-middleware-caching
@@ -703,7 +703,7 @@ packages:
         - ekg
         - ekg-json
 
-    "Paul Rouse <pgr@doynton.org>":
+    "Paul Rouse <pgr@doynton.org> @paul-rouse":
         - sphinx
         - xmlhtml
         - yesod-auth-hashdb
@@ -724,13 +724,13 @@ packages:
         - djinn-lib
         - djinn-ghc
 
-    "Arash Rouhani <miffoljud@gmail.com>":
+    "Arash Rouhani <miffoljud@gmail.com> @Tarrasch":
         - yesod-text-markdown
 
-    "Matvey Aksenov <matvey.aksenov@gmail.com":
+    "Matvey Aksenov <matvey.aksenov@gmail.com>":
         - terminal-size
 
-    "Luis G. Torres <lgtorres42@gmail.com":
+    "Luis G. Torres <lgtorres42@gmail.com> @giogadi":
         - kdt
 
     "Emanuel Borsboom <manny@fpcomplete.com> @borsboom":
@@ -761,11 +761,11 @@ packages:
         - optparse-simple
         - hpack
 
-    "Michael Sloan <mgsloan@gmail.com>":
+    "Michael Sloan <mgsloan@gmail.com> @mgsloan":
         - th-orphans
         - th-reify-many
 
-    "Nikita Volkov <nikita.y.volkov@mail.ru>":
+    "Nikita Volkov <nikita.y.volkov@mail.ru> @nikita-volkov":
         - base-prelude
         - cases
         - focus
@@ -778,10 +778,10 @@ packages:
         - slave-thread
         - stm-containers
 
-    "Iustin Pop <iustin@k1024.org>":
+    "Iustin Pop <iustin@k1024.org> @iustin":
         - prefix-units
 
-    "Alexander Thiemann <mail@athiemann.net>":
+    "Alexander Thiemann <mail@athiemann.net> @agrafix":
        - Spock
        - Spock-core
        - Spock-api
@@ -804,7 +804,7 @@ packages:
        - dataurl
        - psql-helpers
 
-    "Joey Eremondi <joey@eremondi.com>":
+    "Joey Eremondi <joey@eremondi.com> @JoeyEremondi":
         - aeson-pretty
         - digest
         # via elm-compiler - elm-build-lib
@@ -817,7 +817,7 @@ packages:
         - union-find
         - zip-archive
 
-    "Arthur Fayzrakhmanov <heraldhoi@gmail.com>":
+    "Arthur Fayzrakhmanov <heraldhoi@gmail.com> @geraldus":
         # GHC 8 - sodium
         - yesod-form-richtext
         - ghcjs-perch
@@ -825,17 +825,17 @@ packages:
     "Sebastian Nagel <sebastian.nagel@ncoding.at> @ch1bo":
         - hdevtools
 
-    "Andrey Chudnov <oss@chudnov.com>":
+    "Andrey Chudnov <oss@chudnov.com> @achudnov":
         - language-ecmascript
 
-    "Tom Ellis <tom-stackage@jaguarpaw.co.uk>":
+    "Tom Ellis <tom-stackage@jaguarpaw.co.uk> @tomjaguarpaw":
         - opaleye
         - product-profunctors
 
     "Samplecount stefan@samplecount.com @kaoskorobase":
         - shake-language-c
 
-    "Marcin Mrotek <marcin.jan.mrotek@gmail.com>":
+    "Marcin Mrotek <marcin.jan.mrotek@gmail.com> @marcinmrotek":
         - type-list
         - zoom-refs
         - vinyl-utils
@@ -844,7 +844,7 @@ packages:
         - alarmclock
         - bank-holidays-england
 
-    "Haskell Servant jkarni@gmail.com":
+    "Haskell Servant <jkarni@gmail.com>":
         - servant
         - servant-client
         - servant-docs
@@ -856,19 +856,19 @@ packages:
         - servant-mock
         - servant-cassava
 
-    "Alexandr Ruchkin voidex@live.com @mvoidex":
+    "Alexandr Ruchkin <voidex@live.com> @mvoidex":
         # missing test files https://github.com/fpco/stackage/issues/1562 - hdocs
         - hformat
         # missing test files https://github.com/fpco/stackage/issues/1562 - hsdev
         - simple-log
         - text-region
 
-    "Aleksey Kliger aleksey@lambdageek.org @lambdageek":
+    "Aleksey Kliger <aleksey@lambdageek.org> @lambdageek":
         - unbound-generics
         - indentation-core
         - indentation-parsec
 
-    "Alois Cochard alois.cochard@gmail.com @aloiscochard":
+    "Alois Cochard <alois.cochard@gmail.com> @aloiscochard":
         # GHC 8 & bounds - codex
         # GHC 8 - machines-binary
         # GHC 8 - machines-directory
@@ -877,16 +877,16 @@ packages:
         # GHC 8 - sarsi
         - wreq # on behalf of Bryan O'Sullivan @bos
 
-    "Andraz Bajt andraz@bajt.me @edofic":
+    "Andraz Bajt <andraz@bajt.me> @edofic":
         - effect-handlers
         - koofr-client
         - snowflake
 
-    "Leza M. Lutonda lemol-c@hotmail.com @lemol":
+    "Leza M. Lutonda <lemol-c@hotmail.com> @lemol":
         - HaskellNet
         - HaskellNet-SSL
 
-    "Jens Petersen juhpetersen@gmail.com @juhp":
+    "Jens Petersen <juhpetersen@gmail.com> @juhp":
         - cabal-rpm
         - cabal-sort
         - hslua
@@ -911,14 +911,14 @@ packages:
         # GHC 8 - vcsgui
         - vcswrapper
 
-    "Renzo Carbonara renzocarbonara@gmail.com @k0001":
+    "Renzo Carbonara <renzocarbonara@gmail.com> @k0001":
         - network-simple
         - pipes-aeson
         - pipes-attoparsec
         # GHC 8 - pipes-binary
         - pipes-network
 
-    "Tomas Carnecky":
+    "Tomas Carnecky @wereHamster":
         # GHC 8 0.0.15 compilation failure - avers
         # via avers - avers-api
         # via avers - avers-server
@@ -934,10 +934,10 @@ packages:
         - publicsuffix
         - rethinkdb-client-driver
 
-    "Alexandr Kurilin alex@kurilin.net @alex_kurilin":
+    "Alexandr Kurilin <alex@kurilin.net> @alex_kurilin":
         - bcrypt
 
-    "Jeffrey Rosenbluth jeffrey.rosenbluth@gmail.com":
+    "Jeffrey Rosenbluth <jeffrey.rosenbluth@gmail.com> @jeffreyrosenbluth":
         - palette
         - diagrams-canvas
         - diagrams-rasterific
@@ -946,10 +946,10 @@ packages:
         - static-canvas
         - svg-builder
 
-    "Gabríel Arthúr Pétursson gabriel@system.is":
+    "Gabríel Arthúr Pétursson <gabriel@system.is> @polarina":
         - sdl2
 
-    "Leon Mergen leon@solatis.com @solatis":
+    "Leon Mergen <leon@solatis.com> @solatis":
         - base32string
         - base58string
         - bitcoin-api
@@ -963,29 +963,29 @@ packages:
         - network-anonymous-i2p
         - network-anonymous-tor
 
-    "Timothy Jones git@zmthy.io @zmthy":
+    "Timothy Jones <git@zmthy.io> @zmthy":
         - http-media
 
-    "Greg V greg@unrelenting.technology @myfreeweb":
+    "Greg V <greg@unrelenting.technology> @myfreeweb":
         - gitson
         - pcre-heavy
         - http-link-header
         - microformats2-parser
         - hspec-expectations-pretty-diff
 
-    "Francesco Mazzoli f@mazzo.li @bitonic":
+    "Francesco Mazzoli <f@mazzo.li> @bitonic":
         - language-c-quote
 
-    "Sönke Hahn soenkehahn@gmail.com @soenkehahn":
+    "Sönke Hahn <soenkehahn@gmail.com> @soenkehahn":
         - generics-eot
         - getopt-generics
         - graph-wrapper
         - string-conversions
 
-    "Jan Stolarek jan.stolarek@p.lodz.pl @jstolarek":
+    "Jan Stolarek <jan.stolarek@p.lodz.pl> @jstolarek":
         - tasty-program
 
-    "Oleg Grenrus oleg.grenrus@iki.fi @phadej":
+    "Oleg Grenrus <oleg.grenrus@iki.fi> @phadej":
         - aeson-compat
         # GHC 8 - aeson-extra
         - binary-orphans
@@ -1053,15 +1053,15 @@ packages:
         - sandman
         - language-thrift
 
-    "Adam C. Foltzer acfoltzer@galois.com @acfoltzer":
+    "Adam C. Foltzer <acfoltzer@galois.com> @acfoltzer":
         - cryptol
         - gitrev
         - persistent-refs
 
-    "Luke Taylor tekul.hs@gmail.com @tekul":
+    "Luke Taylor <tekul.hs@gmail.com> @tekul":
         - jose-jwt
 
-    "Brendan Hay brendan.g.hay@gmail.com @brendanhay":
+    "Brendan Hay <brendan.g.hay@gmail.com> @brendanhay":
         - amazonka
         - amazonka-core
         - amazonka-test
@@ -1236,7 +1236,7 @@ packages:
         - semver
         - text-manipulate
 
-    "Nick Partridge nkpart@gmail.com @nkpart":
+    "Nick Partridge <nkpart@gmail.com> @nkpart":
         - cabal-file-th
 
     "Gershom Bazerman <gershomb@gmail.com> @gbaz":
@@ -1290,7 +1290,7 @@ packages:
         # GHC bug https://github.com/ddssff/debian-haskell/issues/6 - debian
         # via memoize - cabal-debian
 
-    "Stefan Saasen <stefan@saasen.me>":
+    "Stefan Saasen <stefan@saasen.me> @juretta":
         - jwt
 
     "Sven Bartscher sven.bartscher@weltraumschlangen.de @kritzefitz":
@@ -1347,11 +1347,11 @@ packages:
     "David Raymond Christiansen <david@davidchristiansen.dk> @david-christiansen":
         - annotated-wl-pprint
 
-    # "Yitz Gale gale@sefer.org @ygale":
+    # "Yitz Gale <gale@sefer.org> @ygale":
         # GHC 8 - timezone-series
         # GHC 8 - timezone-olson
 
-    "Josh Holland josh@inv.alid.pw @jshholland":
+    "Josh Holland <josh@inv.alid.pw> @jshholland":
         - sandi
         - data-ordlist
         - xmonad
@@ -1359,7 +1359,7 @@ packages:
     "Harry Garrood <harry@garrood.me> @hdgarrood":
         - aeson-better-errors
 
-    "Mitchell Rosen <mitchellwrosen@gmail.com":
+    "Mitchell Rosen <mitchellwrosen@gmail.com> @mitchellwrosen":
         - language-lua2
         - tasty-hspec
 
@@ -1461,15 +1461,15 @@ packages:
         - wai-cors
         - configuration-tools
 
-    "Sam Rijs <srijs@airpost.net>":
+    "Sam Rijs <srijs@airpost.net> @srijs":
         - ndjson-conduit
         # GHC 8 - attoparsec-trans
         - operational-class
 
-    # "Anupam Jain <ajnsit@gmail.com>":
+    # "Anupam Jain <ajnsit@gmail.com> @ajnsit":
         # GHC 8 - wai-routes
 
-    "Daniel Patterson <dbp@dbpmail.net>":
+    "Daniel Patterson <dbp@dbpmail.net> @dbp":
         # GHC 8 - hspec-snap
         - hworker
         - hworker-ses
@@ -1494,7 +1494,7 @@ packages:
         - wai-middleware-throttle
         - yesod-auth-basic
 
-    # "Alcides Viamontes <a.viamontes.esquivel@gmail.com>":
+    # "Alcides Viamontes <a.viamontes.esquivel@gmail.com> @alcidesv":
         # GHC 8 - second-transfer
 
     # "Hirotomo Moriwaki <philopon.dependence@gmail.com> @philopon":
@@ -1555,12 +1555,13 @@ packages:
         - cron
         - hedis
 
-    "Rob O'Callahan ropoctl@gmail.com":
+    "Rob O'Callahan ropoctl@gmail.com @rcallahan":
         - pipes-fastx
         - pipes-illumina
         - seqalign
         - thermonuc
         - xlsior
+
     "John Lenz <wuzzeb@gmail.com> @wuzzeb":
         - yesod-auth-account
         - yesod-static-angular
@@ -1575,14 +1576,14 @@ packages:
     "Will Thompson <will@willthompson.co.uk> @wjt":
         - bustle
 
-    "Jakub Fijałkowski kuba@codinginfinity.me @jakubfijalkowski":
+    "Jakub Fijałkowski <kuba@codinginfinity.me> @jakubfijalkowski":
         - hlibsass
         - hsass
 
-    "Robert Massaioli robertmassaioli@gmail.com":
+    "Robert Massaioli <robertmassaioli@gmail.com> @robertmassaioli":
         - range
 
-    "Index Int <vlad.z.4096@gmail.com>":
+    "Index Int <vlad.z.4096@gmail.com> @int-index":
         - transformers-lift
         - ether
         - union
@@ -1596,11 +1597,11 @@ packages:
         - dotenv
         - stache
 
-    "Sergey Alirzaev <zl29ah@gmail.com>":
+    "Sergey Alirzaev <zl29ah@gmail.com> @l29ah":
         - monad-peel
         # GHC 8 - Network-NineP
 
-    "Oliver Charles <ollie@ocharles.org.uk>":
+    "Oliver Charles <ollie@ocharles.org.uk> @ocharles":
         # GHC 8 - engine-io
         - diff3
         # GHC 8 & bounds - digestive-functors-aeson
@@ -1610,7 +1611,7 @@ packages:
         # GHC 8 - socket-io
         - tasty-rerun
 
-    # "Scott Murphy scott.murphy@plowtech.net @smurphy8":
+    # "Scott Murphy <scott.murphy@plowtech.net> @smurphy8":
 
     "Antoni Silvestre <antoni.silvestre@gmail.com> @asilvestre":
         # Test suite needs a running neo4j server with auth disabled
@@ -1772,7 +1773,7 @@ packages:
         # GHC 8 & via wavefront - lambdacube-gl
         # GHC 8 & bounds - lambdacube-compiler
 
-    "Spencer Janssen <spencerjanssen@gmail.com>":
+    "Spencer Janssen <spencerjanssen@gmail.com> @spencerjanssen":
         - Xauth
 
     "Sebastian de Bellefon <arnaudpourseb@gmail.com> @Helkafen":
@@ -1781,7 +1782,7 @@ packages:
     "Stefan Berthold":
         - smallcaps
 
-    "Gregory Collins <greg@gregorycollins.net>":
+    "Gregory Collins <greg@gregorycollins.net> @gregorycollins":
         - hashtables
         - io-streams
         - openssl-streams
@@ -1790,11 +1791,12 @@ packages:
         - http-common
         - http-streams
 
-    "Devan Stormont <stormont@gmail.com>":
+    "Devan Stormont <stormont@gmail.com> @stormont":
         - forecast-io
 
     "Sean Hunt <scshunt@csclub.uwaterloo.ca @scshunt":
         - cheapskate
+
     "Ivan Miljenovic <Ivan.Miljenovic@gmail.com> @ivan-m":
         - fgl
         - fgl-arbitrary
@@ -1805,7 +1807,7 @@ packages:
         - quickcheck-text
         - nagios-check
 
-    "Peter Simons simons@cryp.to @peti":
+    "Peter Simons <simons@cryp.to> @peti":
         - distribution-nixpkgs
         - cabal2nix
         - funcmp
@@ -1917,7 +1919,7 @@ packages:
         - twitter-types
         - twitter-types-lens
 
-    # "Robbin C. <robbinch33@gmail.com>":
+    # "Robbin C. <robbinch33@gmail.com> robbinch":
         # via lzma-conduit - zim-parser
 
     "David Wiltshire <david.wiltshire@metark.com> @dave77":
@@ -1945,7 +1947,7 @@ packages:
     "Christoph Breitkopf <chbreitkopf@gmail.com> @bokesan":
         - IntervalMap
 
-    "Michele Lacchia <michelelacchia@gmail.com>":
+    "Michele Lacchia <michelelacchia@gmail.com> @rubik":
         # GHC 8 - argon
         - docopt
         - pathwalk
@@ -1963,14 +1965,14 @@ packages:
         - inline-c-cpp
         - ekg
 
-    # "Emin Karayel <me@eminkarayel.de>":
+    # "Emin Karayel <me@eminkarayel.de> @ekarayel":
         # GHC 8 - sync-mht
 
     "Michael Schröder <mc.schroeder@gmail.com> @mcschroeder":
         - ctrie
         - ttrie
 
-    "Greg Weber <greg@gregweber.info>":
+    "Greg Weber <greg@gregweber.info> @gregwebs":
        - base-noprelude
 
     # "Andrew Lelechenko <andrew.lelechenko@gmail.com> @Bodigrim":
@@ -1983,7 +1985,7 @@ packages:
     "yihuang <yi.codeplayer@gmail.com> @yihuang":
         - tagstream-conduit
 
-    # "Johannes Hilden <hildenjohannes@gmail.com>":
+    # "Johannes Hilden <hildenjohannes@gmail.com> @johanneshilden":
         # Missing test files https://github.com/fpco/stackage/issues/1001 - hashids
 
     # "Joe Hermaszewski <stackage@monoid.al> @expipiplus1":
@@ -2015,7 +2017,7 @@ packages:
         - conduit-iconv
         # GHC 8 - conduit-connection
 
-    "Andrew Rademacher <andrewrademacher@gmail.com>":
+    "Andrew Rademacher <andrewrademacher@gmail.com> @AndrewRademacher":
         - aeson-casing
         - graylog
 
@@ -2098,10 +2100,10 @@ packages:
     "Hans-Christian Esperer <hc@hcesperer.org> @hce":
         - wai-session-postgresql
 
-    "Haisheng Wu <freizl@gmail.com>":
+    "Haisheng Wu <freizl@gmail.com> @freizl":
         - hoauth2
 
-    "Falko Peters <falko.peters@gmail.com>":
+    "Falko Peters <falko.peters@gmail.com> @informatikr":
         - scrypt
 
     "Jakub Waszczuk <waszczuk.kuba@gmail.com> @kawu":
@@ -2152,7 +2154,7 @@ packages:
         - pandoc
         - pandoc-citeproc
 
-    "Karun Ramakrishnan karun012@gmail.com @karun012":
+    "Karun Ramakrishnan <karun012@gmail.com> @karun012":
         - doctest-discover
 
     "Elie Genard <elaye.github.io@gmail.com> @eliegenard":
@@ -2183,7 +2185,7 @@ packages:
     "Aaron Levin <vilevin@gmail.com> @aaronmblevin":
         - free-vl
 
-    "Kazuo Koga <obiwanko@me.com>":
+    "Kazuo Koga <obiwanko@me.com> @kkazuo":
         - xlsx-tabular
 
     "Mikhail Glushenkov <mikhail.glushenkov@gmail.com> @23Skidoo":
@@ -2192,10 +2194,10 @@ packages:
     "Lennart Kolmodin <kolmodin@gmail.com> @kolmodin":
         - binary-bits
 
-    # "Nicolas Trangez ikke@nicolast.be @NicolasT":
+    # "Nicolas Trangez <ikke@nicolast.be> @NicolasT":
         # GHC 8 - reedsolomon
 
-    "Alp Mestanogullari alpmestan@gmail.com @alpmestan":
+    "Alp Mestanogullari <alpmestan@gmail.com> @alpmestan":
         - taggy
         - taggy-lens
         # 0.1 Compilation failure https://github.com/fpco/stackage/issues/1660 - inline-java
@@ -2266,7 +2268,7 @@ packages:
     # "Braden Walters <vc@braden-walters.info> @meoblast001":
         # via hakyll - hakyll-sass
 
-    "Patrick Thomson <patrick@helium.com>":
+    "Patrick Thomson <patrick@helium.com> @helium":
         - postgresql-transactional
 
     "Tom Murphy <amindfv@gmail.com> @amindfv":
@@ -2310,7 +2312,7 @@ packages:
         - gi-webkit == 3.0.3
         - haskell-gi
 
-    "Brandon Simmons <brandon.m.simmons@gmail.com>":
+    "Brandon Simmons <brandon.m.simmons@gmail.com> @jberryman":
         - directory-tree
 
     "Ian Grant Jeffries <ian@housejeffries.com> @seagreen":
@@ -2328,7 +2330,7 @@ packages:
         - HUnit-approx
         - units-parser
 
-    "Doug McClean <douglas.mcclean@gmail.com>":
+    "Doug McClean <douglas.mcclean@gmail.com> @dmcclean":
         - dimensional
         - exact-pi
         - numtype-dk
@@ -2343,7 +2345,7 @@ packages:
     "Henri Verroken <henriverroken@gmail.com> @hverr":
         - cache
 
-    "Cliff Harvey <cs.hbar+hs@gmail.com>":
+    "Cliff Harvey <cs.hbar+hs@gmail.com> @BlackBrane":
         - ansigraph
         - quantum-random
 
@@ -2354,10 +2356,10 @@ packages:
         - exp-pairs
         - fast-digits
 
-    "Greg Hurrell <greg@hurrell.net>":
+    "Greg Hurrell <greg@hurrell.net> @wincent":
         - docvim
 
-    "Ashley Yakeley <ashley@semantic.org>":
+    "Ashley Yakeley <ashley@semantic.org> @AshleyYakeley":
         - countable
 
     "Victor Denisov <denisovenator@gmail.com> @VictorDenisov":
@@ -2368,13 +2370,13 @@ packages:
         - test-fixture
         - text-conversions
 
-    "Patrick Chilton <chpatrick@gmail.com>":
+    "Patrick Chilton <chpatrick@gmail.com> @chpatrick":
         - solga
         - solga-swagger
         # Doesn't build on stackage server https://github.com/fpco/stackage/pull/1692 - clang-pure
         - webrtc-vad
 
-    "Michal Konecny <mikkonecny@gmail.com>":
+    "Michal Konecny <mikkonecny@gmail.com> @michalkonecny":
         - hmpfr
 
     "Bartosz Nitka <niteria@gmail.com> @niteria":
@@ -2387,11 +2389,11 @@ packages:
     "Christopher Wells <cwellsny@nycap.rr.com> @ExcalburZero":
         - pixelated-avatar-generator
 
-    "Allele Dev <allele.dev@gmail.com>":
+    "Allele Dev <allele.dev@gmail.com> @queertypes":
         - freer
         - wai-request-spec
 
-    "Dominic Orchard <dom.orchard@gmail.com>":
+    "Dominic Orchard <dom.orchard@gmail.com> @dorchard":
         - array-memoize
         - camfort
         - codo-notation
@@ -2402,7 +2404,7 @@ packages:
     "Philipp Schuster <phischu3000@gmail.com> @phischu":
         - haskell-names
 
-    "Shao Cheng <astrohavoc@gmail.com>":
+    "Shao Cheng <astrohavoc@gmail.com> @TerrorJack":
         - simple-download
         - encoding-io