diff --git a/Admin/Installer.php b/Admin/Installer.php
index bb471f0..7415ea3 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -15,11 +15,9 @@ declare(strict_types=1);
 namespace Modules\Tag\Admin;
 
 use phpOMS\Application\ApplicationAbstract;
-use phpOMS\Config\SettingsInterface;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Module\InstallerAbstract;
-use phpOMS\Module\ModuleInfo;
 use phpOMS\System\File\PathException;
 
 /**
@@ -85,7 +83,7 @@ final class Installer extends InstallerAbstract
             $request->setData('color', $tag['color'] ?? '#3697db');
 
             if (!empty($tag['l11n'])) {
-                $request->setData('title', \reset($tag['l11n']));
+                $request->setData('content', \reset($tag['l11n']));
                 $request->setData('lang', \array_keys($tag['l11n'])[0] ?? 'en');
             }
 
@@ -110,9 +108,9 @@ final class Installer extends InstallerAbstract
                 $request  = new HttpRequest();
 
                 $request->header->account = 1;
-                $request->setData('title', $l11n);
+                $request->setData('content', $l11n);
                 $request->setData('lang', $language);
-                $request->setData('type', $id);
+                $request->setData('ref', $id);
 
                 $module->apiTagL11nCreate($request, $response);
             }
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 0523ac5..cc2d22b 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -48,7 +48,7 @@ final class ApiController extends Controller
     private function validateTagCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['title'] = !$request->hasData('title'))
+        if (($val['name'] = !$request->hasData('name'))
             || ($val['color'] = ($request->hasData('color')
                 && (!\ctype_xdigit(\ltrim((string) $request->getData('color'), '#'))
                     || \stripos((string) $request->getData('color'), '#') !== 0)))
@@ -93,7 +93,7 @@ final class ApiController extends Controller
      */
     private function updateTagFromRequest(RequestAbstract $request, Tag $new) : Tag
     {
-        $new->setL11n($request->getDataString('title') ?? $new->getL11n());
+        $new->setL11n($request->getDataString('content') ?? $new->getL11n());
         $new->color = \str_pad($request->getDataString('color') ?? $new->color, 9, 'ff', \STR_PAD_RIGHT);
 
         return $new;
@@ -138,8 +138,8 @@ final class ApiController extends Controller
     private function validateTagL11nCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['title'] = !$request->hasData('title'))
-            || ($val['tag'] = !$request->hasData('tag'))
+        if (($val['content'] = !$request->hasData('content'))
+            || ($val['ref'] = !$request->hasData('ref'))
         ) {
             return $val;
         }
@@ -192,7 +192,7 @@ final class ApiController extends Controller
             if (isset($tag['id'])) {
                 $tags[] = new NullTag((int) $tag['id']);
             } else {
-                $request->setData('title', $tag['title'], true);
+                $request->setData('name', $tag['name'], true);
                 $request->setData('color', $tag['color'], true);
                 $request->setData('icon', $tag['icon'] ?? null, true);
                 $request->setData('language', $tag['language'], true);
@@ -228,7 +228,7 @@ final class ApiController extends Controller
         $tag->icon  = $request->getDataString('icon') ?? '';
 
         $tag->setL11n(
-            $request->getDataString('title') ?? '',
+            $request->getDataString('content') ?? '',
             ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language
         );
 
@@ -247,9 +247,9 @@ final class ApiController extends Controller
     private function createTagL11nFromRequest(RequestAbstract $request) : BaseStringL11n
     {
         $tagL11n           = new BaseStringL11n();
-        $tagL11n->ref      = $request->getDataInt('tag') ?? 0;
+        $tagL11n->ref      = $request->getDataInt('ref') ?? 0;
         $tagL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
-        $tagL11n->content  = $request->getDataString('title') ?? '';
+        $tagL11n->content  = $request->getDataString('content') ?? '';
 
         return $tagL11n;
     }
@@ -366,7 +366,7 @@ final class ApiController extends Controller
     public function updateTagL11nFromRequest(RequestAbstract $request, BaseStringL11n $new) : BaseStringL11n
     {
         $new->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $new->language;
-        $new->content  = $request->getDataString('title') ?? $new->content;
+        $new->content  = $request->getDataString('content') ?? $new->content;
 
         return $new;
     }
diff --git a/Theme/Backend/tag-view.tpl.php b/Theme/Backend/tag-view.tpl.php
index edcf134..2a2b9b9 100644
--- a/Theme/Backend/tag-view.tpl.php
+++ b/Theme/Backend/tag-view.tpl.php
@@ -74,7 +74,7 @@ echo $this->data['nav']->render(); ?>
 
                     <div class="form-group">
                         <label for="iTitle"><?= $this->getHtml('Title'); ?></label>
-                        <input type="text" id="iTitle" name="title" value="<?= $this->printHtml($tag->getL11n()); ?>"<?= $isNew ? ' required' : ' disabled'; ?>>
+                        <input type="text" id="iTitle" name="content" value="<?= $this->printHtml($tag->getL11n()); ?>"<?= $isNew ? ' required' : ' disabled'; ?>>
                     </div>
 
                     <div class="form-group">
@@ -102,7 +102,8 @@ echo $this->data['nav']->render(); ?>
     <?= $this->data['l11nView']->render(
         $this->data['l11nValues'],
         [],
-        '{/api}tag/l11n?csrf={$CSRF}'
+        '{/api}tag/l11n?csrf={$CSRF}',
+        (string) $tag->id
     );
     ?>
 </div>