diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 14358e4..ec93796 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -309,18 +309,9 @@ final class ApiController extends Controller
         }
 
         $category = $this->createWikiCategoryFromRequest($request);
+        $category->setL11n($request->getData('name'), $request->getData('language') ?? $request->getLanguage());
         $this->createModel($request->header->account, $category, WikiCategoryMapper::class, 'category', $request->getOrigin());
 
-        $l11nRequest = new HttpRequest($request->uri);
-        $l11nRequest->setData('category', $category->getId());
-        $l11nRequest->setData('name', $request->getData('name'));
-        $l11nRequest->setData('language', $request->getData('language'));
-
-        $l11nWikiCategory = $this->createWikiCategoryL11nFromRequest($l11nRequest);
-        $this->createModel($request->header->account, $l11nWikiCategory, WikiCategoryL11nMapper::class, 'tag_l11n', $request->getOrigin());
-
-        $category->setName($l11nWikiCategory);
-
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Category', 'Category successfully created.', $category);
     }
 
diff --git a/Models/WikiCategory.php b/Models/WikiCategory.php
index 36ef5a4..3b4804a 100755
--- a/Models/WikiCategory.php
+++ b/Models/WikiCategory.php
@@ -98,9 +98,9 @@ class WikiCategory implements \JsonSerializable
      *
      * @since 1.0.0
      */
-    public function getName() : string
+    public function getL11n() : string
     {
-        return $this->name instanceof WikiCategoryL11n ? $this->name->getName() : $this->name;
+        return $this->name instanceof WikiCategoryL11n ? $this->name->name : $this->name;
     }
 
     /**
@@ -112,7 +112,7 @@ class WikiCategory implements \JsonSerializable
      *
      * @since 1.0.0
      */
-    public function setName($name, string $lang = ISO639x1Enum::_EN) : void
+    public function setL11n($name, string $lang = ISO639x1Enum::_EN) : void
     {
         if ($name instanceof WikiCategoryL11n) {
             $this->name = $name;
diff --git a/Theme/Backend/wiki-category-list.tpl.php b/Theme/Backend/wiki-category-list.tpl.php
index 3355737..681949a 100755
--- a/Theme/Backend/wiki-category-list.tpl.php
+++ b/Theme/Backend/wiki-category-list.tpl.php
@@ -14,7 +14,8 @@ declare(strict_types=1);
 
 use phpOMS\Uri\UriFactory;
 
-$categories = $this->getData('categories');
+/** @var \Modules\Knowledgebase\Models\WikiCategory[] $categories */
+$categories = $this->getData('categories') ?? [];
 
 /** @var \phpOMS\Views\View $this */
 echo $this->getData('nav')->render();
@@ -35,8 +36,8 @@ echo $this->getData('nav')->render();
                         $url = UriFactory::build('{/prefix}admin/account/settings?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
-                    <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
-                    <td data-label="<?= $this->getHtml('Parent'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->parent !== null ? $value->parent->getName() : ''); ?></a>
+                    <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getL11n()); ?></a>
+                    <td data-label="<?= $this->getHtml('Parent'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->parent !== null ? $value->parent->getL11n() : ''); ?></a>
                 <?php endforeach; ?>
                 <?php if (empty($categories)) : ?>
                 <tr><td colspan="3" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
diff --git a/Theme/Backend/wiki-dashboard.tpl.php b/Theme/Backend/wiki-dashboard.tpl.php
index c942918..978c7a9 100755
--- a/Theme/Backend/wiki-dashboard.tpl.php
+++ b/Theme/Backend/wiki-dashboard.tpl.php
@@ -41,7 +41,7 @@ echo $this->getData('nav')->render(); ?>
                     <div class="portlet-foot">
                         <div class="overflowfix">
                             <?php $tags = $doc->getTags(); foreach ($tags as $tag) : ?>
-                                <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= $tag->icon !== null ? '<i class="' . $this->printHtml($tag->icon ?? '') . '"></i>' : ''; ?><?= $this->printHtml($tag->getTitle()); ?></span>
+                                <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= $tag->icon !== null ? '<i class="' . $this->printHtml($tag->icon ?? '') . '"></i>' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span>
                             <?php endforeach; ?>
                             <a href="<?= $url; ?>" class="button floatRight"><?= $this->getHtml('More', '0', '0'); ?></a>
                         </div>
@@ -71,7 +71,7 @@ echo $this->getData('nav')->render(); ?>
             <div class="portlet-body">
                 <ul>
                     <?php foreach ($categories as $category) : ?>
-                        <li><a href="<?= UriFactory::build('{/prefix}wiki/doc/list?{?}&id=' . $category->getId()); ?>"><?= $this->printHtml($category->getName()); ?></a>
+                        <li><a href="<?= UriFactory::build('{/prefix}wiki/doc/list?{?}&id=' . $category->getId()); ?>"><?= $this->printHtml($category->getL11n()); ?></a>
                     <?php endforeach; ?>
                 </ul>
             </div>
diff --git a/Theme/Backend/wiki-doc-single.tpl.php b/Theme/Backend/wiki-doc-single.tpl.php
index bb47b96..1bc73a5 100755
--- a/Theme/Backend/wiki-doc-single.tpl.php
+++ b/Theme/Backend/wiki-doc-single.tpl.php
@@ -46,7 +46,7 @@ echo $this->getData('nav')->render();
                 <div class="row">
                     <div class="col-xs-6 overflowfix">
                         <?php foreach ($tags as $tag) : ?>
-                            <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= $tag->icon !== null ? '<i class="' . $this->printHtml($tag->icon ?? '') . '"></i>' : ''; ?><?= $this->printHtml($tag->getTitle()); ?></span>
+                            <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= $tag->icon !== null ? '<i class="' . $this->printHtml($tag->icon ?? '') . '"></i>' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span>
                         <?php endforeach; ?>
                     </div>
                     <?php if ($editable) : ?>
@@ -66,7 +66,7 @@ echo $this->getData('nav')->render();
             <div class="portlet-body">
                 <ul>
                     <?php foreach ($categories as $category) : ?>
-                        <li><a href="<?= UriFactory::build('{/prefix}wiki/doc/list?{?}&id=' . $category->getId()); ?>"><?= $this->printHtml($category->getName()); ?></a>
+                        <li><a href="<?= UriFactory::build('{/prefix}wiki/doc/list?{?}&id=' . $category->getId()); ?>"><?= $this->printHtml($category->getL11n()); ?></a>
                     <?php endforeach; ?>
                 </ul>
             </div>