diff --git a/src/Entity/Translator.php b/src/Entity/Translator.php
index 22316e8..084c049 100644
--- a/src/Entity/Translator.php
+++ b/src/Entity/Translator.php
@@ -25,7 +25,7 @@ use Drupal\tmgmt\TranslatorInterface;
  *     "form" = {
  *       "edit" = "Drupal\tmgmt\Form\TranslatorForm",
  *       "add" = "Drupal\tmgmt\Form\TranslatorForm",
- *       "delete" = "Drupal\tmgmt\Form\TranslatorDeleteForm"
+ *       "delete" = "Drupal\tmgmt\Form\TranslatorDeleteForm",
  *     },
  *     "list_builder" = "Drupal\tmgmt\Entity\ListBuilder\TranslatorListBuilder",
  *     "access" = "Drupal\tmgmt\Entity\Controller\TranslatorAccessControlHandler",
@@ -35,7 +35,7 @@ use Drupal\tmgmt\TranslatorInterface;
  *   entity_keys = {
  *     "id" = "name",
  *     "label" = "label",
- *     "weight" = "weight"
+ *     "weight" = "weight",
  *   },
  *   config_export = {
  *     "name",
@@ -46,6 +46,7 @@ use Drupal\tmgmt\TranslatorInterface;
  *     "settings",
  *   },
  *   links = {
+ *     "collection" = "/admin/config/regional/tmgmt_translator",
  *     "edit-form" = "/admin/config/regional/tmgmt_translator/manage/{tmgmt_translator}",
  *     "add-form" = "/admin/config/regional/tmgmt_translator/add",
  *     "delete-form" = "/tmgmt_translator/{tmgmt_translator}/delete",
diff --git a/src/Form/JobForm.php b/src/Form/JobForm.php
index 04e0b1c..bf57d7d 100644
--- a/src/Form/JobForm.php
+++ b/src/Form/JobForm.php
@@ -276,7 +276,7 @@ class JobForm extends TmgmtFormBase {
       // Show a list of translators tagged by availability for the selected source
       // and target language combination.
       if (!$translators = tmgmt_translator_labels_flagged($job)) {
-        drupal_set_message(t('There are no translators available. Before you can checkout you need to !configure at least one translator.', array('!configure' => \Drupal::l(t('configure'), Url::fromRoute('entity.tmgmt_translator.list')))), 'warning');
+        drupal_set_message(t('There are no translators available. Before you can checkout you need to !configure at least one translator.', array('!configure' => \Drupal::l(t('configure'), Url::fromRoute('entity.tmgmt_translator.collection')))), 'warning');
       }
       $preselected_translator = $job->getTranslatorId() && isset($translators[$job->getTranslatorId()]) ? $job->getTranslatorId() : key($translators);
       $job->translator = $form_state->getValue('translator') ?: $preselected_translator;
diff --git a/src/Form/TranslatorDeleteForm.php b/src/Form/TranslatorDeleteForm.php
index db805ec..2c20039 100644
--- a/src/Form/TranslatorDeleteForm.php
+++ b/src/Form/TranslatorDeleteForm.php
@@ -7,55 +7,15 @@
 
 namespace Drupal\tmgmt\Form;
 
+use Drupal\Core\Entity\EntityDeleteForm;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\Core\Entity\EntityConfirmFormBase;
 
 /**
  * Provides a form for deleting a content_entity_example entity.
  *
  * @ingroup content_entity_example
  */
-class TranslatorDeleteForm extends EntityConfirmFormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    return t('Are you sure you want to delete Translator %name?', array('%name' => $this->entity->label()));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelURL() {
-    return new Url('entity.tmgmt_translator.list');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return t('Delete');
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * Delete the entity and log the event. log() replaces the watchdog.
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-
-    $this->entity->delete();
-
-    \Drupal::logger('tmgmt')->info('@type: deleted %title.',
-      array(
-        '@type' => $this->entity->bundle(),
-        '%title' => $this->entity->label(),
-      ));
-    drupal_set_message(t('%label has been deleted.', array('%label' => $this->entity->label())));
-    $form_state->setRedirect('entity.tmgmt_translator.list');
-  }
+class TranslatorDeleteForm extends EntityDeleteForm {
 
   /**
    * {@inheritdoc}
diff --git a/src/Form/TranslatorForm.php b/src/Form/TranslatorForm.php
index bf6b46a..261411e 100644
--- a/src/Form/TranslatorForm.php
+++ b/src/Form/TranslatorForm.php
@@ -201,7 +201,7 @@ class TranslatorForm extends EntityForm {
       drupal_set_message(format_string('%label configuration has been created.', array('%label' => $entity->label())));
     }
 
-    $form_state->setRedirect('entity.tmgmt_translator.list');
+    $form_state->setRedirect('entity.tmgmt_translator.collection');
   }
 
   /**
diff --git a/src/Tests/TMGMTUiTest.php b/src/Tests/TMGMTUiTest.php
index 4300414..c0678bf 100644
--- a/src/Tests/TMGMTUiTest.php
+++ b/src/Tests/TMGMTUiTest.php
@@ -788,7 +788,7 @@ class TMGMTUiTest extends TMGMTTestBase {
     $this->assertTitle(t('Add Translator | Drupal'));
     // Delete Translators.
     $this->drupalGet('/tmgmt_translator/' . $translator->id() . '/delete');
-    $this->assertTitle(t('Are you sure you want to delete Translator @label? | Drupal', ['@label' => $translator->label()]));
+    $this->assertTitle(t('Are you sure you want to delete the translator @label? | Drupal', ['@label' => $translator->label()]));
     // Edit Translators.
     $this->drupalGet('/admin/config/regional/tmgmt_translator/manage/' . $translator->id());
     $this->assertTitle(t('Edit translator | Drupal'));
diff --git a/tmgmt.links.action.yml b/tmgmt.links.action.yml
index 6afb8ef..fdef891 100644
--- a/tmgmt.links.action.yml
+++ b/tmgmt.links.action.yml
@@ -2,4 +2,4 @@ entity.tmgmt_translator.add_form:
   route_name: entity.tmgmt_translator.add_form
   title: 'Add translator'
   appears_on:
-    - entity.tmgmt_translator.list
+    - entity.tmgmt_translator.collection
diff --git a/tmgmt.links.menu.yml b/tmgmt.links.menu.yml
index 51c4223..2c2f454 100644
--- a/tmgmt.links.menu.yml
+++ b/tmgmt.links.menu.yml
@@ -3,8 +3,8 @@ tmgmt.settings:
   route_name: tmgmt.settings
   parent: system.admin_config_regional
   weight: 10
-entity.tmgmt_translator.list:
+entity.tmgmt_translator.collection:
   title: 'Translation Management translators'
-  route_name: entity.tmgmt_translator.list
+  route_name: entity.tmgmt_translator.collection
   parent: system.admin_config_regional
   weight: 15
diff --git a/tmgmt.routing.yml b/tmgmt.routing.yml
index 456e2a7..469321b 100644
--- a/tmgmt.routing.yml
+++ b/tmgmt.routing.yml
@@ -6,7 +6,7 @@ tmgmt.settings:
   requirements:
     _permission: 'administer tmgmt'
 
-entity.tmgmt_translator.list:
+entity.tmgmt_translator.collection:
   path: '/admin/config/regional/tmgmt_translator'
   defaults:
     _title: 'Translation Management translators'
diff --git a/translators/tmgmt_local/tmgmt_local.info.yml b/translators/tmgmt_local/tmgmt_local.info.yml
index f53f964..ee70929 100644
--- a/translators/tmgmt_local/tmgmt_local.info.yml
+++ b/translators/tmgmt_local/tmgmt_local.info.yml
@@ -8,4 +8,4 @@ dependencies:
  - tmgmt
  - tmgmt_language_combination
 
-configure: entity.tmgmt_translator.list
+configure: entity.tmgmt_translator.collection