diff --git a/classes/class.modrewrite.php b/classes/class.modrewrite.php
index 971bc16..114f762 100644
--- a/classes/class.modrewrite.php
+++ b/classes/class.modrewrite.php
@@ -155,7 +155,7 @@ class ModRewrite extends ModRewriteBase {
         $iCatId = (int) $iCatId;
 
         // get websafe name
-        $sNewName = cApiStrCleanURLCharacters(conHtmlEntityDecode($sName));
+        $sNewName = cApiStrCleanURLCharacters(clHtmlEntityDecode($sName));
 
         // remove double or more separators
         $sNewName = mr_removeMultipleChars('-', $sNewName);
@@ -196,7 +196,7 @@ class ModRewrite extends ModRewriteBase {
         $iLangId = (int) $iLangId;
 
         // create websafe name
-        $sNewName = cApiStrCleanURLCharacters(conHtmlEntityDecode($sName));
+        $sNewName = cApiStrCleanURLCharacters(clHtmlEntityDecode($sName));
 
         // remove double or more separators
         $sNewName = mr_removeMultipleChars('-', $sNewName);
diff --git a/classes/controller/class.modrewrite_content_controller.php b/classes/controller/class.modrewrite_content_controller.php
index a26b415..4b55d49 100644
--- a/classes/controller/class.modrewrite_content_controller.php
+++ b/classes/controller/class.modrewrite_content_controller.php
@@ -81,7 +81,7 @@ class ModRewrite_ContentController extends ModRewrite_ControllerAbstract {
                     $this->_oView->rootdir_error = $this->_notifyBox('warning', $sMsg);
                 }
             }
-            $this->_oView->rootdir = conHtmlentities($request['rootdir']);
+            $this->_oView->rootdir = clHtmlEntities($request['rootdir']);
             $aMR['cl-mod-rewrite']['rootdir'] = $request['rootdir'];
         }
 
@@ -242,13 +242,13 @@ class ModRewrite_ContentController extends ModRewrite_ControllerAbstract {
             $bError = true;
         }
 
-        $this->_oView->category_separator = conHtmlentities($categorySeperator);
+        $this->_oView->category_separator = clHtmlEntities($categorySeperator);
         $aMR['cl-mod-rewrite']['category_seperator'] = $categorySeperator;
-        $this->_oView->category_word_separator = conHtmlentities($categoryWordSeperator);
+        $this->_oView->category_word_separator = clHtmlEntities($categoryWordSeperator);
         $aMR['cl-mod-rewrite']['category_word_seperator'] = $categoryWordSeperator;
-        $this->_oView->article_separator = conHtmlentities($articleSeperator);
+        $this->_oView->article_separator = clHtmlEntities($articleSeperator);
         $aMR['cl-mod-rewrite']['article_seperator'] = $articleSeperator;
-        $this->_oView->article_word_separator = conHtmlentities($articleWordSeperator);
+        $this->_oView->article_word_separator = clHtmlEntities($articleWordSeperator);
         $aMR['cl-mod-rewrite']['article_word_seperator'] = $articleWordSeperator;
 
         // file extension
@@ -258,7 +258,7 @@ class ModRewrite_ContentController extends ModRewrite_ControllerAbstract {
                 $this->_oView->file_extension_error = $this->_notifyBox('error', $sMsg);
                 $bError = true;
             }
-            $this->_oView->file_extension = conHtmlentities($request['file_extension']);
+            $this->_oView->file_extension = clHtmlEntities($request['file_extension']);
             $aMR['cl-mod-rewrite']['file_extension'] = $request['file_extension'];
         } else {
             $this->_oView->file_extension = '.html';
@@ -293,7 +293,7 @@ class ModRewrite_ContentController extends ModRewrite_ControllerAbstract {
                     $this->_oView->add_startart_name_to_url_error = $this->_notifyBox('error', $sMsg);
                     $bError = true;
                 }
-                $this->_oView->default_startart_name = conHtmlentities($request['default_startart_name']);
+                $this->_oView->default_startart_name = clHtmlEntities($request['default_startart_name']);
                 $aMR['cl-mod-rewrite']['default_startart_name'] = $request['default_startart_name'];
             } else {
                 $this->_oView->default_startart_name = '';
@@ -335,7 +335,7 @@ class ModRewrite_ContentController extends ModRewrite_ControllerAbstract {
                 }
                 $aRouting[$routingDef[0]] = $routingDef[1];
             }
-            $this->_oView->rewrite_routing = conHtmlentities($request['rewrite_routing']);
+            $this->_oView->rewrite_routing = clHtmlEntities($request['rewrite_routing']);
             $aMR['cl-mod-rewrite']['routing'] = $aRouting;
         } else {
             $this->_oView->rewrite_routing = '';