diff --git a/sources/locale/src/LocaleSourcePluginUi.php b/sources/locale/src/LocaleSourcePluginUi.php
index f363a13..32f6c6f 100644
--- a/sources/locale/src/LocaleSourcePluginUi.php
+++ b/sources/locale/src/LocaleSourcePluginUi.php
@@ -83,7 +83,7 @@ class LocaleSourcePluginUi extends SourcePluginUiBase {
     $languages = array();
     foreach ($this->getLanguages() as $langcode => $language) {
       $languages['langcode-' . $langcode] = array(
-        'data' => SafeMarkup::checkPlain($language->getName()),
+        'data' => $language->getName(),
       );
     }
 
@@ -231,7 +231,7 @@ class LocaleSourcePluginUi extends SourcePluginUiBase {
 
     $row = array(
       'id' => $data['id'],
-      'source' => SafeMarkup::checkPlain($source->source),
+      'source' => $source->source,
     );
 
 
diff --git a/src/Form/JobAbortForm.php b/src/Form/JobAbortForm.php
index 80d459d..bf5bec9 100644
--- a/src/Form/JobAbortForm.php
+++ b/src/Form/JobAbortForm.php
@@ -50,7 +50,7 @@ class JobAbortForm extends ContentEntityConfirmFormBase {
         if ($text = $message->getMessage()) {
           // We want to persist also the type therefore we will set the
           // messages directly and not return them.
-          drupal_set_message(SafeMarkup::checkPlain($text), $message->getType());
+          drupal_set_message($text, $message->getType());
         }
       }
     }
diff --git a/src/Form/JobForm.php b/src/Form/JobForm.php
index 8eef902..b0bd2c0 100644
--- a/src/Form/JobForm.php
+++ b/src/Form/JobForm.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\tmgmt\Form;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Ajax\ReplaceCommand;
@@ -149,7 +149,7 @@ class JobForm extends TmgmtFormBase {
       $form['info']['translator'] = array(
         '#type' => 'item',
         '#title' => t('Translator'),
-        '#markup' => isset($translators[$job->getTranslatorId()]) ? SafeMarkup::checkPlain($translators[$job->getTranslatorId()]) : t('Missing translator'),
+        '#markup' => isset($translators[$job->getTranslatorId()]) ? Html::escape($translators[$job->getTranslatorId()]) : t('Missing translator'),
         '#prefix' => '<div class="tmgmt-ui-translator tmgmt-ui-info-item">',
         '#suffix' => '</div>',
         '#value' => $job->getTranslatorId(),
diff --git a/src/Form/JobItemForm.php b/src/Form/JobItemForm.php
index d4dd491..fa94d08 100644
--- a/src/Form/JobItemForm.php
+++ b/src/Form/JobItemForm.php
@@ -8,7 +8,7 @@
 namespace Drupal\tmgmt\Form;
 
 use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Url;
 use Drupal\tmgmt\Entity\JobItem;
@@ -94,7 +94,7 @@ class JobItemForm extends TmgmtFormBase {
       $form['info']['translator'] = array(
         '#type' => 'item',
         '#title' => t('Translator'),
-        '#markup' => isset($translators[$item->getJob()->getTranslatorId()]) ? SafeMarkup::checkPlain($translators[$item->getJob()->getTranslatorId()]) : t('Missing translator'),
+        '#markup' => isset($translators[$item->getJob()->getTranslatorId()]) ? Html::escape($translators[$item->getJob()->getTranslatorId()]) : t('Missing translator'),
         '#prefix' => '<div class="tmgmt-ui-translator tmgmt-ui-info-item">',
         '#suffix' => '</div>',
       );
diff --git a/src/SourcePluginUiBase.php b/src/SourcePluginUiBase.php
index 1765b91..375524c 100644
--- a/src/SourcePluginUiBase.php
+++ b/src/SourcePluginUiBase.php
@@ -138,7 +138,7 @@ class SourcePluginUiBase extends PluginBase implements SourcePluginUiInterface {
     $languages = array();
     foreach (\Drupal::languageManager()->getLanguages() as $langcode => $language) {
       $languages['langcode-' . $langcode] = array(
-        'data' => SafeMarkup::checkPlain($language->getName()),
+        'data' => $language->getName(),
       );
     }
 
diff --git a/tmgmt.theme.inc b/tmgmt.theme.inc
index 36aa828..53ec69c 100644
--- a/tmgmt.theme.inc
+++ b/tmgmt.theme.inc
@@ -5,6 +5,7 @@
  * Theme file stub for tmgmt.
  */
 
+use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Template\Attribute;
 use Drupal\Core\Url;
@@ -22,7 +23,7 @@ function theme_tmgmt_element($variables) {
   // Use the #title attribute.
   $title = '';
   if (!empty($element['#title'])) {
-    $title = '<h3>' . SafeMarkup::checkPlain($element['#title']) . '</h3>';
+    $title = '<h3>' . Html::escape($element['#title']) . '</h3>';
   }
 
   // Use #attributes to customize a wrapper <div>.
diff --git a/translators/tmgmt_file/src/FileTranslatorUi.php b/translators/tmgmt_file/src/FileTranslatorUi.php
index 62212b0..a9fc252 100644
--- a/translators/tmgmt_file/src/FileTranslatorUi.php
+++ b/translators/tmgmt_file/src/FileTranslatorUi.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\tmgmt_file;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Utility\Html;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StreamWrapper\StreamWrapperInterface;
 use Drupal\tmgmt\JobInterface;
@@ -47,7 +47,7 @@ class FileTranslatorUi extends TranslatorPluginUiBase {
     // Any visible, writeable wrapper can potentially be used for the files
     // directory, including a remote file system that integrates with a CDN.
     foreach (\Drupal::service('stream_wrapper_manager')->getDescriptions(StreamWrapperInterface::WRITE_VISIBLE) as $scheme => $description) {
-      $options[$scheme] = SafeMarkup::checkPlain($description);
+      $options[$scheme] = Html::escape($description);
     }
 
     if (!empty($options)) {