diff --git a/Application/Controller/Admin/ManufacturerInfoLongdesc.php b/Application/Controller/Admin/ManufacturerInfoLongdesc.php
index c02b49d..785795c 100644
--- a/Application/Controller/Admin/ManufacturerInfoLongdesc.php
+++ b/Application/Controller/Admin/ManufacturerInfoLongdesc.php
@@ -47,7 +47,7 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
 			}
 		}
 		
-		$this->_aViewData["editor"] = $this->generateTextEditor("100%", 280, $oManufacturer, "oxmanufacturers__D3DESCRIPTION", "list.tpl.css");
+		$this->_aViewData["editor"] = $this->generateTextEditor("100%", 280, $oManufacturer, "oxmanufacturers__d3description", "list.tpl.css");
 		
 		return "d3manufacturerlongdesc.tpl";
 	}
@@ -110,7 +110,7 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
 	 */
 	public function d3GetLongdescParamValue() :string
 	{
-		return (string) $aParams = Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__D3DESCRIPTION'];
+		return (string) $aParams = Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__d3description'];
 	}
 	
 	/**
diff --git a/Application/Model/Constants.php b/Application/Model/Constants.php
index 62ff474..26e85ab 100644
--- a/Application/Model/Constants.php
+++ b/Application/Model/Constants.php
@@ -10,5 +10,5 @@ class Constants
 	public const OXID_MODULE_ID = 'd3manufacturerinformation';
 	
 	// Tables and Database
-	public const D3_OXMANUFACTURERS_LONGDESC_FIELDNAME = 'D3DESCRIPTION';
+	public const D3_OXMANUFACTURERS_LONGDESC_FIELDNAME = 'd3description';
 }
\ No newline at end of file
diff --git a/Application/views/admin/tpl/d3manufacturer_longdesc.tpl b/Application/views/admin/tpl/d3manufacturer_longdesc.tpl
index 9585f55..dafb7f4 100644
--- a/Application/views/admin/tpl/d3manufacturer_longdesc.tpl
+++ b/Application/views/admin/tpl/d3manufacturer_longdesc.tpl
@@ -25,7 +25,7 @@
     <input type="hidden" name="editlanguage" value="[{$editlanguage}]">
 </form>
 
-<form name="myedit" id="myedit" action="[{$oViewConf->getSelfLink()}]" method="post" onSubmit="copyLongDesc( 'oxmanufacturers__D3DESCRIPTION' );" style="padding: 0px;margin: 0px;height:0px;">
+<form name="myedit" id="myedit" action="[{$oViewConf->getSelfLink()}]" method="post" onSubmit="copyLongDesc( 'oxmanufacturers__d3description' );" style="padding: 0;margin: 0;height:0;">
     [{$oViewConf->getHiddenSid()}]
     <input type="hidden" name="cl" value="d3manufacturerinfolongdesc">
     <input type="hidden" name="fnc" value="">
@@ -33,7 +33,7 @@
     <input type="hidden" name="voxid" value="[{$oxid}]">
     <input type="hidden" name="editval[oxmanufacturers__oxid]" value="[{$oxid}]">
     <input type="hidden" name="catlang" value="[{$catlang}]">
-    <input type="hidden" name="editval[oxmanufacturers__D3DESCRIPTION]" value="">
+    <input type="hidden" name="editval[oxmanufacturers__d3description]" value="">
 
     [{include file="include/category_text_editor.tpl"}]
 </form>
diff --git a/Application/views/blocks/page/details/inc/details_tabs_invite.html.tpl b/Application/views/blocks/page/details/inc/details_tabs_invite.html.tpl
index 46d7321..af74500 100644
--- a/Application/views/blocks/page/details/inc/details_tabs_invite.html.tpl
+++ b/Application/views/blocks/page/details/inc/details_tabs_invite.html.tpl
@@ -1,14 +1,15 @@
 [{$smarty.block.parent}]
 
-[{assign var="oConfig" value=$oViewConf->getConfig()}]
+[{assign var="oConfig"       value=$oViewConf->getConfig()}]
 [{assign var="oManufacturer" value=$oView->getManufacturer()}]
 [{assign var="sShopURL"      value=$oConfig->getConfigParam('sShopURL')}]
+[{assign var="description"   value=$oManufacturer->d3GetLongdesc()}]
 
-[{if $oManufacturer && $oConfig->getConfigParam('d3manufacturerinformation_showManufacturertextOnDetailsPage') && $oManufacturer->d3GetLongdesc()}]
+[{if $oManufacturer && $oConfig->getConfigParam('d3manufacturerinformation_showManufacturertextOnDetailsPage') && $description->value}]
     [{capture append="tabs"}]<a href="#manufacturertab" data-toggle="tab">[{oxmultilang ident="MANUFACTURER"}]</a>[{/capture}]
     [{capture append="tabsContent"}]
         <div id="manufacturertab" class="tab-pane[{if $blFirstTab}] active[{/if}]">
-            [{oxeval var=$oManufacturer->d3GetLongdesc()}]
+            [{oxeval var=$description}]
         </div>
         [{assign var="blFirstTab" value=false}]
     [{/capture}]
diff --git a/Modules/Application/Model/D3ManufacturerLongDesc.php b/Modules/Application/Model/D3ManufacturerLongDesc.php
index cfaefcb..de7beee 100644
--- a/Modules/Application/Model/D3ManufacturerLongDesc.php
+++ b/Modules/Application/Model/D3ManufacturerLongDesc.php
@@ -7,6 +7,7 @@ namespace D3\ManufacturerInformation\Modules\Application\Model;
 
 use D3\ManufacturerInformation\Application\Model\Constants;
 use OxidEsales\Eshop\Application\Model\Manufacturer;
+use OxidEsales\Eshop\Core\Field;
 use OxidEsales\Eshop\Core\Registry;
 
 class D3ManufacturerLongDesc extends D3ManufacturerLongDesc_parent
@@ -30,10 +31,11 @@ class D3ManufacturerLongDesc extends D3ManufacturerLongDesc_parent
 	}
 	
 	/**
-	 * @return string
+	 * @return Field
 	 */
-	public function d3GetLongdesc(): string
+	public function d3GetLongdesc(): Field
 	{
-		return $this->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME);
+        $longName = $this->getCoreTableName().'__'.strtolower(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME);
+		return $this->$longName;
 	}
 }
\ No newline at end of file