diff --git a/src/Entity/Job.php b/src/Entity/Job.php
index 056f3cf..f6c4a04 100644
--- a/src/Entity/Job.php
+++ b/src/Entity/Job.php
@@ -594,26 +594,26 @@ class Job extends ContentEntityBase implements EntityOwnerInterface, JobInterfac
    * {@inheritdoc}
    */
   public function requestTranslation() {
-    if (!$this->canRequestTranslation() || !$controller = $this->getTranslatorPlugin()) {
+    if (!$this->canRequestTranslation() || !$plugin = $this->getTranslatorPlugin()) {
       return FALSE;
     }
     // We don't know if the translator plugin already processed our
     // translation request after this point. That means that the plugin has to
     // set the 'submitted', 'needs review', etc. states on its own.
-    $controller->requestTranslation($this);
+    $plugin->requestTranslation($this);
   }
 
   /**
    * {@inheritdoc}
    */
   public function abortTranslation() {
-    if (!$this->isAbortable() || !$controller = $this->getTranslatorPlugin()) {
+    if (!$this->isAbortable() || !$plugin = $this->getTranslatorPlugin()) {
       return FALSE;
     }
     // We don't know if the translator plugin was able to abort the translation
     // job after this point. That means that the plugin has to set the
     // 'aborted' state on its own.
-    return $controller->abortTranslation($this);
+    return $plugin->abortTranslation($this);
   }
 
   /**
diff --git a/src/Entity/JobItem.php b/src/Entity/JobItem.php
index e6f3b79..d38c815 100644
--- a/src/Entity/JobItem.php
+++ b/src/Entity/JobItem.php
@@ -252,8 +252,8 @@ class JobItem extends ContentEntityBase implements JobItemInterface {
    * {@inheritdoc}
    */
   public function label($langcode = NULL) {
-    if ($controller = $this->getSourcePlugin()) {
-      $label = $controller->getLabel($this);
+    if ($plugin = $this->getSourcePlugin()) {
+      $label = $plugin->getLabel($this);
     }
     else {
       $label = parent::Label();
@@ -283,8 +283,8 @@ class JobItem extends ContentEntityBase implements JobItemInterface {
    * {@inheritdoc}
    */
   public function getSourceLabel() {
-    if ($controller = $this->getSourcePlugin()) {
-      return $controller->getLabel($this);
+    if ($plugin = $this->getSourcePlugin()) {
+      return $plugin->getLabel($this);
     }
     return FALSE;
   }
@@ -293,8 +293,8 @@ class JobItem extends ContentEntityBase implements JobItemInterface {
    * {@inheritdoc}
    */
   public function getSourceUrl() {
-    if ($controller = $this->getSourcePlugin()) {
-      return $controller->getUrl($this);
+    if ($plugin = $this->getSourcePlugin()) {
+      return $plugin->getUrl($this);
     }
     return FALSE;
   }
@@ -303,8 +303,8 @@ class JobItem extends ContentEntityBase implements JobItemInterface {
    * {@inheritdoc}
    */
   public function getSourceType() {
-    if ($controller = $this->getSourcePlugin()) {
-      return $controller->getType($this);
+    if ($plugin = $this->getSourcePlugin()) {
+      return $plugin->getType($this);
     }
     return ucfirst($this->get('item_type')->value);
   }
@@ -371,8 +371,8 @@ class JobItem extends ContentEntityBase implements JobItemInterface {
    * {@inheritdoc}
    */
   public function getSourceData() {
-    if ($controller = $this->getSourcePlugin()) {
-      return $controller->getData($this);
+    if ($plugin = $this->getSourcePlugin()) {
+      return $plugin->getData($this);
     }
     return array();
   }
@@ -731,13 +731,13 @@ class JobItem extends ContentEntityBase implements JobItemInterface {
    * {@inheritdoc}
    */
   public function acceptTranslation() {
-    if (!$this->isNeedsReview() || !$controller = $this->getSourcePlugin()) {
+    if (!$this->isNeedsReview() || !$plugin = $this->getSourcePlugin()) {
       return FALSE;
     }
     // We don't know if the source plugin was able to save the translation after
     // this point. That means that the plugin has to set the 'accepted' states
     // on its own.
-    $controller->saveTranslation($this);
+    $plugin->saveTranslation($this);
   }
 
   /**
diff --git a/src/Entity/Translator.php b/src/Entity/Translator.php
index 676e6b2..fdcc1f3 100644
--- a/src/Entity/Translator.php
+++ b/src/Entity/Translator.php
@@ -164,8 +164,8 @@ class Translator extends ConfigEntityBase implements TranslatorInterface {
       if (NestedArray::keyExists($this->settings, $name)) {
         return NestedArray::getValue($this->settings, $name);
       }
-      elseif ($controller = $this->getPlugin()) {
-        $defaults = $controller->defaultSettings();
+      elseif ($plugin = $this->getPlugin()) {
+        $defaults = $plugin->defaultSettings();
         return NestedArray::getValue($defaults, $name);
       }
     }
@@ -173,8 +173,8 @@ class Translator extends ConfigEntityBase implements TranslatorInterface {
       if (isset($this->settings[$name])) {
         return $this->settings[$name];
       }
-      elseif ($controller = $this->getPlugin()) {
-        $defaults = $controller->defaultSettings();
+      elseif ($plugin = $this->getPlugin()) {
+        $defaults = $plugin->defaultSettings();
         if (isset($defaults[$name])) {
           return $defaults[$name];
         }
@@ -247,10 +247,10 @@ class Translator extends ConfigEntityBase implements TranslatorInterface {
    * {@inheritdoc}
    */
   public function getSupportedTargetLanguages($source_language) {
-    if ($controller = $this->getPlugin()) {
+    if ($plugin = $this->getPlugin()) {
       if (isset($this->pluginInfo['cache languages']) && empty($this->pluginInfo['cache languages'])) {
         // This plugin doesn't support language caching.
-        return $this->mapToLocalLanguages($controller->getSupportedTargetLanguages($this, $this->mapToRemoteLanguage($source_language)));
+        return $this->mapToLocalLanguages($plugin->getSupportedTargetLanguages($this, $this->mapToRemoteLanguage($source_language)));
       }
       else {
         // Retrieve the supported languages from the cache.
@@ -260,7 +260,7 @@ class Translator extends ConfigEntityBase implements TranslatorInterface {
         // Even if we successfully queried the cache it might not have an entry
         // for our source language yet.
         if (!isset($this->languageCache[$source_language])) {
-          $this->languageCache[$source_language] = $this->mapToLocalLanguages($controller->getSupportedTargetLanguages($this, $this->mapToRemoteLanguage($source_language)));
+          $this->languageCache[$source_language] = $this->mapToLocalLanguages($plugin->getSupportedTargetLanguages($this, $this->mapToRemoteLanguage($source_language)));
           $this->updateCache();
         }
       }
@@ -272,10 +272,10 @@ class Translator extends ConfigEntityBase implements TranslatorInterface {
    * {@inheritdoc}
    */
   public function getSupportedLanguagePairs() {
-    if ($controller = $this->getPlugin()) {
+    if ($plugin = $this->getPlugin()) {
       if (isset($this->pluginInfo['cache languages']) && empty($this->pluginInfo['cache languages'])) {
         // This plugin doesn't support language caching.
-        return $controller->getSupportedLanguagePairs($this);
+        return $plugin->getSupportedLanguagePairs($this);
       }
       else {
         // Retrieve the supported languages from the cache.
@@ -285,7 +285,7 @@ class Translator extends ConfigEntityBase implements TranslatorInterface {
         // Even if we successfully queried the cache data might not be yet
         // available.
         if (empty($this->languagePairsCache)) {
-          $this->languagePairsCache = $controller->getSupportedLanguagePairs($this);
+          $this->languagePairsCache = $plugin->getSupportedLanguagePairs($this);
           $this->updateCache();
         }
       }
@@ -307,8 +307,8 @@ class Translator extends ConfigEntityBase implements TranslatorInterface {
    * {@inheritdoc}
    */
   public function canTranslate(JobInterface $job) {
-    if ($controller = $this->getPlugin()) {
-      return $controller->canTranslate($this, $job);
+    if ($plugin = $this->getPlugin()) {
+      return $plugin->canTranslate($this, $job);
     }
     return FALSE;
   }
@@ -317,8 +317,8 @@ class Translator extends ConfigEntityBase implements TranslatorInterface {
    * {@inheritdoc}
    */
   public function isAvailable() {
-    if ($controller = $this->getPlugin()) {
-      return $controller->isAvailable($this);
+    if ($plugin = $this->getPlugin()) {
+      return $plugin->isAvailable($this);
     }
     return FALSE;
   }
@@ -327,8 +327,8 @@ class Translator extends ConfigEntityBase implements TranslatorInterface {
    * {@inheritdoc}
    */
   public function hasCheckoutSettings(JobInterface $job) {
-    if ($controller = $this->getPlugin()) {
-      return $controller->hasCheckoutSettings($job);
+    if ($plugin = $this->getPlugin()) {
+      return $plugin->hasCheckoutSettings($job);
     }
     return FALSE;
   }
@@ -337,8 +337,8 @@ class Translator extends ConfigEntityBase implements TranslatorInterface {
    * {@inheritdoc}
    */
   public function getNotAvailableReason() {
-    if ($controller = $this->getPlugin()) {
-      return $controller->getNotAvailableReason($this);
+    if ($plugin = $this->getPlugin()) {
+      return $plugin->getNotAvailableReason($this);
     }
     return FALSE;
   }
@@ -347,8 +347,8 @@ class Translator extends ConfigEntityBase implements TranslatorInterface {
    * {@inheritdoc}
    */
   public function getNotCanTranslateReason(JobInterface $job) {
-    if ($controller = $this->getPlugin()) {
-      return $controller->getNotCanTranslateReason($job);
+    if ($plugin = $this->getPlugin()) {
+      return $plugin->getNotCanTranslateReason($job);
     }
     return FALSE;
   }
@@ -417,8 +417,8 @@ class Translator extends ConfigEntityBase implements TranslatorInterface {
    * Updates the language cache.
    */
   protected function updateCache() {
-    if ($controller = $this->getPlugin()) {
-      $info = $controller->getPluginDefinition();
+    if ($plugin = $this->getPlugin()) {
+      $info = $plugin->getPluginDefinition();
       if (!isset($info['language cache']) || !empty($info['language cache'])) {
         \Drupal::cache('data')->set('tmgmt_languages:' . $this->name, $this->languageCache, Cache::PERMANENT, $this->getEntityType()->getListCacheTags());
         \Drupal::cache('data')->set('tmgmt_language_pairs:' . $this->name, $this->languagePairsCache, Cache::PERMANENT, $this->getEntityType()->getListCacheTags());
diff --git a/src/Tests/PluginsTest.php b/src/Tests/PluginsTest.php
index 3474f09..bf1650b 100644
--- a/src/Tests/PluginsTest.php
+++ b/src/Tests/PluginsTest.php
@@ -170,7 +170,7 @@ class PluginsTest extends TMGMTKernelTestBase {
    * Tests escaping and unescaping text.
    */
   function testEscaping() {
-    $controller = $this->default_translator->getPlugin();
+    $plugin = $this->default_translator->getPlugin();
 
     $tests = array(
       array(
@@ -219,12 +219,12 @@ class PluginsTest extends TMGMTKernelTestBase {
     );
 
     foreach ($tests as $test) {
-      $escaped = $controller->escapeText($test['item']);
+      $escaped = $plugin->escapeText($test['item']);
       // Assert that the string was escaped as expected.
       $this->assertEqual($escaped, $test['expected']);
 
       // Assert that the string is the same as the original when unescaped.
-      $this->assertEqual($controller->unescapeText($escaped), $test['item']['#text']);
+      $this->assertEqual($plugin->unescapeText($escaped), $test['item']['#text']);
     }
   }
 }
diff --git a/src/TranslatorPluginUiBase.php b/src/TranslatorPluginUiBase.php
index a0fd9f3..08906e0 100644
--- a/src/TranslatorPluginUiBase.php
+++ b/src/TranslatorPluginUiBase.php
@@ -26,10 +26,10 @@ class TranslatorPluginUiBase extends ComponentPluginBase implements TranslatorPl
    */
   public function pluginSettingsForm(array $form, FormStateInterface $form_state, TranslatorInterface $translator, $busy = FALSE) {
 
-    $controller = $translator->getPlugin();
+    $plugin = $translator->getPlugin();
     // If current translator is configured to provide remote language mapping
     // provide the form to configure mappings, unless it does not exists yet.
-    if (!empty($controller) && $translator->providesRemoteLanguageMappings()) {
+    if (!empty($plugin) && $translator->providesRemoteLanguageMappings()) {
 
       $form['remote_languages_mappings'] = array(
         '#tree' => TRUE,
@@ -40,7 +40,7 @@ class TranslatorPluginUiBase extends ComponentPluginBase implements TranslatorPl
       );
 
       $options = array();
-      foreach ($controller->getSupportedRemoteLanguages($translator) as $language) {
+      foreach ($plugin->getSupportedRemoteLanguages($translator) as $language) {
         $options[$language] = $language;
       }
 
diff --git a/tmgmt.module b/tmgmt.module
index 20046b1..70af0f2 100644
--- a/tmgmt.module
+++ b/tmgmt.module
@@ -705,7 +705,7 @@ function tmgmt_translation_review_form_update_state(array $form, FormStateInterf
   $job_item = $form_state->getFormObject()->getEntity();
 
   /** @var \Drupal\tmgmt\JobItemInterface $job_item */
-  $controller = $job_item->getTranslatorPlugin();
+  $plugin = $job_item->getTranslatorPlugin();
   $success = TRUE;
   switch ($matches['action']) {
     case 'reviewed':
@@ -731,7 +731,7 @@ function tmgmt_translation_review_form_update_state(array $form, FormStateInterf
       }
       else {
         $form_state->setRedirectUrl(Url::fromUri('base:' . tmgmt_redirect_queue_dequeue(), array('query' => array('destination' => tmgmt_redirect_queue_destination()))));
-        if ($controller instanceof TranslatorRejectDataInterface) {
+        if ($plugin instanceof TranslatorRejectDataInterface) {
           $success = $job_item->getTranslatorController()->rejectDataItem($job_item, \Drupal::service('tmgmt.data')->ensureArrayKey($matches['key']), $values);
         }
       }
diff --git a/translators/tmgmt_file/tmgmt_file.drush.inc b/translators/tmgmt_file/tmgmt_file.drush.inc
index 47f0641..7c7f5f3 100644
--- a/translators/tmgmt_file/tmgmt_file.drush.inc
+++ b/translators/tmgmt_file/tmgmt_file.drush.inc
@@ -54,9 +54,9 @@ function drush_tmgmt_file_tmgmt_translate_import($name = NULL) {
     $files = array($name => (object)array('name' => basename($name)));
   }
 
-  $controller = \Drupal::service('plugin.manager.tmgmt_file.format')->createInstance('xlf');
+  $plugin = \Drupal::service('plugin.manager.tmgmt_file.format')->createInstance('xlf');
   foreach ($files as $path => $info) {
-    $job = $controller->validateImport($path);
+    $job = $plugin->validateImport($path);
     if (empty($job)) {
       drush_log(dt('No translation job found for @filename.', array('@filename' => $info->name)), 'error');
       continue;
@@ -69,7 +69,7 @@ function drush_tmgmt_file_tmgmt_translate_import($name = NULL) {
 
     try {
       // Validation successful, start import.
-      $job->addTranslatedData($controller->import($path));
+      $job->addTranslatedData($plugin->import($path));
       drush_log(dt('Successfully imported file @filename for translation job @name (#@id).', array('@filename' => $info->name, '@name' => $job->label(), '@id' => $job->id())), 'success');
     }
     catch (Exception $e) {
diff --git a/translators/tmgmt_file/tmgmt_file.module b/translators/tmgmt_file/tmgmt_file.module
index 7e3c98a..b84336a 100644
--- a/translators/tmgmt_file/tmgmt_file.module
+++ b/translators/tmgmt_file/tmgmt_file.module
@@ -33,10 +33,10 @@ function tmgmt_file_import_form_submit(array $form, FormStateInterface $form_sta
   $supported_formats = array_keys(Drupal::service('plugin.manager.tmgmt_file.format')->getDefinitions());
   if ($file = file_save_upload('file', array('file_validate_extensions' => array(implode(' ', $supported_formats))), FALSE, 0)) {
     $extension = pathinfo($file->getFileUri(), PATHINFO_EXTENSION);
-    $controller = \Drupal::service('plugin.manager.tmgmt_file.format')->createInstance($extension);
-    if ($controller) {
+    $plugin = \Drupal::service('plugin.manager.tmgmt_file.format')->createInstance($extension);
+    if ($plugin) {
       // Validate the file on job.
-      $validated_job = $controller->validateImport($file->getFileUri(), $job);
+      $validated_job = $plugin->validateImport($file->getFileUri(), $job);
       if (!$validated_job) {
         $job->addMessage('Failed to validate file, import aborted.', array(), 'error');
       }
@@ -49,7 +49,7 @@ function tmgmt_file_import_form_submit(array $form, FormStateInterface $form_sta
       else {
         try {
           // Validation successful, start import.
-          $job->addTranslatedData($controller->import($file->getFileUri()));
+          $job->addTranslatedData($plugin->import($file->getFileUri()));
           $job->addMessage('Successfully imported file.');
         } catch (Exception $e) {
           $job->addMessage('File import failed with the following message: @message', array('@message' => $e->getMessage()), 'error');