diff --git a/api/src/Etemplate/Widget/HtmlArea.php b/api/src/Etemplate/Widget/HtmlArea.php
index f4a05133a5..264aae0ff9 100644
--- a/api/src/Etemplate/Widget/HtmlArea.php
+++ b/api/src/Etemplate/Widget/HtmlArea.php
@@ -192,9 +192,9 @@ class HtmlArea extends Etemplate\Widget
 	 */
 	public static function contentCss()
 	{
-		$font_family = $GLOBALS['egw_info']['user']['preferences']['common']['rtf_font'] ?? 'arial, helvetica, sans-serif';
-		$font_size = ($GLOBALS['egw_info']['user']['preferences']['common']['rtf_font_size'] ?? '10').
-			($GLOBALS['egw_info']['user']['preferences']['common']['rtf_font_unit'] ?? 'pt');
+		$font_family = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'] ?? 'arial, helvetica, sans-serif';
+		$font_size = ($GLOBALS['egw_info']['user']['preferences']['common']['rte_font_size'] ?? '10').
+			($GLOBALS['egw_info']['user']['preferences']['common']['rte_font_unit'] ?? 'pt');
 
 		return <<<EOF
 /**
diff --git a/api/tinymce.php b/api/tinymce.php
index a4a31267a1..feee00bc6f 100644
--- a/api/tinymce.php
+++ b/api/tinymce.php
@@ -28,7 +28,7 @@ $GLOBALS['egw']->session->commit_session();
 
 // use an etag over user prefs and modification time of HtmlArea
 $etag = '"'.md5(json_encode(array_intersect_key($GLOBALS['egw_info']['user']['preferences']['common'],
-	array_flip(['rtf_font', 'rtf_font_size', 'rtf_font_unit']))).filemtime(__DIR__.'/src/Etemplate/Widget/HtmlArea.php')).'"';
+	array_flip(['rte_font', 'rte_font_size', 'rte_font_unit']))).filemtime(__DIR__.'/src/Etemplate/Widget/HtmlArea.php')).'"';
 
 // headers to allow caching, egw_framework specifies etag on url to force reload, even with Expires header
 Api\Session::cache_control(86400);	// cache for 1 day