diff --git a/core/MAINTAINERS.txt b/core/MAINTAINERS.txt
index 8dc32a0..7b86420 100644
--- a/core/MAINTAINERS.txt
+++ b/core/MAINTAINERS.txt
@@ -56,10 +56,10 @@ Ajax
 - Earl Miles 'merlinofchaos' https://www.drupal.org/u/merlinofchaos
 - Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
 
-Asset library
+Asset Library API
 - ?
 
-Authentication and authorization
+Authentication and Authorization
 - ?
 
 Automated Cron
@@ -72,10 +72,6 @@ Bartik
 - Jen Simmons 'jensimmons' https://www.drupal.org/u/jensimmons
 - Emma Maria Karayiannis 'emma.maria' https://www.drupal.org/u/emma.maria
 
-Base
-- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
-- Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman
-
 Basic Auth
 - Klaus Purer 'klausi' https://www.drupal.org/u/klausi
 - Juampy Novillo Requena 'juampy' https://www.drupal.org/u/juampy
@@ -130,10 +126,7 @@ Configuration
 - Alex Pott 'alexpott' https://www.drupal.org/u/alexpott
 - Matthew Tift 'mtift' https://www.drupal.org/u/mtift
 
-Configuration
-- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
-
-Configuration entity
+Configuration Entity API
 - Alex Pott 'alexpott' https://www.drupal.org/u/alexpott
 - Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
 - Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
@@ -143,6 +136,9 @@ Configuration Translation
 - Tobias Stöckler 'tstoeckler' https://www.drupal.org/u/tstoeckler
 - Vijayachandran Mani 'vijaycs85' https://www.drupal.org/u/vijaycs85
 
+Configuration UI
+- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
+
 Contact
 - Lee Rowlands 'larowlan' https://www.drupal.org/u/larowlan
 - Jibran Ijaz 'jibran' https://www.drupal.org/u/jibran
@@ -157,7 +153,6 @@ Content Translation
 Contextual
 - Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
 
-
 Cron
 - Derek Wright 'dww' https://www.drupal.org/u/dww
 
@@ -181,7 +176,7 @@ Database
 Database Logging
 - Khalid Baheyeldin 'kbahey' https://www.drupal.org/u/kbahey
 
-Database update
+Database Update API
 - ?
 
 DateTime
@@ -192,13 +187,13 @@ Dynamic Page Cache
 - Fabian Franz 'Fabianx' https://www.drupal.org/u/fabianx
 - Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers
 
-
 Email
 - Nils Destoop 'zuuperman' https://www.drupal.org/u/zuuperman
 
 Editor
 - Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers
-Entity
+
+Entity API
 - Wolfgang Ziegler 'fago' https://www.drupal.org/u/fago
 - Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
 - Sascha Grossenbacher 'Berdir' https://www.drupal.org/u/berdir
@@ -206,7 +201,7 @@ Entity
 Extension
 - ?
 
-Field
+Field API
 - Yves Chedemois 'yched' https://www.drupal.org/u/yched
 - Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu
 
@@ -215,9 +210,6 @@ Field UI
 - Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu
 
 File
-- Aaron Winborn 'aaron' https://www.drupal.org/u/aaron
-
-File
 - Andrew Morton 'drewish' https://www.drupal.org/u/drewish
 - Aaron Winborn 'aaron' https://www.drupal.org/u/aaron
 
@@ -233,7 +225,6 @@ Form
 Forum
 - Lee Rowlands 'larowlan' https://www.drupal.org/u/larowlan
 
-
 History
 - Andrey Postnikov 'andypost' https://www.drupal.org/u/andypost
 
@@ -246,14 +237,10 @@ Help
 Image
 - Claudiu Cristea 'claudiu.cristea' https://www.drupal.org/u/claudiu.cristea
 
-
-Image
-- Claudiu Cristea 'claudiu.cristea' https://www.drupal.org/u/claudiu.cristea
-
 Interface Translation (locale)
 - Gábor Hojtsy 'Gábor Hojtsy' https://www.drupal.org/u/gábor-hojtsy
 
-Install
+Installer
 - ?
 
 JavaScript
@@ -262,12 +249,8 @@ JavaScript
 
 Language
 - Francesco Placella 'plach' https://www.drupal.org/u/plach
-- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
-
-
-Language
-- Francesco Placella 'plach' https://www.drupal.org/u/plach
 - Gábor Hojtsy 'Gábor Hojtsy' https://www.drupal.org/u/gábor-hojtsy
+- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
 
 Link
 - Weber Macedo 'Mac_Weber' https://www.drupal.org/u/mac_weber
@@ -275,7 +258,6 @@ Link
 Lock
 - Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
 
-
 Mail
 - ?
 
@@ -286,20 +268,15 @@ Menu
 - Daniel Wehner 'dawehner' https://www.drupal.org/u/dawehner
 - Peter Wolanin 'pwolanin' https://www.drupal.org/u/pwolanin
 
-Menu link content
+Menu Link Content
 - Daniel Wehner 'dawehner' https://www.drupal.org/u/dawehner
 - Peter Wolanin 'pwolanin' https://www.drupal.org/u/pwolanin
 
 Menu UI
 - ?
 
-Migration
-- Adam Globus-Hoenich 'phenaproxima' https://www.drupal.org/u/phenaproxima
-- Ben Dougherty 'benjy' https://www.drupal.org/u/benjy
-- Michael Anello 'ultimike' https://www.drupal.org/u/ultimike
-- Mike Ryan 'mikeryan' https://www.drupal.org/u/mikeryan
-
 Migrate
+- Adam Globus-Hoenich 'phenaproxima' https://www.drupal.org/u/phenaproxima
 - Ben Dougherty 'benjy' https://www.drupal.org/u/benjy
 - Michael Anello 'ultimike' https://www.drupal.org/u/ultimike
 - Mike Ryan 'mikeryan' https://www.drupal.org/u/mikeryan
@@ -309,7 +286,6 @@ Migrate (Drupal)
 - Michael Anello 'ultimike' https://www.drupal.org/u/ultimike
 - Mike Ryan 'mikeryan' https://www.drupal.org/u/mikeryan
 
-
 Node
 - Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman
 - David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss
@@ -328,15 +304,11 @@ Options
 Outside In
 - Ted Bowman 'tedbow' https://www.drupal.org/u/tedbow
 
-
 Page Cache
 - Lorenz Schori 'znerol' https://www.drupal.org/u/znerol
 - Fabian Franz 'Fabianx' https://www.drupal.org/u/fabianx
 
 Path
-- ?
-
-Path
 - Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
 
 Plugin
@@ -359,7 +331,7 @@ Render
 - Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman
 - Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia
 
-Request processing
+Request Processing
 - Larry Garfield 'Crell' https://www.drupal.org/u/crell
 
 Responsive Image
@@ -406,9 +378,6 @@ Statistics
 Syslog
 - Khalid Baheyeldin 'kbahey' https://www.drupal.org/u/kbahey
 
-System
-- ?
-
 Taxonomy
 - Jess Myrbo 'xjm' https://www.drupal.org/u/xjm
 - Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
@@ -447,7 +416,7 @@ Transliteration
 - Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
 - Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
 
-Typed data
+Typed Data
 - Wolfgang Ziegler 'fago' https://www.drupal.org/u/fago
 
 Update
