diff --git a/Models/SurveyAnswer.php b/Models/SurveyAnswer.php
index 77c6c12..057af92 100755
--- a/Models/SurveyAnswer.php
+++ b/Models/SurveyAnswer.php
@@ -30,7 +30,7 @@ final class SurveyAnswer
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     /**
      * Constructor
diff --git a/Models/SurveyTemplate.php b/Models/SurveyTemplate.php
index b69544f..fa93aee 100755
--- a/Models/SurveyTemplate.php
+++ b/Models/SurveyTemplate.php
@@ -36,7 +36,7 @@ class SurveyTemplate
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     /**
      * Status.
diff --git a/Models/SurveyTemplateElement.php b/Models/SurveyTemplateElement.php
index 344148b..8b0f32b 100755
--- a/Models/SurveyTemplateElement.php
+++ b/Models/SurveyTemplateElement.php
@@ -32,7 +32,7 @@ class SurveyTemplateElement
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     /**
      * Type.
diff --git a/Models/SurveyTemplateElementL11n.php b/Models/SurveyTemplateElementL11n.php
index 2600e10..ceea284 100755
--- a/Models/SurveyTemplateElementL11n.php
+++ b/Models/SurveyTemplateElementL11n.php
@@ -32,7 +32,7 @@ class SurveyTemplateElementL11n implements \JsonSerializable
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     /**
      * Surveys ID.
diff --git a/Models/SurveyTemplateL11n.php b/Models/SurveyTemplateL11n.php
index 5cdc0fc..665dff9 100755
--- a/Models/SurveyTemplateL11n.php
+++ b/Models/SurveyTemplateL11n.php
@@ -32,7 +32,7 @@ class SurveyTemplateL11n implements \JsonSerializable
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     /**
      * Surveys ID.
diff --git a/Models/SurveyTemplateLabelL11n.php b/Models/SurveyTemplateLabelL11n.php
index 4a3f0f5..e9001a5 100755
--- a/Models/SurveyTemplateLabelL11n.php
+++ b/Models/SurveyTemplateLabelL11n.php
@@ -32,7 +32,7 @@ class SurveyTemplateLabelL11n implements \JsonSerializable
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     /**
      * element ID.
diff --git a/Theme/Backend/surveys-create.tpl.php b/Theme/Backend/surveys-create.tpl.php
index ec486bb..2733dae 100755
--- a/Theme/Backend/surveys-create.tpl.php
+++ b/Theme/Backend/surveys-create.tpl.php
@@ -146,15 +146,15 @@ echo $this->getData('nav')->render(); ?>
                                                 foreach ($elementValues as $elementValue) :
                                                     if ($element->type === SurveyElementType::CHECKBOX) : ?>
                                                         <div class="input-control value">
-                                                            <label class="checkbox" for="i<?= $element->getId() . '-' . $this->printHtml($elementValue); ?>">
-                                                                <input id="i<?= $element->getId() . '-' . $this->printHtml($elementValue); ?>" type="checkbox" name="i<?= $element->getId() . '-' . $this->printHtml($elementValue); ?>" value="1">
+                                                            <label class="checkbox" for="i<?= $element->id . '-' . $this->printHtml($elementValue); ?>">
+                                                                <input id="i<?= $element->id . '-' . $this->printHtml($elementValue); ?>" type="checkbox" name="i<?= $element->id . '-' . $this->printHtml($elementValue); ?>" value="1">
                                                                 <span class="checkmark"></span>
                                                             </label>
                                                         </div>
                                                     <?php elseif ($element->type === SurveyElementType::RADIO) : ?>
                                                         <div class="input-control value">
-                                                            <label class="radio" for="i<?= $element->getId() . '-' . $this->printHtml($elementValue); ?>">
-                                                                <input id="i<?= $element->getId() . '-' . $this->printHtml($elementValue); ?>" type="radio" name="i<?= $element->getId(); ?>" value="<?= $this->printHtml($elementValue); ?>"<?= isset($survey) && $survey->hasPublicResult ? '' : ''; ?>>
+                                                            <label class="radio" for="i<?= $element->id . '-' . $this->printHtml($elementValue); ?>">
+                                                                <input id="i<?= $element->id . '-' . $this->printHtml($elementValue); ?>" type="radio" name="i<?= $element->id; ?>" value="<?= $this->printHtml($elementValue); ?>"<?= isset($survey) && $survey->hasPublicResult ? '' : ''; ?>>
                                                                 <span class="checkmark"></span>
                                                             </label>
                                                         </div>
@@ -163,20 +163,20 @@ echo $this->getData('nav')->render(); ?>
                                              elseif ($element->type === SurveyElementType::DROPDOWN) :
                                                 $elementValues = $element->getValues();
 
-                                                echo '<select name="i' . $element->getId() . '>';
+                                                echo '<select name="i' . $element->id . '>';
                                                 $elementLabels = \array_values($element->getLabels());
                                                 foreach ($elementValues as $key => $elementValue) : ?>
                                                     <option value="<?= $this->printHtml($elementValue); ?>"><?= $this->printHtml($elementLabels[$key]->title); ?>
                                             <?php endforeach;
                                             echo '</select>';
                                             elseif ($element->type === SurveyElementType::TEXTFIELD) : ?>
-                                                <input type="text" name="i<?= $element->getId() ?>">
+                                                <input type="text" name="i<?= $element->id ?>">
                                             <?php elseif ($element->type === SurveyElementType::TEXTAREA) : ?>
-                                                <textarea name="i<?= $element->getId() ?>"></textarea>
+                                                <textarea name="i<?= $element->id ?>"></textarea>
                                             <?php elseif ($element->type === SurveyElementType::NUMERIC) : ?>
-                                                <input type="number" name="i<?= $element->getId() ?>">
+                                                <input type="number" name="i<?= $element->id ?>">
                                             <?php elseif ($element->type === SurveyElementType::DATE) : ?>
-                                                <input type="datetime-local" name="i<?= $element->getId() ?>">
+                                                <input type="datetime-local" name="i<?= $element->id ?>">
                                             <?php endif;
                                             echo '</div>'; // closing "values-section"
                                             echo '</div>'; // closing "survey-value-element"
diff --git a/Theme/Backend/surveys-list.tpl.php b/Theme/Backend/surveys-list.tpl.php
index 8979492..4c3f6eb 100755
--- a/Theme/Backend/surveys-list.tpl.php
+++ b/Theme/Backend/surveys-list.tpl.php
@@ -23,14 +23,14 @@ $surveys = $this->getData('surveys') ?? [];
 /** @var \Modules\Admin\Models\Account $account */
 $account = $this->getData('account');
 
