diff --git a/core/MAINTAINERS.txt b/core/MAINTAINERS.txt
index ec4abc2..bd3925f 100644
--- a/core/MAINTAINERS.txt
+++ b/core/MAINTAINERS.txt
@@ -195,6 +195,10 @@ Contextual module
 Database Logging module
 - Khalid Baheyeldin 'kbahey' http://drupal.org/user/4063
 
+Entity Reference module
+- Amitai Burstein 'Amitaibu' http://drupal.org/user/57511
+- Andrei Mateescu 'amateescu' http://drupal.org/user/729614
+
 Field module
 - Yves Chedemois 'yched' http://drupal.org/user/39567
 - Barry Jaspan 'bjaspan' http://drupal.org/user/46413
diff --git a/core/modules/field/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Derivative/SelectionGeneric.php b/core/modules/field/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Derivative/SelectionBase.php
similarity index 100%
rename from core/modules/field/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Derivative/SelectionGeneric.php
rename to core/modules/field/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Derivative/SelectionBase.php