diff --git a/xmlrpc.inc b/xmlrpc.inc
index f470e6e..e3a604e 100644
--- a/xmlrpc.inc
+++ b/xmlrpc.inc
@@ -11,7 +11,7 @@
  * This version is made available under the GNU GPL License.
  */
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Utility\Html;
 use GuzzleHttp\Exception\RequestException;
 
 /**
@@ -126,7 +126,7 @@ function xmlrpc_value_get_xml($xmlrpc_value) {
     case 'struct':
       $return = '<struct>' . "\n";
       foreach ($xmlrpc_value->data as $name => $value) {
-        $return .= "  <member><name>" . SafeMarkup::checkPlain($name) . "</name><value>";
+        $return .= "  <member><name>" . Html::escape($name) . "</name><value>";
         $return .= xmlrpc_value_get_xml($value) . "</value></member>\n";
       }
       $return .= '</struct>';