diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index c8eb24e..d007fd2 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -71,8 +71,8 @@ final class BackendController extends Controller
 
         $path    = \str_replace('+', ' ', (string) ($request->getData('path') ?? '/'));
         $surveys = SurveyTemplateMapper::getByVirtualPath($path)
-            ->where('tags/title/language', $response->getLanguage())
-            ->where('l11n/language', $response->getLanguage())
+            ->where('tags/title/language', $response->header->l11n->language)
+            ->where('l11n/language', $response->header->l11n->language)
             ->execute();
 
         list($collection, $parent) = CollectionMapper::getCollectionsByPath($path);
@@ -136,10 +136,10 @@ final class BackendController extends Controller
             ->with('tags')
             ->with('tags/title')
             ->where('id', $request->getData('id'))
-            ->where('tags/title/language', $response->getLanguage())
-            ->where('l11n/language', $response->getLanguage())
-            ->where('elements/l11n/language', $response->getLanguage())
-            ->where('elements/labels/language', $response->getLanguage())
+            ->where('tags/title/language', $response->header->l11n->language)
+            ->where('l11n/language', $response->header->l11n->language)
+            ->where('elements/l11n/language', $response->header->l11n->language)
+            ->where('elements/labels/language', $response->header->l11n->language)
             ->execute();
 
         $view->addData('survey', $survey);
diff --git a/tests/Models/SurveyTemplateElementL11nTest.php b/tests/Models/SurveyTemplateElementL11nTest.php
index 67f0538..30fb6af 100755
--- a/tests/Models/SurveyTemplateElementL11nTest.php
+++ b/tests/Models/SurveyTemplateElementL11nTest.php
@@ -42,7 +42,7 @@ final class SurveyTemplateElementL11nTest extends \PHPUnit\Framework\TestCase
         self::assertEquals('', $this->l11n->text);
         self::assertEquals('', $this->l11n->description);
         self::assertEquals('', $this->l11n->descriptionPlain);
-        self::assertEquals(ISO639x1Enum::_EN, $this->l11n->getLanguage());
+        self::assertEquals(ISO639x1Enum::_EN, $this->l11n->language);
     }
 
     /**
@@ -72,7 +72,7 @@ final class SurveyTemplateElementL11nTest extends \PHPUnit\Framework\TestCase
     public function testLanguageInputOutput() : void
     {
         $this->l11n->setLanguage(ISO639x1Enum::_DE);
-        self::assertEquals(ISO639x1Enum::_DE, $this->l11n->getLanguage());
+        self::assertEquals(ISO639x1Enum::_DE, $this->l11n->language);
     }
 
     /**
diff --git a/tests/Models/SurveyTemplateL11nTest.php b/tests/Models/SurveyTemplateL11nTest.php
index 76796b4..9a499ed 100755
--- a/tests/Models/SurveyTemplateL11nTest.php
+++ b/tests/Models/SurveyTemplateL11nTest.php
@@ -42,7 +42,7 @@ final class SurveyTemplateL11nTest extends \PHPUnit\Framework\TestCase
         self::assertEquals('', $this->l11n->title);
         self::assertEquals('', $this->l11n->description);
         self::assertEquals('', $this->l11n->descriptionPlain);
-        self::assertEquals(ISO639x1Enum::_EN, $this->l11n->getLanguage());
+        self::assertEquals(ISO639x1Enum::_EN, $this->l11n->language);
     }
 
     /**
@@ -72,7 +72,7 @@ final class SurveyTemplateL11nTest extends \PHPUnit\Framework\TestCase
     public function testLanguageInputOutput() : void
     {
         $this->l11n->setLanguage(ISO639x1Enum::_DE);
-        self::assertEquals(ISO639x1Enum::_DE, $this->l11n->getLanguage());
+        self::assertEquals(ISO639x1Enum::_DE, $this->l11n->language);
     }
 
     /**
diff --git a/tests/Models/SurveyTemplateLabelL11nTest.php b/tests/Models/SurveyTemplateLabelL11nTest.php
index 5b1ae84..0ecaefb 100755
--- a/tests/Models/SurveyTemplateLabelL11nTest.php
+++ b/tests/Models/SurveyTemplateLabelL11nTest.php
@@ -40,7 +40,7 @@ final class SurveyTemplateLabelL11nTest extends \PHPUnit\Framework\TestCase
     {
         self::assertEquals(0, $this->l11n->id);
         self::assertEquals('', $this->l11n->title);
-        self::assertEquals(ISO639x1Enum::_EN, $this->l11n->getLanguage());
+        self::assertEquals(ISO639x1Enum::_EN, $this->l11n->language);
     }
 
     /**
@@ -60,7 +60,7 @@ final class SurveyTemplateLabelL11nTest extends \PHPUnit\Framework\TestCase
     public function testLanguageInputOutput() : void
     {
         $this->l11n->setLanguage(ISO639x1Enum::_DE);
-        self::assertEquals(ISO639x1Enum::_DE, $this->l11n->getLanguage());
+        self::assertEquals(ISO639x1Enum::_DE, $this->l11n->language);
     }
 
     /**