diff --git a/core/lib/Drupal/Component/Utility/EscapedString.php b/core/lib/Drupal/Component/Render/EscapedMarkup.php
similarity index 68%
rename from core/lib/Drupal/Component/Utility/EscapedString.php
rename to core/lib/Drupal/Component/Render/EscapedMarkup.php
index 9a3dcd8..a6fd863 100644
--- a/core/lib/Drupal/Component/Utility/EscapedString.php
+++ b/core/lib/Drupal/Component/Render/EscapedMarkup.php
@@ -2,17 +2,20 @@
 
 /**
  * @file
- * Contains \Drupal\Component\Utility\EscapedString.
+ * Contains \Drupal\Component\Render\EscapedMarkup.
  */
 
-namespace Drupal\Component\Utility;
+namespace Drupal\Component\Render;
+
+use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\Unicode;
 
 /**
- * Escapes a string for HTML display.
+ * Escapes a string for display in markup.
  *
  * @ingroup sanitization
  */
-class EscapedString implements EscapedStringInterface {
+class EscapedMarkup implements EscapedMarkupInterface {
 
   /**
    * The string to escape.
@@ -22,7 +25,7 @@ class EscapedString implements EscapedStringInterface {
   protected $string;
 
   /**
-   * Constructs an EscapedString object.
+   * Constructs an EscapedMarkup object.
    *
    * @param $string
    *   The string to escape. This value will be cast to a string.
diff --git a/core/lib/Drupal/Component/Render/EscapedMarkupInterface.php b/core/lib/Drupal/Component/Render/EscapedMarkupInterface.php
new file mode 100644
index 0000000..7efc291
--- /dev/null
+++ b/core/lib/Drupal/Component/Render/EscapedMarkupInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Component\Render\EscapedMarkupInterface.
+ */
+
+namespace Drupal\Component\Render;
+
+/**
+ * Marks an object's __toString() method as returning escaped markup.
+ *
+ * This interface should only be used on objects that emit escaped markup from
+ * their __toString() method. If the output of __toString() contains unescaped
+ * markup, it must not be used.
+ *
+ * @ingroup sanitization
+ *
+ */
+interface EscapedMarkupInterface extends MarkupInterface, \Countable {
+
+  /**
+   * Returns escaped markup.
+   */
+  public function __toString();
+
+}
diff --git a/core/lib/Drupal/Component/Utility/EscapedStringInterface.php b/core/lib/Drupal/Component/Utility/EscapedStringInterface.php
deleted file mode 100644
index 6aed52f..0000000
--- a/core/lib/Drupal/Component/Utility/EscapedStringInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Component\Utility\EscapedStringInterface.
- */
-
-namespace Drupal\Component\Utility;
-
-use Drupal\Component\Render\MarkupInterface;
-
-/**
- * Marks an object's __toString() method as returning escaped HTML.
- *
- * This interface should only be used on objects that emit escaped strings from
- * their __toString() method. If the output of __toString() contains unescaped
- * HTML, it must not be used.
- *
- * @ingroup sanitization
- *
- */
-interface EscapedStringInterface extends MarkupInterface, \Countable {
-
-  /**
-   * Returns an escaped string..
-   */
-  public function __toString();
-
-}
diff --git a/core/lib/Drupal/Component/Utility/SafeMarkup.php b/core/lib/Drupal/Component/Utility/SafeMarkup.php
index 7265119..2a96258 100644
--- a/core/lib/Drupal/Component/Utility/SafeMarkup.php
+++ b/core/lib/Drupal/Component/Utility/SafeMarkup.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Component\Utility;
 
+use Drupal\Component\Render\EscapedMarkup;
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Component\Render\MarkupInterface;
 
@@ -67,8 +68,8 @@ public static function isSafe($string, $strategy = 'html') {
    * @param string $text
    *   The text to be checked or processed.
    *
-   * @return \Drupal\Component\Utility\EscapedStringInterface
-   *   An EscapedString object that escapes when rendered to string.
+   * @return \Drupal\Component\Render\EscapedMarkupInterface
+   *   An EscapedMarkup object that escapes when rendered to string.
    *
    * @ingroup sanitization
    *
@@ -82,7 +83,7 @@ public static function isSafe($string, $strategy = 'html') {
    * @see drupal_validate_utf8()
    */
   public static function checkPlain($text) {
-    return new EscapedString($text);
+    return new EscapedMarkup($text);
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Utility/Token.php b/core/lib/Drupal/Core/Utility/Token.php
index a62a59f..8215837 100644
--- a/core/lib/Drupal/Core/Utility/Token.php
+++ b/core/lib/Drupal/Core/Utility/Token.php
@@ -7,8 +7,9 @@
 
 namespace Drupal\Core\Utility;
 
+use Drupal\Component\Render\EscapedMarkup;
+use Drupal\Component\Render\MarkupInterface;
 use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Cache\CacheBackendInterface;
@@ -207,7 +208,7 @@ public function replace($text, array $data = array(), array $options = array(),
 
     // Escape the tokens, unless they are explicitly markup.
     foreach ($replacements as $token => $value) {
-      $replacements[$token] = SafeMarkup::isSafe($value) ? $value : Html::escape($value);
+      $replacements[$token] = $value instanceof MarkupInterface ? $value : new EscapedMarkup($value);
     }
 
     // Optionally alter the list of replacement values.
diff --git a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php b/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
index f50f4f1..f654fb7 100644
--- a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Tests\Component\Utility;
 
-use Drupal\Component\Utility\EscapedString;
+use Drupal\Component\Render\EscapedMarkup;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Render\MarkupInterface;
 use Drupal\Component\Render\MarkupTrait;
@@ -58,27 +58,27 @@ public function testIsSafe() {
    */
   function testCheckPlain($text, $expected, $message) {
     $result = SafeMarkup::checkPlain($text);
-    $this->assertTrue($result instanceof EscapedString);
+    $this->assertTrue($result instanceof EscapedMarkup);
     $this->assertEquals($expected, $result, $message);
   }
 
   /**
-   * Tests Drupal\Component\Utility\EscapedString.
+   * Tests Drupal\Component\Render\EscapedMarkup.
    *
    * Verifies that the result of SafeMarkup::checkPlain() is the same as
-   * using EscapedString directly.
+   * using EscapedMarkup directly.
    *
    * @dataProvider providerCheckPlain
    *
    * @param string $text
-   *   The text to provide to the EscapedString constructor.
+   *   The text to provide to the EscapedMarkup constructor.
    * @param string $expected
    *   The expected output from the function.
    * @param string $message
    *   The message to provide as output for the test.
    */
   function testEscapeString($text, $expected, $message) {
-    $result = new EscapedString($text);
+    $result = new EscapedMarkup($text);
     $this->assertEquals($expected, $result, $message);
   }