diff --git a/src/IntelliSenseHelper.php b/src/IntelliSenseHelper.php
index 19f2f44..d830f1c 100644
--- a/src/IntelliSenseHelper.php
+++ b/src/IntelliSenseHelper.php
@@ -15,14 +15,14 @@
  * @link      http://www.oxidmodule.com
  */
 
-namespace D3\Modules\AttributeMultiValues\Application\Controllers\Admin {
+namespace D3\AttributeMultiValues\Modules\Application\Controllers\Admin {
 
     use OxidEsales\Eshop\Application\Controller\Admin\ArticleAttributeAjax;
 
     class d3_article_attribute_ajax_multivalues_parent extends ArticleAttributeAjax {}
 }
 
-namespace D3\Modules\AttributeMultiValues\Application\Model {
+namespace D3\AttributeMultiValues\Modules\Application\Model {
 
     use OxidEsales\Eshop\Application\Model\AttributeList;
 
diff --git a/src/Modules/Application/Controllers/Admin/d3_article_attribute_ajax_multivalues.php b/src/Modules/Application/Controllers/Admin/d3_article_attribute_ajax_multivalues.php
index 87b1967..e476bd6 100644
--- a/src/Modules/Application/Controllers/Admin/d3_article_attribute_ajax_multivalues.php
+++ b/src/Modules/Application/Controllers/Admin/d3_article_attribute_ajax_multivalues.php
@@ -15,7 +15,7 @@
  * @link      http://www.oxidmodule.com
  */
 
-namespace D3\Modules\AttributeMultiValues\Application\Controllers\Admin;
+namespace D3\AttributeMultiValues\Modules\Application\Controllers\Admin;
 
 use Exception;
 use OxidEsales\Eshop\Application\Model\Article;
@@ -39,8 +39,9 @@ class d3_article_attribute_ajax_multivalues extends d3_article_attribute_ajax_mu
         $sArtId = Registry::getRequest()->getRequestParameter('oxid');
 
         if (false == $sArtId) {
+            /** @var Attribute $attribute */
             $attribute = oxNew(Attribute::class);
-            $sAttrViewName = $attribute->_getViewName();
+            $sAttrViewName = $attribute->getViewName();
             $sQAdd = " from {$sAttrViewName} where {$sAttrViewName}.oxid ";
         }
 
diff --git a/src/Modules/Application/Model/d3_oxattributelist_multivalues.php b/src/Modules/Application/Model/d3_oxattributelist_multivalues.php
index 54a1f8b..4f875e0 100644
--- a/src/Modules/Application/Model/d3_oxattributelist_multivalues.php
+++ b/src/Modules/Application/Model/d3_oxattributelist_multivalues.php
@@ -14,7 +14,7 @@
  * @link      http://www.oxidmodule.com
  */
 
-namespace D3\Modules\AttributeMultiValues\Application\Model;
+namespace D3\AttributeMultiValues\Modules\Application\Model;
 
 class d3_oxattributelist_multivalues extends d3_oxattributelist_multivalues_parent
 {
diff --git a/src/metadata.php b/src/metadata.php
index ebab4c5..ad92ca0 100644
--- a/src/metadata.php
+++ b/src/metadata.php
@@ -13,8 +13,8 @@
  * @link      http://www.oxidmodule.com
  */
 
-use D3\Modules\AttributeMultiValues\Application\Controllers\Admin\d3_article_attribute_ajax_multivalues;
-use D3\Modules\AttributeMultiValues\Application\Model\d3_oxattributelist_multivalues;
+use D3\AttributeMultiValues\Modules\Application\Controllers\Admin\d3_article_attribute_ajax_multivalues;
+use D3\AttributeMultiValues\Modules\Application\Model\d3_oxattributelist_multivalues;
 use OxidEsales\Eshop\Application\Controller\Admin\ArticleAttributeAjax;
 use OxidEsales\Eshop\Application\Model\AttributeList;