diff --git a/IntelliSenseHelper.php b/IntelliSenseHelper.php
index 49fb87d..378cda5 100644
--- a/IntelliSenseHelper.php
+++ b/IntelliSenseHelper.php
@@ -27,11 +27,11 @@ namespace D3\ManufacturerInformation\Modules\Application\Model{
     }
 }
 
-namespace D3\ManufacturerInformation\Modules\Application\Component\Widgets{
+namespace D3\ManufacturerInformation\Modules\Core{
 
-    use OxidEsales\Eshop\Application\Component\Widget\ArticleDetails;
+    use OxidEsales\Eshop\Core\Config;
 
-    class ArticleDetailsManufacturer_parent extends ArticleDetails
+    class ManufacturerConfig_parent extends Config
     {
     }
 }
diff --git a/Modules/Application/Model/ManufacturerInfoList.php b/Modules/Application/Model/ManufacturerInfoList.php
index f2ad45e..8de9883 100644
--- a/Modules/Application/Model/ManufacturerInfoList.php
+++ b/Modules/Application/Model/ManufacturerInfoList.php
@@ -33,7 +33,7 @@ class ManufacturerInfoList extends ManufacturerInfoList_parent
     {
         parent::addCategoryFields($oManufacturer);
 
-        if (Registry::getConfig()->getConfigParam('d3manufacturerinformation_showManufacturertextOnManufacturerPage')) {
+        if (Registry::getConfig()->d3GetBoolModuleSettingByName('_showManufacturertextOnManufacturerPage')) {
             $oManufacturer->oxcategories__oxlongdesc = new Field(
                 html_entity_decode(
                     $oManufacturer->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME) ?? ''
diff --git a/Modules/Application/Component/Widgets/ArticleDetailsManufacturer.php b/Modules/Core/ManufacturerConfig.php
similarity index 87%
rename from Modules/Application/Component/Widgets/ArticleDetailsManufacturer.php
rename to Modules/Core/ManufacturerConfig.php
index 0bcf1f0..f897878 100644
--- a/Modules/Application/Component/Widgets/ArticleDetailsManufacturer.php
+++ b/Modules/Core/ManufacturerConfig.php
@@ -15,13 +15,13 @@
 
 declare(strict_types=1);
 
-namespace D3\ManufacturerInformation\Modules\Application\Component\Widgets;
+namespace D3\ManufacturerInformation\Modules\Core;
 
 use D3\ManufacturerInformation\Application\Model\Constants;
 use OxidEsales\EshopCommunity\Core\Di\ContainerFacade;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Facade\ModuleSettingServiceInterface;
 
-class ArticleDetailsManufacturer extends ArticleDetailsManufacturer_parent
+class ManufacturerConfig extends ManufacturerConfig_parent
 {
     /**
      * @param string $sName
diff --git a/metadata.php b/metadata.php
index 4396a94..7ffdf84 100644
--- a/metadata.php
+++ b/metadata.php
@@ -17,12 +17,12 @@ declare(strict_types=1);
 
 use D3\ManufacturerInformation\Application\Controller\Admin\ManufacturerInfoLongdesc;
 use D3\ManufacturerInformation\Application\Model\Constants;
-use D3\ManufacturerInformation\Modules\Application\Component\Widgets\ArticleDetailsManufacturer;
 use D3\ManufacturerInformation\Modules\Application\Model\D3ManufacturerLongDesc;
 use D3\ManufacturerInformation\Modules\Application\Model\ManufacturerInfoList;
-use OxidEsales\Eshop\Application\Component\Widget\ArticleDetails as OEArticleDetails;
+use D3\ManufacturerInformation\Modules\Core\ManufacturerConfig;
 use OxidEsales\Eshop\Application\Model\Manufacturer as OEManufacturer;
 use OxidEsales\Eshop\Application\Model\ManufacturerList as OEManufacturerList;
+use OxidEsales\Eshop\Core\Config as OEConfig;
 
 $sMetadataVersion = '2.1';
 $sModuleId = Constants::OXID_MODULE_ID;
@@ -50,7 +50,7 @@ $aModule = [
     'extend'      => [
         OEManufacturer::class => D3ManufacturerLongDesc::class,
         OEManufacturerList::class => ManufacturerInfoList::class,
-        OEArticleDetails::class => ArticleDetailsManufacturer::class,
+        OEConfig::class => ManufacturerConfig::class,
     ],
     'templates'   => [
         '@' . Constants::OXID_MODULE_ID . '/admin/d3manufacturerlongdesc.tpl'        => 'views/smarty/admin/d3manufacturerlongdesc.tpl',
diff --git a/views/twig/extensions/themes/default/page/details/inc/accordeon.html.twig b/views/twig/extensions/themes/default/page/details/inc/accordeon.html.twig
index 24538b4..4b2c2c6 100644
--- a/views/twig/extensions/themes/default/page/details/inc/accordeon.html.twig
+++ b/views/twig/extensions/themes/default/page/details/inc/accordeon.html.twig
@@ -7,7 +7,7 @@
     {% set sShopURL = config.getConfigParam('sShopURL') %}
     {% set description = oManufacturer.d3GetLongdesc() %}
 
-    {% if oManufacturer and oView.d3GetBoolModuleSettingByName('_showManufacturertextOnDetailsPage') and description|striptags|trim %}
+    {% if oManufacturer and config.d3GetBoolModuleSettingByName('_showManufacturertextOnDetailsPage') and description|striptags|trim %}
         <div class="col-12 col-md-6">
             <div id="manufacturer-collapsible" class="h4" data-bs-target="#manufacturer" data-bs-toggle="collapse" role="button" aria-expanded="false" aria-controls="manufacturer">
                 {{ translate({ ident: "D3_MANUFACTURERINFO_TAB" }) }}