-$accountDir = $account->getId() . ' ' . $account->login;
+$accountDir = $account->id . ' ' . $account->login;
 
 /** @var \Modules\Media\Models\Collection[] */
 $collections = $this->getData('collections');
 $mediaPath   = \urldecode($this->getData('path') ?? '/');
 
-$previous = empty($surveys) ? '{/base}/survey/list' : '{/base}/survey/list?{?}&id=' . \reset($surveys)->getId() . '&ptype=p';
-$next     = empty($surveys) ? '{/base}/survey/list' : '{/base}/survey/list?{?}&id=' . \end($surveys)->getId() . '&ptype=n';
+$previous = empty($surveys) ? '{/base}/survey/list' : '{/base}/survey/list?{?}&id=' . \reset($surveys)->id . '&ptype=p';
+$next     = empty($surveys) ? '{/base}/survey/list' : '{/base}/survey/list?{?}&id=' . \end($surveys)->id . '&ptype=n';
 
 echo $this->getData('nav')->render(); ?>
 
@@ -152,13 +152,13 @@ echo $this->getData('nav')->render(); ?>
                     <td><a href="<?= $url; ?>"><i class="fa fa-folder-open-o"></i></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
                     <td>
-                    <td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $value->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->createdBy->name1, $value->createdBy->name2, $value->createdBy->name3, $value->createdBy->login ?? ''])); ?></a>
+                    <td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $value->createdBy->id); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->createdBy->name1, $value->createdBy->name2, $value->createdBy->name3, $value->createdBy->login ?? ''])); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d')); ?></a>
                 <?php endforeach; ?>
                 <?php
                     $count = 0;
                     foreach ($surveys as $key => $value) : ++$count;
