diff --git a/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php b/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
index b25e419..975c10d 100644
--- a/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
+++ b/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
@@ -168,9 +168,9 @@ public function preRender(&$values);
    *   The values retrieved from a single row of a view's query result.
    *
    * @return string|\Drupal\Component\Utility\SafeStringInterface
-   *   The rendered output. If the output is safe it will be wrapped in a
-   *   \Drupal\Core\Render\SafeString object. If it is empty or unsafe it will
-   *   be a string.
+   *   The rendered output. If the output is safe it will be wrapped in an
+   *   object that implements SafeStringInterface. If it is empty or unsafe it
+   *   will be a string.
    *
    */
   public function render(ResultRow $values);
@@ -206,8 +206,8 @@ public function postRender(ResultRow $row, $output);
    *
    * @return string|\Drupal\Component\Utility\SafeStringInterface
    *   The advanced rendered output. If the output is safe it will be wrapped in
-   *   a \Drupal\Core\Render\SafeString object. If it is empty or unsafe it will
-   *   be a string.
+   *   an object that implements SafeStringInterface. If it is empty or unsafe
+   *   it will be a string.
    *
    */
   public function advancedRender(ResultRow $values);
@@ -241,9 +241,9 @@ public function isValueEmpty($value, $empty_zero, $no_skip_empty = TRUE);
    *     - html: Make sure that the html is correct.
    *
    * @return string|\Drupal\Component\Utility\SafeStringInterface
-   *   The rendered output. If the output is safe it will be wrapped in a
-   *   \Drupal\Core\Render\SafeString object. If it is empty or unsafe it will
-   *   be a string.
+   *   The rendered output. If the output is safe it will be wrapped in an
+   *   object that implements SafeStringInterface. If it is empty or unsafe it
+   *   will be a string.
    */
   public function renderText($alter);
 
@@ -270,8 +270,8 @@ public function getRenderTokens($item);
    *
    * @return string|\Drupal\Component\Utility\SafeStringInterface
    *   Returns rendered output of the given theme implementation. If the output
-   *   is safe it will be wrapped in a \Drupal\Core\Render\SafeString object. If
-   *   it is empty or unsafe it will be a string.
+   *   is safe it will be wrapped in an object that implements
+   *   SafeStringInterface. If it is empty or unsafe it will be a string.
    */
   function theme(ResultRow $values);
 
diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index 067d7ac..e8c4807 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -1251,7 +1251,7 @@ public function renderText($alter) {
       // If we got here then $alter contains the value of "No results text"
       // and so there is nothing left to do.
       if ($value_is_safe) {
-        $value = SafeString::create($value);
+        $value = ViewsRenderPipelineSafeString::create($value);
       }
       return $value;
     }
@@ -1293,7 +1293,7 @@ public function renderText($alter) {
     // Preserve whether or not the string is safe. Since $suffix comes from
     // \Drupal::l(), it is safe to append.
     if ($value_is_safe) {
-      $value = SafeString::create($value . $suffix);
+      $value = ViewsRenderPipelineSafeString::create($value . $suffix);
     }
     $this->last_render_text = $value;
 
@@ -1307,7 +1307,7 @@ public function renderText($alter) {
     // Preserve whether or not the string is safe. Since $suffix comes from
     // \Drupal::l(), it is safe to append.
     if ($value_is_safe) {
-      return SafeString::create($value . $suffix);
+      return ViewsRenderPipelineSafeString::create($value . $suffix);
     }
     else {
       // If the string is not already marked safe, it is still OK to return it