-                        $url = UriFactory::build('{/base}/survey/edit?{?}&id=' . $value->getId());
+                        $url = UriFactory::build('{/base}/survey/edit?{?}&id=' . $value->id);
                     ?>
                     <tr data-href="<?= $url; ?>">
                         <td><label class="checkbox" for="surveyList-<?= $key; ?>">
@@ -168,7 +168,7 @@ echo $this->getData('nav')->render(); ?>
                         <td>
                         <td><a href="<?= $url; ?>"><?= $value->getL11n()->title; ?></a>
                         <td>
-                        <td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $value->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->createdBy->name1, $value->createdBy->name2, $value->createdBy->name3, $value->createdBy->login ?? ''])); ?></a>
+                        <td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $value->createdBy->id); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->createdBy->name1, $value->createdBy->name2, $value->createdBy->name3, $value->createdBy->login ?? ''])); ?></a>
                         <td><a href="<?= $url; ?>"><?= $value->createdAt->format('Y-m-d'); ?></a>
                 <?php endforeach; ?>
                 <?php if ($count === 0) : ?>
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 41e7cdd..464cda1 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -126,7 +126,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $request->setData('media', \json_encode([1]));
 
         $this->module->apiSurveyTemplateCreate($request, $response);
-        self::assertGreaterThan(0, $response->get('')['response']->getId());
+        self::assertGreaterThan(0, $response->get('')['response']->id);
     }
 
     /**
@@ -167,7 +167,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         }
 
         $this->module->apiSurveyTemplateElementCreate($request, $response);
-        self::assertGreaterThan(0, $response->get('')['response']->getId());
+        self::assertGreaterThan(0, $response->get('')['response']->id);
     }
 
     /**
@@ -201,7 +201,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
 
         $this->module->apiSurveyAnswerCreate($request, $response);
         self::markTestIncomplete();
-        self::assertGreaterThan(0, $response->get('')['response']->getId());
+        self::assertGreaterThan(0, $response->get('')['response']->id);
     }
 
     /**
diff --git a/tests/Models/NullSurveyTemplateElementL11nTest.php b/tests/Models/NullSurveyTemplateElementL11nTest.php
index c11117a..9aae9f2 100755
--- a/tests/Models/NullSurveyTemplateElementL11nTest.php
+++ b/tests/Models/NullSurveyTemplateElementL11nTest.php
@@ -37,6 +37,6 @@ final class NullSurveyTemplateElementL11nTest extends \PHPUnit\Framework\TestCas
     public function testId() : void
     {
         $null = new NullSurveyTemplateElementL11n(2);
-        self::assertEquals(2, $null->getId());
+        self::assertEquals(2, $null->id);
     }
 }
diff --git a/tests/Models/NullSurveyTemplateElementTest.php b/tests/Models/NullSurveyTemplateElementTest.php
index 1f63d42..936aacc 100755
--- a/tests/Models/NullSurveyTemplateElementTest.php
+++ b/tests/Models/NullSurveyTemplateElementTest.php
@@ -37,6 +37,6 @@ final class NullSurveyTemplateElementTest extends \PHPUnit\Framework\TestCase
     public function testId() : void
     {
         $null = new NullSurveyTemplateElement(2);
-        self::assertEquals(2, $null->getId());
+        self::assertEquals(2, $null->id);
     }
 }
diff --git a/tests/Models/NullSurveyTemplateL11nTest.php b/tests/Models/NullSurveyTemplateL11nTest.php
index 82aa38a..52b4879 100755
--- a/tests/Models/NullSurveyTemplateL11nTest.php
+++ b/tests/Models/NullSurveyTemplateL11nTest.php
@@ -37,6 +37,6 @@ final class NullSurveyTemplateL11nTest extends \PHPUnit\Framework\TestCase
     public function testId() : void
     {
         $null = new NullSurveyTemplateL11n(2);
-        self::assertEquals(2, $null->getId());
+        self::assertEquals(2, $null->id);
     }
 }
diff --git a/tests/Models/NullSurveyTemplateLabelL11nTest.php b/tests/Models/NullSurveyTemplateLabelL11nTest.php
index 5615b59..33a150d 100755
--- a/tests/Models/NullSurveyTemplateLabelL11nTest.php
+++ b/tests/Models/NullSurveyTemplateLabelL11nTest.php
@@ -37,6 +37,6 @@ final class NullSurveyTemplateLabelL11nTest extends \PHPUnit\Framework\TestCase
     public function testId() : void
     {
         $null = new NullSurveyTemplateLabelL11n(2);
-        self::assertEquals(2, $null->getId());
+        self::assertEquals(2, $null->id);
     }
 }
diff --git a/tests/Models/NullSurveyTemplateTest.php b/tests/Models/NullSurveyTemplateTest.php
index ba2db13..fccd9c0 100755
--- a/tests/Models/NullSurveyTemplateTest.php
+++ b/tests/Models/NullSurveyTemplateTest.php
@@ -37,6 +37,6 @@ final class NullSurveyTemplateTest extends \PHPUnit\Framework\TestCase
     public function testId() : void
     {
         $null = new NullSurveyTemplate(2);
-        self::assertEquals(2, $null->getId());
+        self::assertEquals(2, $null->id);
     }
 }
diff --git a/tests/Models/SurveyTemplateElementL11nTest.php b/tests/Models/SurveyTemplateElementL11nTest.php
index f1f636c..67f0538 100755
--- a/tests/Models/SurveyTemplateElementL11nTest.php
+++ b/tests/Models/SurveyTemplateElementL11nTest.php
@@ -38,7 +38,7 @@ final class SurveyTemplateElementL11nTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        self::assertEquals(0, $this->l11n->getId());
+        self::assertEquals(0, $this->l11n->id);
         self::assertEquals('', $this->l11n->text);
         self::assertEquals('', $this->l11n->description);
         self::assertEquals('', $this->l11n->descriptionPlain);
diff --git a/tests/Models/SurveyTemplateElementTest.php b/tests/Models/SurveyTemplateElementTest.php
index d38bd04..39b91eb 100755
--- a/tests/Models/SurveyTemplateElementTest.php
+++ b/tests/Models/SurveyTemplateElementTest.php
@@ -40,7 +40,7 @@ final class SurveyTemplateElementTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        self::assertEquals(0, $this->element->getId());
+        self::assertEquals(0, $this->element->id);
 
         $date = new \DateTime('now');
         self::assertEquals([], $this->element->getLabels());
diff --git a/tests/Models/SurveyTemplateL11nTest.php b/tests/Models/SurveyTemplateL11nTest.php
index ab4746f..76796b4 100755
--- a/tests/Models/SurveyTemplateL11nTest.php
+++ b/tests/Models/SurveyTemplateL11nTest.php
@@ -38,7 +38,7 @@ final class SurveyTemplateL11nTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        self::assertEquals(0, $this->l11n->getId());
+        self::assertEquals(0, $this->l11n->id);
         self::assertEquals('', $this->l11n->title);
         self::assertEquals('', $this->l11n->description);
         self::assertEquals('', $this->l11n->descriptionPlain);
diff --git a/tests/Models/SurveyTemplateLabelL11nTest.php b/tests/Models/SurveyTemplateLabelL11nTest.php
index e337763..5b1ae84 100755
--- a/tests/Models/SurveyTemplateLabelL11nTest.php
+++ b/tests/Models/SurveyTemplateLabelL11nTest.php
@@ -38,7 +38,7 @@ final class SurveyTemplateLabelL11nTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        self::assertEquals(0, $this->l11n->getId());
+        self::assertEquals(0, $this->l11n->id);
         self::assertEquals('', $this->l11n->title);
         self::assertEquals(ISO639x1Enum::_EN, $this->l11n->getLanguage());
     }
diff --git a/tests/Models/SurveyTemplateTest.php b/tests/Models/SurveyTemplateTest.php
index b094ece..e5507bb 100755
--- a/tests/Models/SurveyTemplateTest.php
+++ b/tests/Models/SurveyTemplateTest.php
@@ -42,7 +42,7 @@ final class SurveyTemplateTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        self::assertEquals(0, $this->survey->getId());
+        self::assertEquals(0, $this->survey->id);
 
         $date = new \DateTime('now');
         self::assertEquals([], $this->survey->getElements());