diff --git a/Admin/Installer.php b/Admin/Installer.php
index 84208c8..4bd707f 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -84,10 +84,10 @@ final class Installer extends InstallerAbstract
     private static function installMedia($dbPool, $data) : void
     {
         $collection = new Collection();
-        $collection->setName((string) $data['name'] ?? '');
+        $collection->name = (string) $data['name'] ?? '';
         $collection->setVirtualPath((string) $data['virtualPath'] ?? '/');
         $collection->setPath((string) ($data['path'] ?? '/Modules/Media/Files/' . ((string) $data['name'] ?? '')));
-        $collection->setCreatedBy(new NullAccount((int) $data['user'] ?? 1));
+        $collection->createdBy = new NullAccount((int) $data['user'] ?? 1);
 
         CollectionMapper::create($collection);
     }
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 1209543..61c3bc5 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -34,6 +34,7 @@ use phpOMS\Message\ResponseAbstract;
 use phpOMS\Model\Message\FormValidation;
 use phpOMS\System\File\Local\Directory;
 use phpOMS\Utils\Parser\Markdown\Markdown;
+use phpOMS\System\File\FileUtils;
 
 /**
  * Media class.
@@ -88,7 +89,7 @@ final class ApiController extends Controller
         $uploads = $this->uploadFiles(
             $request->getData('name') === null || $request->getFiles() !== null ? '' : $request->getData('name'),
             $request->getFiles(),
-            $request->getHeader()->getAccount(),
+            $request->header->account,
             __DIR__ . '/../../../Modules/Media/Files' . \urldecode((string) ($request->getData('path') ?? '')),
             \urldecode((string) ($request->getData('virtualpath') ?? '')),
             (string) ($request->getData('type') ?? ''),
@@ -240,12 +241,12 @@ final class ApiController extends Controller
         $media = new Media();
 
         $media->setPath(self::normalizeDbPath($status['path']) . '/' . $status['filename']);
-        $media->setName($status['name']);
-        $media->setSize($status['size']);
-        $media->setCreatedBy(new NullAccount($account));
-        $media->setExtension($status['extension']);
+        $media->name = $status['name'];
+        $media->size = $status['size'];
+        $media->createdBy = new NullAccount($account);
+        $media->extension = $status['extension'];
         $media->setVirtualPath($virtualPath);
-        $media->setType($type);
+        $media->type = $type;
 
         MediaMapper::create($media);
 
@@ -296,7 +297,7 @@ final class ApiController extends Controller
         /** @var Media $new */
         $new = $this->updateMediaFromRequest($request);
 
-        $this->updateModel($request->getHeader()->getAccount(), $old, $new, MediaMapper::class, 'media', $request->getOrigin());
+        $this->updateModel($request->header->account, $old, $new, MediaMapper::class, 'media', $request->getOrigin());
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media successfully updated', $new);
     }
 
@@ -315,8 +316,8 @@ final class ApiController extends Controller
 
         /** @var Media $media */
         $media = MediaMapper::get($id);
-        $media->setName((string) ($request->getData('name') ?? $media->getName()));
-        $media->setDescription((string) ($request->getData('description') ?? $media->getDescription()));
+        $media->name = (string) ($request->getData('name') ?? $media->name);
+        $media->description = (string) ($request->getData('description') ?? $media->description);
         $media->setPath((string) ($request->getData('path') ?? $media->getPath()));
         $media->setVirtualPath(\urldecode((string) ($request->getData('virtualpath') ?? $media->getVirtualPath())));
 
@@ -327,20 +328,20 @@ final class ApiController extends Controller
         ) {
             $name = \explode('.', \basename($path));
 
-            $media->setName($name[0]);
-            $media->setExtension($name[1] ?? '');
+            $media->name = $name[0];
+            $media->extension = $name[1] ?? '';
             $media->setVirtualPath(\dirname($path));
             $media->setPath('/Modules/Media/Files/' . \ltrim($path, '\\/'));
-            $media->setAbsolute(false);
+            $media->isAbsolute = false;
         }
 
         if ($request->getData('content') !== null) {
             \file_put_contents(
-                $media->isAbsolute() ? $media->getPath() : __DIR__ . '/../../../' . \ltrim($media->getPath(), '\\/'),
+                $media->isAbsolute ? $media->getPath() : __DIR__ . '/../../../' . \ltrim($media->getPath(), '\\/'),
                 $request->getData('content')
             );
 
-            $media->setSize(\strlen($request->getData('content')));
+            $media->size = \strlen($request->getData('content'));
         }
 
         return $media;
@@ -363,13 +364,13 @@ final class ApiController extends Controller
     {
         if (!empty($val = $this->validateCollectionCreate($request))) {
             $response->set('collection_create', new FormValidation($val));
-            $response->getHeader()->setStatusCode(RequestStatusCode::R_400);
+            $response->header->status = RequestStatusCode::R_400;
 
             return;
         }
 
         $collection = $this->createCollectionFromRequest($request);
-        $this->createModel($request->getHeader()->getAccount(), $collection, CollectionMapper::class, 'collection', $request->getOrigin());
+        $this->createModel($request->header->account, $collection, CollectionMapper::class, 'collection', $request->getOrigin());
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Collection', 'Collection successfully created.', $collection);
     }
 
@@ -404,10 +405,10 @@ final class ApiController extends Controller
     private function createCollectionFromRequest(RequestAbstract $request) : Collection
     {
         $mediaCollection = new Collection();
-        $mediaCollection->setName($request->getData('name') ?? '');
-        $mediaCollection->setDescription($description = Markdown::parse($request->getData('description') ?? ''));
-        $mediaCollection->setDescriptionRaw($description);
-        $mediaCollection->setCreatedBy(new NullAccount($request->getHeader()->getAccount()));
+        $mediaCollection->name = $request->getData('name') ?? '';
+        $mediaCollection->description = ($description = Markdown::parse($request->getData('description') ?? ''));
+        $mediaCollection->descriptionRaw = $description;
+        $mediaCollection->createdBy = new NullAccount($request->header->account);
 
         $media = $request->getDataJson('media-list');
         foreach ($media as $file) {
@@ -459,10 +460,10 @@ final class ApiController extends Controller
 
         /* Create collection */
         $mediaCollection = new Collection();
-        $mediaCollection->setName($name);
-        $mediaCollection->setDescription(Markdown::parse($description));
-        $mediaCollection->setDescriptionRaw($description);
-        $mediaCollection->setCreatedBy(new NullAccount($account));
+        $mediaCollection->name = $name;
+        $mediaCollection->description = Markdown::parse($description);
+        $mediaCollection->descriptionRaw = $description;
+        $mediaCollection->createdBy = new NullAccount($account);
         $mediaCollection->setSources($media);
         $mediaCollection->setVirtualPath('/');
         $mediaCollection->setPath('/Modules/Media/Files');
@@ -496,7 +497,7 @@ final class ApiController extends Controller
         } else {
             if (\stripos(
                     FileUtils::absolute(__DIR__ . '/../../../Modules/Media/Files/' . \ltrim($path, '\\/')),
-                    FileUtils::absolute(__DIR__ . '/../../../Modules/Media/Files/')
+                    FileUtils::absolute(__DIR__ . '/../../../')
                 ) !== 0
             ) {
                 $outputDir = self::createMediaPath(__DIR__ . '/../../../Modules/Media/Files');
@@ -527,7 +528,7 @@ final class ApiController extends Controller
             ],
         ];
 
-        $created = $this->createDbEntries($status, $request->getHeader()->getAccount(), $virtualPath, $request->getData('type') ?? '');
+        $created = $this->createDbEntries($status, $request->header->account, $virtualPath, $request->getData('type') ?? '');
 
         $ids = [];
         foreach ($created as $file) {
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 16b6ebf..ec6c024 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -115,28 +115,28 @@ final class BackendController extends Controller
 
         if (\is_array($collection) && \is_dir(__DIR__ . '/../Files' . $path)) {
             $collection = new Collection();
-            $collection->setName(\basename($path));
+            $collection->name = \basename($path);
             $collection->setVirtualPath(\dirname($path));
             $collection->setPath(\dirname($path));
-            $collection->setAbsolute(false);
+            $collection->isAbsolute = false;
         }
 
         if ($collection instanceof Collection) {
             $media += $collection->getSources();
 
             /** @var string[] $glob */
-            $glob = $collection->isAbsolute()
-                ? $collection->getPath() . '/' . $collection->getName() . '/*'
-                : \glob(__DIR__ . '/../Files/' . \rtrim($collection->getPath(), '/') . '/' . $collection->getName() . '/*');
+            $glob = $collection->isAbsolute
+                ? $collection->getPath() . '/' . $collection->name . '/*'
+                : \glob(__DIR__ . '/../Files/' . \rtrim($collection->getPath(), '/') . '/' . $collection->name . '/*');
             $glob = $glob === false ? [] : $glob;
 
             foreach ($glob as $file) {
                 foreach ($media as $obj) {
-                    if (($obj->getExtension() !== 'collection'
-                            && !empty($obj->getExtension())
-                            && $obj->getName() . '.' . $obj->getExtension() === \basename($file))
-                        || ($obj->getExtension() === 'collection'
-                            && $obj->getName() === \basename($file))
+                    if (($obj->extension !== 'collection'
+                            && !empty($obj->extension)
+                            && $obj->name . '.' . $obj->extension === \basename($file))
+                        || ($obj->extension === 'collection'
+                            && $obj->name === \basename($file))
                     ) {
                         continue 2;
                     }
@@ -145,10 +145,10 @@ final class BackendController extends Controller
                 $pathinfo = \pathinfo($file);
 
                 $localMedia = new Media();
-                $localMedia->setName($pathinfo['filename']);
-                $localMedia->setExtension(\is_dir($file) ? 'collection' : $pathinfo['extension'] ?? '');
+                $localMedia->name = $pathinfo['filename'];
+                $localMedia->extension = \is_dir($file) ? 'collection' : $pathinfo['extension'] ?? '';
                 $localMedia->setVirtualPath($path);
-                $localMedia->setCreatedBy(new Account());
+                $localMedia->createdBy = new Account();
 
                 $media[] = $localMedia;
             }
@@ -180,15 +180,15 @@ final class BackendController extends Controller
 
         $id    = (int) $request->getData('id');
         $media = MediaMapper::get($id);
-        if ($media->getExtension() === 'collection') {
+        if ($media->extension === 'collection') {
             $media = MediaMapper::getByVirtualPath(
-                $media->getVirtualPath() . ($media->getVirtualPath() !== '/' ? '/' : '') . $media->getName()
+                $media->getVirtualPath() . ($media->getVirtualPath() !== '/' ? '/' : '') . $media->name
             );
 
             $collection = CollectionMapper::get((int) $request->getData('id'));
             $media      = \array_merge($media, $collection->getSources());
 
-            $view->addData('path', $collection->getVirtualPath() . '/' . $collection->getName());
+            $view->addData('path', $collection->getVirtualPath() . '/' . $collection->name);
             $view->setTemplate('/Modules/Media/Theme/Backend/media-list');
         }
 
@@ -200,11 +200,11 @@ final class BackendController extends Controller
             ) {
                 $name = \explode('.', \basename($path));
 
-                $media->setName($name[0]);
-                $media->setExtension($name[1] ?? '');
+                $media->name = $name[0];
+                $media->extension = $name[1] ?? '';
                 $media->setVirtualPath(\dirname($path));
                 $media->setPath('/Modules/Media/Files/' . \ltrim($path, '\\/'));
-                $media->setAbsolute(false);
+                $media->isAbsolute = false;
             }
         }
 
diff --git a/Models/Collection.php b/Models/Collection.php
index 034a9d4..30a7e31 100755
--- a/Models/Collection.php
+++ b/Models/Collection.php
@@ -38,7 +38,7 @@ class Collection extends Media implements \Iterator
      * @var string
      * @since 1.0.0
      */
-    protected string $extension = 'collection';
+    public string $extension = 'collection';
 
     /**
      * Is collection.
@@ -48,17 +48,6 @@ class Collection extends Media implements \Iterator
      */
     protected int $collection = 1;
 
-    /**
-     * Constructor.
-     *
-     * @since 1.0.0
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setExtension('colection');
-    }
-
     /**
      * Set sources.
      *
diff --git a/Models/CollectionMapper.php b/Models/CollectionMapper.php
index 517be0a..05b9435 100755
--- a/Models/CollectionMapper.php
+++ b/Models/CollectionMapper.php
@@ -129,19 +129,19 @@ final class CollectionMapper extends MediaMapper
             $parent = CollectionMapper::getParentCollection($path);
             if (\is_array($parent) && \is_dir(__DIR__ . '/../../Media/Files' . $path)) {
                 $parent = new Collection();
-                $parent->setName(\basename($path));
+                $parent->name = \basename($path);
                 $parent->setVirtualPath(\dirname($path));
                 $parent->setPath(\dirname($path));
-                $parent->setAbsolute(false);
+                $parent->isAbsolute = false;
             }
 
             if ($parent instanceof Collection) {
                 $collection += $parent->getSources();
 
                 /** @var string[] $glob */
-                $glob = $parent->isAbsolute()
-                    ? $parent->getPath() . '/' . $parent->getName() . '/*'
-                    : \glob(__DIR__ . '/../Files/' . \rtrim($parent->getPath(), '/') . '/' . $parent->getName() . '/*');
+                $glob = $parent->isAbsolute
+                    ? $parent->getPath() . '/' . $parent->name . '/*'
+                    : \glob(__DIR__ . '/../Files/' . \rtrim($parent->getPath(), '/') . '/' . $parent->name . '/*');
                 $glob = $glob === false ? [] : $glob;
 
                 foreach ($glob as $file) {
@@ -150,11 +150,11 @@ final class CollectionMapper extends MediaMapper
                     }
 
                     foreach ($collection as $obj) {
-                        if (($obj->getExtension() !== 'collection'
-                                && !empty($obj->getExtension())
-                                && $obj->getName() . '.' . $obj->getExtension() === \basename($file))
-                            || ($obj->getExtension() === 'collection'
-                                && $obj->getName() === \basename($file))
+                        if (($obj->extension !== 'collection'
+                                && !empty($obj->extension)
+                                && $obj->name . '.' . $obj->extension === \basename($file))
+                            || ($obj->extension === 'collection'
+                                && $obj->name === \basename($file))
                         ) {
                             continue 2;
                         }
@@ -163,10 +163,10 @@ final class CollectionMapper extends MediaMapper
                     $pathinfo = \pathinfo($file);
 
                     $localMedia = new Collection();
-                    $localMedia->setName($pathinfo['filename']);
-                    $localMedia->setExtension(\is_dir($file) ? 'collection' : $pathinfo['extension'] ?? '');
+                    $localMedia->name = $pathinfo['filename'];
+                    $localMedia->extension = \is_dir($file) ? 'collection' : $pathinfo['extension'] ?? '';
                     $localMedia->setVirtualPath($path);
-                    $localMedia->setCreatedBy(new Account());
+                    $localMedia->createdBy = new Account();
 
                     $collection[] = $localMedia;
                 }
diff --git a/Models/Media.php b/Models/Media.php
index 24213a4..b20afbd 100755
--- a/Models/Media.php
+++ b/Models/Media.php
@@ -41,7 +41,7 @@ class Media implements \JsonSerializable
      * @var string
      * @since 1.0.0
      */
-    protected string $name = '';
+    public string $name = '';
 
     /**
      * Type.
@@ -49,7 +49,7 @@ class Media implements \JsonSerializable
      * @var string
      * @since 1.0.0
      */
-    protected string $type = '';
+    public string $type = '';
 
     /**
      * Extension.
@@ -57,7 +57,7 @@ class Media implements \JsonSerializable
      * @var string
      * @since 1.0.0
      */
-    protected string $extension = '';
+    public string $extension = '';
 
     /**
      * File size in bytes.
@@ -65,7 +65,7 @@ class Media implements \JsonSerializable
      * @var int
      * @since 1.0.0
      */
-    protected int $size = 0;
+    public int $size = 0;
 
     /**
      * Author.
@@ -73,7 +73,7 @@ class Media implements \JsonSerializable
      * @var Account
      * @since 1.0.0
      */
-    protected Account $createdBy;
+    public Account $createdBy;
 
     /**
      * Uploaded.
@@ -81,7 +81,7 @@ class Media implements \JsonSerializable
      * @var \DateTimeImmutable
      * @since 1.0.0
      */
-    protected \DateTimeImmutable $createdAt;
+    public \DateTimeImmutable $createdAt;
 
     /**
      * Resource path.
@@ -105,7 +105,7 @@ class Media implements \JsonSerializable
      * @var bool
      * @since 1.0.0
      */
-    protected bool $isAbsolute = false;
+    public bool $isAbsolute = false;
 
     /**
      * Is versioned.
@@ -113,7 +113,7 @@ class Media implements \JsonSerializable
      * @var bool
      * @since 1.0.0
      */
-    protected bool $versioned = false;
+    public bool $isVersioned = false;
 
     /**
      * Media Description.
@@ -121,7 +121,7 @@ class Media implements \JsonSerializable
      * @var string
      * @since 1.0.0
      */
-    protected string $description = '';
+    public string $description = '';
 
     /**
      * Media Description.
@@ -129,7 +129,7 @@ class Media implements \JsonSerializable
      * @var string
      * @since 1.0.0
      */
-    protected string $descriptionRaw = '';
+    public string $descriptionRaw = '';
 
     /**
      * Media encryption nonce.
@@ -153,7 +153,7 @@ class Media implements \JsonSerializable
      * @var bool
      * @since 1.0.0
      */
-    protected bool $hidden = false;
+    public bool $isHidden = false;
 
     /**
      * Is collection.
@@ -298,56 +298,6 @@ class Media implements \JsonSerializable
         return $this->nonce === null ? false : \hash_equals($this->nonce, $nonce);
     }
 
-    /**
-     * @return bool
-     *
-     * @since 1.0.0
-     */
-    public function isAbsolute() : bool
-    {
-        return $this->isAbsolute;
-    }
-
-    /**
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setAbsolute(bool $absolute) : void
-    {
-        $this->isAbsolute = $absolute;
-    }
-
-    /**
-     * @return Account
-     *
-     * @since 1.0.0
-     */
-    public function getCreatedBy() : Account
-    {
-        return $this->createdBy;
-    }
-
-    /**
-     * @return \DateTimeImmutable
-     *
-     * @since 1.0.0
-     */
-    public function getCreatedAt() : \DateTimeImmutable
-    {
-        return $this->createdAt;
-    }
-
-    /**
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getExtension() : string
-    {
-        return $this->extension;
-    }
-
     /**
      * @return string
      *
@@ -368,90 +318,6 @@ class Media implements \JsonSerializable
         return $this->virtualPath;
     }
 
-    /**
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getName() : string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getType() : string
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getDescription() : string
-    {
-        return $this->description;
-    }
-
-    /**
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getDescriptionRaw() : string
-    {
-        return $this->descriptionRaw;
-    }
-
-    /**
-     * @return int
-     *
-     * @since 1.0.0
-     */
-    public function getSize() : int
-    {
-        return $this->size;
-    }
-
-    /**
-     * @return bool
-     *
-     * @since 1.0.0
-     */
-    public function isVersioned() : bool
-    {
-        return $this->versioned;
-    }
-
-    /**
-     * @param Account $createdBy Creator
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setCreatedBy(Account $createdBy) : void
-    {
-        $this->createdBy = $createdBy;
-    }
-
-    /**
-     * @param string $extension Extension
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setExtension(string $extension) : void
-    {
-        $this->extension = $extension;
-    }
-
     /**
      * @param string $path $filepath
      *
@@ -476,100 +342,6 @@ class Media implements \JsonSerializable
         $this->virtualPath = \str_replace('\\', '/', $path);
     }
 
-    /**
-     * @param string $name Media name (not file name)
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setName(string $name) : void
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * @param string $type Media type
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setType(string $type) : void
-    {
-        $this->type = $type;
-    }
-
-    /**
-     * @param string $description Media description
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setDescription(string $description) : void
-    {
-        $this->description = $description;
-    }
-
-    /**
-     * @param string $description Media description
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setDescriptionRaw(string $description) : void
-    {
-        $this->descriptionRaw = $description;
-    }
-
-    /**
-     * @param int $size Filesize
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setSize(int $size) : void
-    {
-        $this->size = $size;
-    }
-
-    /**
-     * @param bool $versioned File is version controlled
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setVersioned(bool $versioned) : void
-    {
-        $this->versioned = $versioned;
-    }
-
-    /**
-     * @return bool
-     *
-     * @since 1.0.0
-     */
-    public function isHidden() : bool
-    {
-        return $this->hidden;
-    }
-
-    /**
-     * @param bool $hidden File is hidden
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     */
-    public function setHidden(bool $hidden) : void
-    {
-        $this->hidden = $hidden;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -583,7 +355,7 @@ class Media implements \JsonSerializable
             'extension'      => $this->extension,
             'virtualpath'    => $this->virtualPath,
             'size'           => $this->size,
-            'hidden'         => $this->hidden,
+            'hidden'         => $this->isHidden,
             'path'           => $this->path,
             'absolute'       => $this->isAbsolute,
             'createdBy'      => $this->createdBy,
diff --git a/Models/MediaMapper.php b/Models/MediaMapper.php
index 1c0d024..f4c3941 100755
--- a/Models/MediaMapper.php
+++ b/Models/MediaMapper.php
@@ -40,8 +40,8 @@ class MediaMapper extends DataMapperAbstract
         'media_type'            => ['name' => 'media_type',            'type' => 'string',   'internal' => 'type'],
         'media_description'     => ['name' => 'media_description',     'type' => 'string',   'internal' => 'description',   'autocomplete' => true],
         'media_description_raw' => ['name' => 'media_description_raw', 'type' => 'string',   'internal' => 'descriptionRaw'],
-        'media_versioned'       => ['name' => 'media_versioned',       'type' => 'bool',     'internal' => 'versioned'],
-        'media_hidden'          => ['name' => 'media_hidden',          'type' => 'bool',     'internal' => 'hidden'],
+        'media_versioned'       => ['name' => 'media_versioned',       'type' => 'bool',     'internal' => 'isVersioned'],
+        'media_hidden'          => ['name' => 'media_hidden',          'type' => 'bool',     'internal' => 'isHidden'],
         'media_file'            => ['name' => 'media_file',            'type' => 'string',   'internal' => 'path',          'autocomplete' => true],
         'media_virtual'         => ['name' => 'media_virtual',         'type' => 'string',   'internal' => 'virtualPath',   'autocomplete' => true],
         'media_absolute'        => ['name' => 'media_absolute',        'type' => 'bool',     'internal' => 'isAbsolute'],
diff --git a/Models/UploadFile.php b/Models/UploadFile.php
index dafb9b6..d98b6fb 100755
--- a/Models/UploadFile.php
+++ b/Models/UploadFile.php
@@ -261,7 +261,7 @@ class UploadFile
         $limit = 0;
 
         do {
-            $sha = \sha1_file($tempName . $rnd);
+            $sha = \sha1($tempName . $rnd);
 
             if ($sha === false) {
                 throw new \Exception('No file path could be found. Potential attack!');
diff --git a/Theme/Backend/Components/InlinePreview/BaseView.php b/Theme/Backend/Components/InlinePreview/BaseView.php
index 27751b0..6f9fcd9 100755
--- a/Theme/Backend/Components/InlinePreview/BaseView.php
+++ b/Theme/Backend/Components/InlinePreview/BaseView.php
@@ -95,18 +95,6 @@ class BaseView extends View
         return $this->id;
     }
 
-    /**
-     * Get name
-     *
-     * @return string
-     *
-     * @since 1.0.0
-     */
-    public function getName() : string
-    {
-        return $this->name;
-    }
-
     /**
      * Is required?
      *
diff --git a/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php b/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php
index 1d5850e..d27a4c7 100755
--- a/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php
+++ b/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php
@@ -42,7 +42,7 @@
 </div>
 <div class="box" id="<?= $this->printHtml($this->getId()); ?>-tags" data-limit="0" data-active="true">
     <template id="<?= $this->printHtml($this->getId()); ?>-tagTemplate">
-        <span class="tag red" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->getName()); ?>">
+        <span class="tag red" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->name); ?>">
             <i class="fa fa-times"></i>
             <span style="display: none;" data-name="type_prefix" data-tpl-value="/type_prefix" data-value=""></span>
             <span data-tpl-text="/id" data-name="id" data-tpl-value="/id" data-value=""></span>
diff --git a/Theme/Backend/Components/Media/list.tpl.php b/Theme/Backend/Components/Media/list.tpl.php
index 74ae74e..0a8086b 100755
--- a/Theme/Backend/Components/Media/list.tpl.php
+++ b/Theme/Backend/Components/Media/list.tpl.php
@@ -2,7 +2,7 @@
 use phpOMS\System\File\FileUtils;
 use phpOMS\Uri\UriFactory;
 
-include __DIR__ . '/../template-functions.php';
+include __DIR__ . '/../../template-functions.php';
 
 ?>
 <div class="portlet">
@@ -20,16 +20,16 @@ include __DIR__ . '/../template-functions.php';
                 $url     = UriFactory::build('{/prefix}media/single?{?}&id=' . $value->getId());
 
                 $icon          = '';
-                $extensionType = FileUtils::getExtensionType($value->getExtension());
+                $extensionType = FileUtils::getExtensionType($value->extension);
                 $icon          = $fileIconFunction($extensionType);
         ?>
         <tr data-href="<?= $url; ?>">
             <td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="fa fa-<?= $this->printHtml($icon); ?>"></i></a>
-            <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
-            <td data-label="<?= $this->getHtml('Extension'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getExtension()); ?></a>
-            <td data-label="<?= $this->getHtml('Size'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getSize()); ?></a>
-            <td data-label="<?= $this->getHtml('Creator'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedBy()->getName1()); ?></a>
-            <td data-label="<?= $this->getHtml('Created'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?></a>
+            <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
+            <td data-label="<?= $this->getHtml('Extension'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->extension); ?></a>
+            <td data-label="<?= $this->getHtml('Size'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->size); ?></a>
+            <td data-label="<?= $this->getHtml('Creator'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->createdBy->name1); ?></a>
+            <td data-label="<?= $this->getHtml('Created'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d H:i:s')); ?></a>
         <?php endforeach; ?>
         <?php if ($count === 0) : ?>
         <tr><td colspan="6" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
diff --git a/Theme/Backend/media-collection-create.tpl.php b/Theme/Backend/media-collection-create.tpl.php
index ee216d2..978a39c 100755
--- a/Theme/Backend/media-collection-create.tpl.php
+++ b/Theme/Backend/media-collection-create.tpl.php
@@ -40,9 +40,9 @@ use phpOMS\Uri\UriFactory;
                 <div class="portlet-body">
                     <table class="layout wf-100">
                         <tr><td><label for="iVirtualPath"><?= $this->getHtml('VirtualPath'); ?></label>
-                        <tr><td><input type="text" id="iVirtualPath" name="virtualPath" value="<?= empty($this->request->getUri()->getQuery('path')) ? '/' : $this->request->getUri()->getQuery('path'); ?>" disabled>
+                        <tr><td><input type="text" id="iVirtualPath" name="virtualPath" value="<?= empty($this->request->uri->getQuery('path')) ? '/' : $this->request->uri->getQuery('path'); ?>" disabled>
                         <tr><td><label for="iPath"><?= $this->getHtml('Path'); ?></label>
-                        <tr><td><input type="text" id="iPath" name="path" value="<?= empty($this->request->getUri()->getQuery('path')) ? '/' : $this->request->getUri()->getQuery('path'); ?>">
+                        <tr><td><input type="text" id="iPath" name="path" value="<?= empty($this->request->uri->getQuery('path')) ? '/' : $this->request->uri->getQuery('path'); ?>">
                         <tr><td><label><?= $this->getHtml('Settings'); ?></label>
                         <tr><td>
                                 <label class="checkbox" for="iAddCollection">
diff --git a/Theme/Backend/media-file-create.tpl.php b/Theme/Backend/media-file-create.tpl.php
index 0a0f938..88da38b 100755
--- a/Theme/Backend/media-file-create.tpl.php
+++ b/Theme/Backend/media-file-create.tpl.php
@@ -48,9 +48,9 @@ use phpOMS\Uri\UriFactory;
                 <div class="portlet-body">
                     <table class="layout wf-100">
                         <tr><td><label for="iVirtualPath"><?= $this->getHtml('VirtualPath'); ?></label>
-                            <tr><td><input type="text" id="iVirtualPath" name="virtualPath" value="<?= empty($this->request->getUri()->getQuery('path')) ? '/' : $this->request->getUri()->getQuery('path'); ?>" disabled>
+                            <tr><td><input type="text" id="iVirtualPath" name="virtualPath" value="<?= empty($this->request->uri->getQuery('path')) ? '/' : $this->request->uri->getQuery('path'); ?>" disabled>
                             <tr><td><label for="iPath"><?= $this->getHtml('Path'); ?></label>
-                            <tr><td><input type="text" id="iPath" name="path" value="<?= empty($this->request->getUri()->getQuery('path')) ? '/' : $this->request->getUri()->getQuery('path'); ?>">
+                            <tr><td><input type="text" id="iPath" name="path" value="<?= empty($this->request->uri->getQuery('path')) ? '/' : $this->request->uri->getQuery('path'); ?>">
                         <tr><td><label><?= $this->getHtml('Settings'); ?></label>
                         <tr><td>
                                 <label class="checkbox" for="iAddCollection">
diff --git a/Theme/Backend/media-list.tpl.php b/Theme/Backend/media-list.tpl.php
index 9388881..e02599a 100755
--- a/Theme/Backend/media-list.tpl.php
+++ b/Theme/Backend/media-list.tpl.php
@@ -87,33 +87,33 @@ $next     = empty($media) ? '{/prefix}media/list' : '{/prefix}media/list?{?}&id=
                         foreach ($media as $key => $value) :
                             ++$count;
 
-                            $url = $value->getExtension() === 'collection'
-                                ? UriFactory::build('{/prefix}media/list?path=' . \rtrim($value->getVirtualPath(), '/') . '/' . $value->getName())
+                            $url = $value->extension === 'collection'
+                                ? UriFactory::build('{/prefix}media/list?path=' . \rtrim($value->getVirtualPath(), '/') . '/' . $value->name)
                                 : UriFactory::build('{/prefix}media/single?id=' . $value->getId()
                                     . '&path={?path}' . (
                                             $value->getId() === 0
-                                                ? '/' . $value->getName() . (!empty($value->getExtension()) ? '.' . $value->getExtension() : '')
+                                                ? '/' . $value->name . (!empty($value->extension) ? '.' . $value->extension : '')
                                                 : ''
                                         )
                                 );
 
-                            $icon = $fileIconFunction(FileUtils::getExtensionType($value->getExtension()));
+                            $icon = $fileIconFunction(FileUtils::getExtensionType($value->extension));
                         ?>
                     <tr tabindex="0" data-href="<?= $url; ?>">
                         <td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="fa fa-<?= $this->printHtml($icon); ?>"></i></a>
                         <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>">
                             <?= $this->printHtml(
-                                $value->getExtension() !== 'collection'
-                                    ? $value->getName() . (
-                                        $value->getExtension() !== '' ? '.' . $value->getExtension() : ''
-                                    ) : $value->getName()); ?>
+                                $value->extension !== 'collection'
+                                    ? $value->name . (
+                                        $value->extension !== '' ? '.' . $value->extension : ''
+                                    ) : $value->name); ?>
                             </a>
-                        <td data-label="<?= $this->getHtml('Extension'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getExtension()); ?></a>
+                        <td data-label="<?= $this->getHtml('Extension'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->extension); ?></a>
                         <td data-label="<?= $this->getHtml('Size'); ?>"><a href="<?= $url; ?>"><?php
-                            $size = FileSizeType::autoFormat($value->getSize());
-                            echo $this->printHtml($value->getExtension() !== 'collection' ? \number_format($size[0], 1, '.', ','). $size[1] : ''); ?></a>
-                        <td data-label="<?= $this->getHtml('Creator'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedBy()->getName1()); ?></a>
-                        <td data-label="<?= $this->getHtml('Created'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?></a>
+                            $size = FileSizeType::autoFormat($value->size);
+                            echo $this->printHtml($value->extension !== 'collection' ? \number_format($size[0], 1, '.', ','). $size[1] : ''); ?></a>
+                        <td data-label="<?= $this->getHtml('Creator'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->createdBy->name1); ?></a>
+                        <td data-label="<?= $this->getHtml('Created'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d H:i:s')); ?></a>
                         <?php endforeach; ?>
                     <?php if ($count === 0) : ?>
                         <tr><td colspan="6" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
diff --git a/Theme/Backend/media-single.tpl.php b/Theme/Backend/media-single.tpl.php
index cd1e3b2..9f42add 100755
--- a/Theme/Backend/media-single.tpl.php
+++ b/Theme/Backend/media-single.tpl.php
@@ -39,18 +39,18 @@ echo $this->getData('nav')->render();
 <div class="row">
     <div class="col-xs-12">
         <section class="portlet">
-            <div class="portlet-head"><?= $this->printHtml($media->getName()); ?></div>
+            <div class="portlet-head"><?= $this->printHtml($media->name); ?></div>
             <div class="portlet-body">
                 <table class="list w-100">
                     <tbody>
-                        <tr><td><?= $this->getHtml('Name'); ?><td class="wf-100"><?= $this->printHtml($media->getName()); ?>
-                        <tr><td><?= $this->getHtml('Size'); ?><td class="wf-100"><?= $this->printHtml($media->getSize()); ?>
-                        <tr><td><?= $this->getHtml('Created'); ?><td><?= $this->printHtml($media->getCreatedAt()->format('Y-m-d')); ?>
-                        <tr><td><?= $this->getHtml('Creator'); ?><td><a href="<?= UriFactory::build('{/prefix}profile/single?for=' . $media->getCreatedBy()->getId()); ?>"><?= $this->printHtml(
-                                \ltrim($media->getCreatedBy()->getName2() . ', ' . $media->getCreatedBy()->getName1(), ', ')
+                        <tr><td><?= $this->getHtml('Name'); ?><td class="wf-100"><?= $this->printHtml($media->name); ?>
+                        <tr><td><?= $this->getHtml('Size'); ?><td class="wf-100"><?= $this->printHtml($media->size); ?>
+                        <tr><td><?= $this->getHtml('Created'); ?><td><?= $this->printHtml($media->createdAt->format('Y-m-d')); ?>
+                        <tr><td><?= $this->getHtml('Creator'); ?><td><a href="<?= UriFactory::build('{/prefix}profile/single?for=' . $media->createdBy->getId()); ?>"><?= $this->printHtml(
+                                \ltrim($media->createdBy->name2 . ', ' . $media->createdBy->name1, ', ')
                             ); ?></a>
                         <tr><td colspan="2"><?= $this->getHtml('Description'); ?>
-                        <tr><td colspan="2"><?= $media->getDescription(); ?>
+                        <tr><td colspan="2"><?= $media->description; ?>
                 </table>
             </div>
             <?php
@@ -88,20 +88,20 @@ echo $this->getData('nav')->render();
                     <td><?= $this->getHtml('Created'); ?>
                 <tbody>
                     <?php
-                        if (!\is_dir($media->isAbsolute() ? $media->getPath() : __DIR__ . '/../../../../' . \ltrim($media->getPath(), '//'))
+                        if (!\is_dir($media->isAbsolute ? $media->getPath() : __DIR__ . '/../../../../' . \ltrim($media->getPath(), '//'))
                             || $media->getPath() === ''
                         ) :
                             foreach ($media as $key => $value) :
                                 $url  = UriFactory::build('{/prefix}media/single?{?}&id=' . $value->getId());
-                                $icon = $fileIconFunction(FileUtils::getExtensionType($value->getExtension()));
+                                $icon = $fileIconFunction(FileUtils::getExtensionType($value->extension));
                         ?>
                         <tr data-href="<?= $url; ?>">
                             <td><a href="<?= $url; ?>"><i class="fa fa-<?= $this->printHtml($icon); ?>"></i></a>
-                            <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
-                            <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getExtension()); ?></a>
-                            <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getSize()); ?></a>
-                            <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedBy()->getName1()); ?></a>
-                            <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?></a>
+                            <td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
+                            <td><a href="<?= $url; ?>"><?= $this->printHtml($value->extension); ?></a>
+                            <td><a href="<?= $url; ?>"><?= $this->printHtml($value->size); ?></a>
+                            <td><a href="<?= $url; ?>"><?= $this->printHtml($value->createdBy->name1); ?></a>
+                            <td><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d H:i:s')); ?></a>
                     <?php endforeach; else : $path = $this->dirPathFunction($media, $this->request->getData('sub') ?? ''); ?>
                         <?php $list                = \phpOMS\System\File\Local\Directory::list($path);
                             foreach ($list as $key => $value) :
@@ -128,19 +128,19 @@ echo $this->getData('nav')->render();
 
                 if ($this->isImageFile($media, $path)) : ?>
                     <div class="h-overflow centerText">
-                        <img style="max-width: 100%" src="<?= $media->getPath(); ?>" alt="<?= $this->printHtml($media->getName()); ?>">
+                        <img style="max-width: 100%" src="<?= $media->getPath(); ?>" alt="<?= $this->printHtml($media->name); ?>">
                     </div>
                 <?php elseif ($this->isTextFile($media, $path)) : ?>
                     <!-- if markdown show markdown editor, if image show image editor, if text file show textarea only on edit -->
 
-                    <?php if (!\is_file(($media->isAbsolute() ? '' : __DIR__ . '/../../../../') . $media->getPath())) : ?>
+                    <?php if (!\is_file(($media->isAbsolute ? '' : __DIR__ . '/../../../../') . $media->getPath())) : ?>
                         <div class="centerText"><i class="fa fa-question fa-5x"></i></div>
                     <?php else : ?>
                         <template id="iMediaUpdateTpl">
                             <textarea class="textContent" form="iMediaFileUpdate" data-tpl-text="/media/content" data-tpl-value="/media/content" data-marker="tpl" name="content"></textarea>
                         </template>
                         <pre class="textContent" data-tpl-text="/media/content" data-tpl-value="/media/content"><?= $this->printHtml(
-                            $this->getFileContent(($media->isAbsolute() ? '' : __DIR__ . '/../../../../') . $media->getPath())
+                            $this->getFileContent(($media->isAbsolute ? '' : __DIR__ . '/../../../../') . $media->getPath())
                         ); ?></pre>
                     <?php endif; ?>
                 <?php endif; ?>
diff --git a/Theme/Backend/media-upload.tpl.php b/Theme/Backend/media-upload.tpl.php
index b31a73c..355e258 100755
--- a/Theme/Backend/media-upload.tpl.php
+++ b/Theme/Backend/media-upload.tpl.php
@@ -40,9 +40,9 @@ use phpOMS\Uri\UriFactory;
                 <div class="portlet-body">
                     <table class="layout wf-100">
                     <tr><td><label for="iVirtualPath"><?= $this->getHtml('VirtualPath'); ?></label>
-                        <tr><td><input type="text" id="iVirtualPath" name="virtualPath" value="<?= empty($this->request->getUri()->getQuery('path')) ? '/' : $this->request->getUri()->getQuery('path'); ?>" disabled>
+                        <tr><td><input type="text" id="iVirtualPath" name="virtualPath" value="<?= empty($this->request->uri->getQuery('path')) ? '/' : $this->request->uri->getQuery('path'); ?>" disabled>
                         <tr><td><label for="iPath"><?= $this->getHtml('Path'); ?></label>
-                        <tr><td><input type="text" id="iPath" name="path" value="<?= empty($this->request->getUri()->getQuery('path')) ? '/' : $this->request->getUri()->getQuery('path'); ?>">
+                        <tr><td><input type="text" id="iPath" name="path" value="<?= empty($this->request->uri->getQuery('path')) ? '/' : $this->request->uri->getQuery('path'); ?>">
                         <tr><td><label><?= $this->getHtml('Settings'); ?></label>
                         <tr><td>
                                 <label class="checkbox" for="iAddCollection">
diff --git a/Views/MediaView.php b/Views/MediaView.php
index e87a049..784e591 100755
--- a/Views/MediaView.php
+++ b/Views/MediaView.php
@@ -89,7 +89,7 @@ class MediaView extends View
      */
     protected function isCollectionFunction(Media $media, string $sub = null) : bool
     {
-        return ($media->getExtension() === 'collection'
+        return ($media->extension === 'collection'
                 && !\is_file($media->getPath() . ($sub ?? '')))
             || (\is_dir($media->getPath())
                 && ($sub === null || \is_dir($media->getPath() . $sub))
@@ -156,7 +156,7 @@ class MediaView extends View
      */
     protected function isImageFile(Media $media, string $path = '') : bool
     {
-        return FileUtils::getExtensionType($media->getExtension()) === ExtensionType::IMAGE
+        return FileUtils::getExtensionType($media->extension) === ExtensionType::IMAGE
             || FileUtils::getExtensionType(File::extension($path)) === ExtensionType::IMAGE;
     }
 
@@ -172,7 +172,7 @@ class MediaView extends View
      */
     protected function isTextFile(Media $media, string $path = '') : bool
     {
-        $mediaExtension = FileUtils::getExtensionType($media->getExtension());
+        $mediaExtension = FileUtils::getExtensionType($media->extension);
         $pathExtension  = FileUtils::getExtensionType(File::extension($path));
 
         return $mediaExtension === ExtensionType::TEXT || $pathExtension === ExtensionType::TEXT
diff --git a/tests/Controller/Api/ApiControllerCollectionTrait.php b/tests/Controller/Api/ApiControllerCollectionTrait.php
index b6e1aea..d04d524 100755
--- a/tests/Controller/Api/ApiControllerCollectionTrait.php
+++ b/tests/Controller/Api/ApiControllerCollectionTrait.php
@@ -36,7 +36,7 @@ trait ApiControllerCollectionTrait
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('name', 'Test Upload');
 
         if (!\is_dir(__DIR__ . '/temp')) {
@@ -80,7 +80,7 @@ trait ApiControllerCollectionTrait
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('name', 'Test Collection');
         $request->setData('virtualpath', '/');
         $request->setData('media-list', \json_encode($media));
@@ -88,7 +88,7 @@ trait ApiControllerCollectionTrait
         $this->module->apiCollectionCreate($request, $response);
 
         $collection = $response->get('')['response'];
-        self::assertEquals('Test Collection', $collection->getName());
+        self::assertEquals('Test Collection', $collection->name);
         self::assertCount(2, $collection->getSources());
     }
 
@@ -101,10 +101,10 @@ trait ApiControllerCollectionTrait
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
 
         $this->module->apiCollectionCreate($request, $response);
-        self::assertEquals(RequestStatusCode::R_400, $response->getHeader()->getStatusCode());
+        self::assertEquals(RequestStatusCode::R_400, $response->header->status);
     }
 
     /**
@@ -116,7 +116,7 @@ trait ApiControllerCollectionTrait
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('name', 'Test Collection');
         $request->setData('path', '/test/path');
 
@@ -135,13 +135,13 @@ trait ApiControllerCollectionTrait
     public function testApiCollectionFromMedia() : void
     {
         $media = new Media();
-        $media->setCreatedBy(new NullAccount(1));
-        $media->setDescription('desc');
-        $media->setDescriptionRaw('descRaw');
+        $media->createdBy = new NullAccount(1);
+        $media->description = 'desc';
+        $media->descriptionRaw = 'descRaw';
         $media->setPath('some/path');
-        $media->setSize(11);
-        $media->setExtension('png');
-        $media->setName('Media for collection');
+        $media->size = 11;
+        $media->extension = 'png';
+        $media->name = 'Media for collection';
         $id = MediaMapper::create($media);
 
         self::assertGreaterThan(0, $media->getId());
@@ -149,7 +149,7 @@ trait ApiControllerCollectionTrait
 
         $collection = $this->module->createMediaCollectionFromMedia('Collection With Media', '', [$media], 1);
 
-        self::assertEquals('Collection With Media', $collection->getName());
+        self::assertEquals('Collection With Media', $collection->name);
         self::assertCount(1, $collection->getSources());
 
         self::assertInstanceOf(
diff --git a/tests/Controller/Api/ApiControllerMediaTrait.php b/tests/Controller/Api/ApiControllerMediaTrait.php
index 9b5c5a1..ca58aea 100755
--- a/tests/Controller/Api/ApiControllerMediaTrait.php
+++ b/tests/Controller/Api/ApiControllerMediaTrait.php
@@ -71,7 +71,7 @@ trait ApiControllerMediaTrait
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('name', 'Test Upload');
 
         if (!\is_dir(__DIR__ . '/temp')) {
@@ -119,7 +119,7 @@ trait ApiControllerMediaTrait
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('name', 'Test Upload');
         $request->setData('pathsettings', PathSettings::FILE_PATH);
         $request->setData('path', '/../tests/Controller/test/path'); // change path from Media/Files to this path
@@ -185,7 +185,7 @@ trait ApiControllerMediaTrait
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('name', 'Test Media');
         $request->setData('pathsettings', PathSettings::FILE_PATH);
         $request->setData('path', '/../tests/Controller/test/path'); // change path from Media/Files to this path
@@ -222,14 +222,14 @@ trait ApiControllerMediaTrait
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('id', $id);
         $request->setData('name', 'Test Changed');
         $request->setData('content', 'Test Content');
         $this->module->apiMediaUpdate($request, $response);
 
         $media = MediaMapper::get($id);
-        self::assertEquals('Test Changed', $media->getName());
+        self::assertEquals('Test Changed', $media->name);
         self::assertEquals('Test Content', \file_get_contents(__DIR__ . '/../test/path/testFile1.txt'));
 
         Directory::delete(__DIR__ . '/../test');
@@ -244,7 +244,7 @@ trait ApiControllerMediaTrait
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
-        $request->getHeader()->setAccount(1);
+        $request->header->account = 1;
         $request->setData('name', 'Created File');
         $request->setData('content', 'file content');
         $request->setData('filename', 'created.md');
diff --git a/tests/Models/CollectionMapperTest.php b/tests/Models/CollectionMapperTest.php
index d127f65..435b94c 100644
--- a/tests/Models/CollectionMapperTest.php
+++ b/tests/Models/CollectionMapperTest.php
@@ -30,26 +30,26 @@ class CollectionMapperTest extends \PHPUnit\Framework\TestCase
     public function testCR() : void
     {
         $media = new Collection();
-        $media->setCreatedBy(new NullAccount(1));
-        $media->setDescription('desc');
-        $media->setDescriptionRaw('descRaw');
+        $media->createdBy = new NullAccount(1);
+        $media->description = 'desc';
+        $media->descriptionRaw = 'descRaw';
         $media->setPath('some/path');
-        $media->setSize(11);
-        $media->setName('Collection');
+        $media->size = 11;
+        $media->name = 'Collection';
         $id = CollectionMapper::create($media);
 
         self::assertGreaterThan(0, $media->getId());
         self::assertEquals($id, $media->getId());
 
         $mediaR = CollectionMapper::get($media->getId());
-        self::assertEquals($media->getCreatedAt()->format('Y-m-d'), $mediaR->getCreatedAt()->format('Y-m-d'));
-        self::assertEquals($media->getCreatedBy()->getId(), $mediaR->getCreatedBy()->getId());
-        self::assertEquals($media->getDescription(), $mediaR->getDescription());
-        self::assertEquals($media->getDescriptionRaw(), $mediaR->getDescriptionRaw());
+        self::assertEquals($media->createdAt->format('Y-m-d'), $mediaR->createdAt->format('Y-m-d'));
+        self::assertEquals($media->createdBy->getId(), $mediaR->createdBy->getId());
+        self::assertEquals($media->description, $mediaR->description);
+        self::assertEquals($media->descriptionRaw, $mediaR->descriptionRaw);
         self::assertEquals($media->getPath(), $mediaR->getPath());
-        self::assertEquals($media->isAbsolute(), $mediaR->isAbsolute());
-        self::assertEquals($media->getSize(), $mediaR->getSize());
-        self::assertEquals($media->getExtension(), $mediaR->getExtension());
-        self::assertEquals($media->getName(), $mediaR->getName());
+        self::assertEquals($media->isAbsolute, $mediaR->isAbsolute);
+        self::assertEquals($media->size, $mediaR->size);
+        self::assertEquals($media->extension, $mediaR->extension);
+        self::assertEquals($media->name, $mediaR->name);
     }
 }
diff --git a/tests/Models/CollectionTest.php b/tests/Models/CollectionTest.php
index b83787e..eef4c5d 100755
--- a/tests/Models/CollectionTest.php
+++ b/tests/Models/CollectionTest.php
@@ -37,14 +37,14 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
     public function testDefault() : void
     {
         self::assertEquals(0, $this->media->getId());
-        self::assertEquals(0, $this->media->getCreatedBy()->getId());
-        self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->media->getCreatedAt()->format('Y-m-d'));
-        self::assertEquals('collection', $this->media->getExtension());
+        self::assertEquals(0, $this->media->createdBy->getId());
+        self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->media->createdAt->format('Y-m-d'));
+        self::assertEquals('collection', $this->media->extension);
         self::assertEquals('', $this->media->getPath());
-        self::assertEquals('', $this->media->getName());
-        self::assertEquals('', $this->media->getDescription());
-        self::assertEquals(0, $this->media->getSize());
-        self::assertFalse($this->media->isVersioned());
+        self::assertEquals('', $this->media->name);
+        self::assertEquals('', $this->media->description);
+        self::assertEquals(0, $this->media->size);
+        self::assertFalse($this->media->isVersioned);
         self::assertEquals([], $this->media->getSources());
     }
 
@@ -54,8 +54,8 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
      */
     public function testCreatedByInputOutput() : void
     {
-        $this->media->setCreatedBy(new NullAccount(1));
-        self::assertEquals(1, $this->media->getCreatedBy()->getId());
+        $this->media->createdBy = new NullAccount(1);
+        self::assertEquals(1, $this->media->createdBy->getId());
     }
 
     /**
@@ -64,8 +64,8 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
      */
     public function testExtensionInputOutput() : void
     {
-        $this->media->setExtension('pdf');
-        self::assertEquals('collection', $this->media->getExtension());
+        $this->media->extension = 'pdf';
+        self::assertEquals('pdf', $this->media->extension);
     }
 
     /**
@@ -77,7 +77,7 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
         $this->media->setPath('/home/root');
         self::assertEquals('home/root', $this->media->getPath());
 
-        $this->media->setAbsolute(true);
+        $this->media->isAbsolute = true;
         self::assertEquals('/home/root', $this->media->getPath());
     }
 
@@ -87,8 +87,8 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
      */
     public function testDescriptionInputOutput() : void
     {
-        $this->media->setDescription('This is a description');
-        self::assertEquals('This is a description', $this->media->getDescription());
+        $this->media->description = 'This is a description';
+        self::assertEquals('This is a description', $this->media->description);
     }
 
     /**
@@ -97,8 +97,8 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
      */
     public function testSizeInputOutput() : void
     {
-        $this->media->setSize(11);
-        self::assertEquals(11, $this->media->getSize());
+        $this->media->size = 11;
+        self::assertEquals(11, $this->media->size);
     }
 
     /**
@@ -107,8 +107,8 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
      */
     public function testVersionedInputOutput() : void
     {
-        $this->media->setVersioned(true);
-        self::assertFalse($this->media->isVersioned());
+        $this->media->isVersioned = true;
+        self::assertTrue($this->media->isVersioned);
     }
 
     /**
diff --git a/tests/Models/MediaMapperTest.php b/tests/Models/MediaMapperTest.php
index 84d54af..1ca8d36 100755
--- a/tests/Models/MediaMapperTest.php
+++ b/tests/Models/MediaMapperTest.php
@@ -32,28 +32,28 @@ class MediaMapperTest extends \PHPUnit\Framework\TestCase
     public function testCR() : void
     {
         $media = new Media();
-        $media->setCreatedBy(new NullAccount(1));
-        $media->setDescription('desc');
-        $media->setDescriptionRaw('descRaw');
+        $media->createdBy = new NullAccount(1);
+        $media->description = 'desc';
+        $media->descriptionRaw = 'descRaw';
         $media->setPath('some/path');
-        $media->setSize(11);
-        $media->setExtension('png');
-        $media->setName('Image');
+        $media->size = 11;
+        $media->extension = 'png';
+        $media->name = 'Image';
         $id = MediaMapper::create($media);
 
         self::assertGreaterThan(0, $media->getId());
         self::assertEquals($id, $media->getId());
 
         $mediaR = MediaMapper::get($media->getId());
-        self::assertEquals($media->getCreatedAt()->format('Y-m-d'), $mediaR->getCreatedAt()->format('Y-m-d'));
-        self::assertEquals($media->getCreatedBy()->getId(), $mediaR->getCreatedBy()->getId());
-        self::assertEquals($media->getDescription(), $mediaR->getDescription());
-        self::assertEquals($media->getDescriptionRaw(), $mediaR->getDescriptionRaw());
+        self::assertEquals($media->createdAt->format('Y-m-d'), $mediaR->createdAt->format('Y-m-d'));
+        self::assertEquals($media->createdBy->getId(), $mediaR->createdBy->getId());
+        self::assertEquals($media->description, $mediaR->description);
+        self::assertEquals($media->descriptionRaw, $mediaR->descriptionRaw);
         self::assertEquals($media->getPath(), $mediaR->getPath());
-        self::assertEquals($media->isAbsolute(), $mediaR->isAbsolute());
-        self::assertEquals($media->getSize(), $mediaR->getSize());
-        self::assertEquals($media->getExtension(), $mediaR->getExtension());
-        self::assertEquals($media->getName(), $mediaR->getName());
+        self::assertEquals($media->isAbsolute, $mediaR->isAbsolute);
+        self::assertEquals($media->size, $mediaR->size);
+        self::assertEquals($media->extension, $mediaR->extension);
+        self::assertEquals($media->name, $mediaR->name);
     }
 
     /**
@@ -63,27 +63,27 @@ class MediaMapperTest extends \PHPUnit\Framework\TestCase
     public function testAbsolute() : void
     {
         $media = new Media();
-        $media->setCreatedBy(new NullAccount(1));
-        $media->setDescription('desc');
+        $media->createdBy = new NullAccount(1);
+        $media->description = 'desc';
         $media->setPath('https://avatars0.githubusercontent.com/u/16034994');
-        $media->setAbsolute(true);
-        $media->setSize(11);
-        $media->setExtension('png');
-        $media->setName('Absolute path');
+        $media->isAbsolute = true;
+        $media->size = 11;
+        $media->extension = 'png';
+        $media->name = 'Absolute path';
         $id = MediaMapper::create($media);
 
         self::assertGreaterThan(0, $media->getId());
         self::assertEquals($id, $media->getId());
 
         $mediaR = MediaMapper::get($media->getId());
-        self::assertEquals($media->getCreatedAt()->format('Y-m-d'), $mediaR->getCreatedAt()->format('Y-m-d'));
-        self::assertEquals($media->getCreatedBy()->getId(), $mediaR->getCreatedBy()->getId());
-        self::assertEquals($media->getDescription(), $mediaR->getDescription());
+        self::assertEquals($media->createdAt->format('Y-m-d'), $mediaR->createdAt->format('Y-m-d'));
+        self::assertEquals($media->createdBy->getId(), $mediaR->createdBy->getId());
+        self::assertEquals($media->description, $mediaR->description);
         self::assertEquals($media->getPath(), $mediaR->getPath());
-        self::assertEquals($media->isAbsolute(), $mediaR->isAbsolute());
-        self::assertEquals($media->getSize(), $mediaR->getSize());
-        self::assertEquals($media->getExtension(), $mediaR->getExtension());
-        self::assertEquals($media->getName(), $mediaR->getName());
+        self::assertEquals($media->isAbsolute, $mediaR->isAbsolute);
+        self::assertEquals($media->size, $mediaR->size);
+        self::assertEquals($media->extension, $mediaR->extension);
+        self::assertEquals($media->name, $mediaR->name);
     }
 
     /**
@@ -93,27 +93,27 @@ class MediaMapperTest extends \PHPUnit\Framework\TestCase
     public function testDirectoryMapping() : void
     {
         $media = new Media();
-        $media->setCreatedBy(new NullAccount(1));
-        $media->setDescription('desc');
+        $media->createdBy = new NullAccount(1);
+        $media->description = 'desc';
         $media->setPath(\realpath(__DIR__ . '/../../../../../'));
-        $media->setAbsolute(true);
-        $media->setSize(11);
-        $media->setExtension('collection');
-        $media->setName('Directory');
+        $media->isAbsolute = true;
+        $media->size = 11;
+        $media->extension = 'collection';
+        $media->name = 'Directory';
         $id = MediaMapper::create($media);
 
         self::assertGreaterThan(0, $media->getId());
         self::assertEquals($id, $media->getId());
 
         $mediaR = MediaMapper::get($media->getId());
-        self::assertEquals($media->getCreatedAt()->format('Y-m-d'), $mediaR->getCreatedAt()->format('Y-m-d'));
-        self::assertEquals($media->getCreatedBy()->getId(), $mediaR->getCreatedBy()->getId());
-        self::assertEquals($media->getDescription(), $mediaR->getDescription());
+        self::assertEquals($media->createdAt->format('Y-m-d'), $mediaR->createdAt->format('Y-m-d'));
+        self::assertEquals($media->createdBy->getId(), $mediaR->createdBy->getId());
+        self::assertEquals($media->description, $mediaR->description);
         self::assertEquals($media->getPath(), $mediaR->getPath());
-        self::assertEquals($media->isAbsolute(), $mediaR->isAbsolute());
-        self::assertEquals($media->getSize(), $mediaR->getSize());
-        self::assertEquals($media->getExtension(), $mediaR->getExtension());
-        self::assertEquals($media->getName(), $mediaR->getName());
+        self::assertEquals($media->isAbsolute, $mediaR->isAbsolute);
+        self::assertEquals($media->size, $mediaR->size);
+        self::assertEquals($media->extension, $mediaR->extension);
+        self::assertEquals($media->name, $mediaR->name);
     }
 
     /**
@@ -123,14 +123,14 @@ class MediaMapperTest extends \PHPUnit\Framework\TestCase
     public function testGetVirtualPath() : void
     {
         $media = new Media();
-        $media->setCreatedBy(new NullAccount(1));
-        $media->setDescription('desc');
+        $media->createdBy = new NullAccount(1);
+        $media->description = 'desc';
         $media->setPath('https://avatars0.githubusercontent.com/u/16034994');
         $media->setVirtualPath('/mediamappertest/path');
-        $media->setAbsolute(true);
-        $media->setSize(11);
-        $media->setExtension('png');
-        $media->setName('With virtual path');
+        $media->isAbsolute = true;
+        $media->size = 11;
+        $media->extension = 'png';
+        $media->name = 'With virtual path';
         $id = MediaMapper::create($media);
 
         self::assertGreaterThan(0, $media->getId());
@@ -138,14 +138,14 @@ class MediaMapperTest extends \PHPUnit\Framework\TestCase
 
         $found  = MediaMapper::getByVirtualPath($media->getVirtualPath());
         $mediaR = \reset($found);
-        self::assertEquals($media->getCreatedAt()->format('Y-m-d'), $mediaR->getCreatedAt()->format('Y-m-d'));
-        self::assertEquals($media->getCreatedBy()->getId(), $mediaR->getCreatedBy()->getId());
-        self::assertEquals($media->getDescription(), $mediaR->getDescription());
+        self::assertEquals($media->createdAt->format('Y-m-d'), $mediaR->createdAt->format('Y-m-d'));
+        self::assertEquals($media->createdBy->getId(), $mediaR->createdBy->getId());
+        self::assertEquals($media->description, $mediaR->description);
         self::assertEquals($media->getPath(), $mediaR->getPath());
-        self::assertEquals($media->isAbsolute(), $mediaR->isAbsolute());
-        self::assertEquals($media->getSize(), $mediaR->getSize());
-        self::assertEquals($media->getExtension(), $mediaR->getExtension());
-        self::assertEquals($media->getName(), $mediaR->getName());
+        self::assertEquals($media->isAbsolute, $mediaR->isAbsolute);
+        self::assertEquals($media->size, $mediaR->size);
+        self::assertEquals($media->extension, $mediaR->extension);
+        self::assertEquals($media->name, $mediaR->name);
     }
 
     /**
@@ -155,27 +155,27 @@ class MediaMapperTest extends \PHPUnit\Framework\TestCase
     public function testParentcollection() : void
     {
         $collection = new Collection();
-        $collection->setCreatedBy(new NullAccount(1));
-        $collection->setDescription('desc');
-        $collection->setDescriptionRaw('descRaw');
+        $collection->createdBy = new NullAccount(1);
+        $collection->description = 'desc';
+        $collection->descriptionRaw = 'descRaw';
         $collection->setPath('some/path');
         $collection->setVirtualPath('/virtual/path');
-        $collection->setSize(11);
-        $collection->setName('Collection');
+        $collection->size = 11;
+        $collection->name = 'Collection';
         $idCollection = CollectionMapper::create($collection);
 
         self::assertGreaterThan(0, $collection->getId());
         self::assertEquals($idCollection, $collection->getId());
 
         $media = new Media();
-        $media->setCreatedBy(new NullAccount(1));
-        $media->setDescription('desc');
+        $media->createdBy = new NullAccount(1);
+        $media->description = 'desc';
         $media->setPath('https://avatars0.githubusercontent.com/u/16034994');
         $media->setVirtualPath('/virtual/path/Collection');
-        $media->setAbsolute(true);
-        $media->setSize(11);
-        $media->setExtension('png');
-        $media->setName('Absolute path');
+        $media->isAbsolute = true;
+        $media->size = 11;
+        $media->extension = 'png';
+        $media->name = 'Absolute path';
         $idMedia = MediaMapper::create($media);
 
         self::assertGreaterThan(0, $media->getId());
@@ -183,6 +183,6 @@ class MediaMapperTest extends \PHPUnit\Framework\TestCase
 
         $collectionR = MediaMapper::getParentCollection($media->getVirtualPath());
         self::assertEquals($idCollection, $collectionR->getId());
-        self::assertEquals($collection->getName(), $collectionR->getName());
+        self::assertEquals($collection->name, $collectionR->name);
     }
 }
diff --git a/tests/Models/MediaTest.php b/tests/Models/MediaTest.php
index 44244ef..f44e967 100755
--- a/tests/Models/MediaTest.php
+++ b/tests/Models/MediaTest.php
@@ -36,17 +36,17 @@ class MediaTest extends \PHPUnit\Framework\TestCase
     public function testDefault() : void
     {
         self::assertEquals(0, $this->media->getId());
-        self::assertEquals(0, $this->media->getCreatedBy()->getId());
-        self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->media->getCreatedAt()->format('Y-m-d'));
-        self::assertEquals('', $this->media->getExtension());
+        self::assertEquals(0, $this->media->createdBy->getId());
+        self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->media->createdAt->format('Y-m-d'));
+        self::assertEquals('', $this->media->extension);
         self::assertEquals('', $this->media->getPath());
-        self::assertFalse($this->media->isAbsolute());
-        self::assertEquals('', $this->media->getName());
-        self::assertEquals('', $this->media->getDescription());
-        self::assertEquals('', $this->media->getDescriptionRaw());
+        self::assertFalse($this->media->isAbsolute);
+        self::assertEquals('', $this->media->name);
+        self::assertEquals('', $this->media->description);
+        self::assertEquals('', $this->media->descriptionRaw);
         self::assertEquals('/', $this->media->getVirtualPath());
-        self::assertEquals(0, $this->media->getSize());
-        self::assertFalse($this->media->isVersioned());
+        self::assertEquals(0, $this->media->size);
+        self::assertFalse($this->media->isVersioned);
         self::assertFalse($this->media->compareNonce('something'));
         self::assertFalse($this->media->isEncrypted());
     }
@@ -57,8 +57,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
      */
     public function testCreatedByInputOutput() : void
     {
-        $this->media->setCreatedBy(new NullAccount(1));
-        self::assertEquals(1, $this->media->getCreatedBy()->getId());
+        $this->media->createdBy = new NullAccount(1);
+        self::assertEquals(1, $this->media->createdBy->getId());
     }
 
     /**
@@ -67,8 +67,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
      */
     public function testExtensionInputOutput() : void
     {
-        $this->media->setExtension('pdf');
-        self::assertEquals('pdf', $this->media->getExtension());
+        $this->media->extension = 'pdf';
+        self::assertEquals('pdf', $this->media->extension);
     }
 
     /**
@@ -80,7 +80,7 @@ class MediaTest extends \PHPUnit\Framework\TestCase
         $this->media->setPath('/home/root');
         self::assertEquals('home/root', $this->media->getPath());
 
-        $this->media->setAbsolute(true);
+        $this->media->isAbsolute = true;
         self::assertEquals('/home/root', $this->media->getPath());
     }
 
@@ -90,8 +90,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
      */
     public function testAbsolutePathInputOutput() : void
     {
-        $this->media->setAbsolute(true);
-        self::assertTrue($this->media->isAbsolute());
+        $this->media->isAbsolute = true;
+        self::assertTrue($this->media->isAbsolute);
     }
 
     /**
@@ -100,8 +100,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
      */
     public function testNameInputOutput() : void
     {
-        $this->media->setName('Report');
-        self::assertEquals('Report', $this->media->getName());
+        $this->media->name = 'Report';
+        self::assertEquals('Report', $this->media->name);
     }
 
     /**
@@ -110,8 +110,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
      */
     public function testDescriptionInputOutput() : void
     {
-        $this->media->setDescription('This is a description');
-        self::assertEquals('This is a description', $this->media->getDescription());
+        $this->media->description = 'This is a description';
+        self::assertEquals('This is a description', $this->media->description);
     }
 
     /**
@@ -120,8 +120,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
      */
     public function testDescriptionRawInputOutput() : void
     {
-        $this->media->setDescriptionRaw('This is a description raw');
-        self::assertEquals('This is a description raw', $this->media->getDescriptionRaw());
+        $this->media->descriptionRaw = 'This is a description raw';
+        self::assertEquals('This is a description raw', $this->media->descriptionRaw);
     }
 
     /**
@@ -130,8 +130,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
      */
     public function testSizeInputOutput() : void
     {
-        $this->media->setSize(11);
-        self::assertEquals(11, $this->media->getSize());
+        $this->media->size = 11;
+        self::assertEquals(11, $this->media->size);
     }
 
     /**
@@ -140,8 +140,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
      */
     public function testVersionedInputOutput() : void
     {
-        $this->media->setVersioned(true);
-        self::assertTrue($this->media->isVersioned());
+        $this->media->isVersioned = true;
+        self::assertTrue($this->media->isVersioned);
     }
 
     /**
@@ -160,8 +160,8 @@ class MediaTest extends \PHPUnit\Framework\TestCase
      */
     public function testHiddenInputOutput() : void
     {
-        $this->media->setHidden(true);
-        self::assertTrue($this->media->isHidden());
+        $this->media->isHidden = true;
+        self::assertTrue($this->media->isHidden);
     }
 
     /**
@@ -193,17 +193,17 @@ class MediaTest extends \PHPUnit\Framework\TestCase
      */
     public function testSerialize() : void
     {
-        $this->media->setCreatedBy($acc = new NullAccount(1));
-        $this->media->setExtension('pdf');
+        $this->media->createdBy = $acc = new NullAccount(1);
+        $this->media->extension = 'pdf';
         $this->media->setPath('/home/root');
-        $this->media->setAbsolute(true);
-        $this->media->setName('Report');
-        $this->media->setDescription('This is a description');
-        $this->media->setDescriptionRaw('This is a description raw');
-        $this->media->setSize(11);
-        $this->media->setVersioned(true);
+        $this->media->isAbsolute = true;
+        $this->media->name = 'Report';
+        $this->media->description = 'This is a description';
+        $this->media->descriptionRaw = 'This is a description raw';
+        $this->media->size = 11;
+        $this->media->isVersioned = true;
         $this->media->setVirtualPath('/test/path');
-        $this->media->setHidden(true);
+        $this->media->isHidden = true;
 
         self::assertEquals($this->media->toArray(), $this->media->jsonSerialize());
 
diff --git a/tests/Views/MediaViewTest.php b/tests/Views/MediaViewTest.php
index 89d2e3a..a62230a 100644
--- a/tests/Views/MediaViewTest.php
+++ b/tests/Views/MediaViewTest.php
@@ -46,7 +46,7 @@ class MediaViewTest extends \PHPUnit\Framework\TestCase
         );
 
         $media->setPath(__DIR__);
-        $media->setAbsolute(true);
+        $media->isAbsolute = true;
         self::assertEquals(
             __DIR__ . '/MediaViewTest.php',
             $method->invoke($this->view, $media, '/MediaViewTest.php')
@@ -70,7 +70,7 @@ class MediaViewTest extends \PHPUnit\Framework\TestCase
         );
 
         $media->setPath(\realpath(__DIR__ . '/../'));
-        $media->setAbsolute(true);
+        $media->isAbsolute = true;
         self::assertEquals(
             \realpath(__DIR__ . '/../Controller'),
             $method->invoke($this->view, $media, '/Controller')
@@ -88,27 +88,27 @@ class MediaViewTest extends \PHPUnit\Framework\TestCase
 
         $media = new Media();
         $media->setPath(__DIR__);
-        $media->setAbsolute(true);
+        $media->isAbsolute = true;
         self::assertFalse(
             $method->invoke($this->view, $media, '/sub/path')
         );
 
         $media->setPath(__DIR__);
-        $media->setAbsolute(true);
-        $media->setExtension('collection');
+        $media->isAbsolute = true;
+        $media->extension = 'collection';
         self::assertFalse(
             $method->invoke($this->view, $media, '/MediaViewTest.php')
         );
 
         $media->setPath(__DIR__ . '/../');
-        $media->setAbsolute(true);
+        $media->isAbsolute = true;
         self::assertTrue(
             $method->invoke($this->view, $media, '/Views/')
         );
 
         $media->setPath(__DIR__);
-        $media->setAbsolute(true);
-        $media->setExtension('collection');
+        $media->isAbsolute = true;
+        $media->extension = 'collection';
         self::assertTrue(
             $method->invoke($this->view, $media, '/something')
         );
@@ -188,14 +188,14 @@ class MediaViewTest extends \PHPUnit\Framework\TestCase
 
         $media = new Media();
         $media->setPath(__DIR__ . '/test.md');
-        $media->setAbsolute(true);
+        $media->isAbsolute = true;
         self::assertFalse(
             $method->invoke($this->view, $media)
         );
 
         $media->setPath(__DIR__ . '/test.jpg');
-        $media->setExtension('jpg');
-        $media->setAbsolute(true);
+        $media->extension = 'jpg';
+        $media->isAbsolute = true;
         self::assertTrue(
             $method->invoke($this->view, $media)
         );
@@ -212,21 +212,21 @@ class MediaViewTest extends \PHPUnit\Framework\TestCase
 
         $media = new Media();
         $media->setPath(__DIR__ . '/test.jpg');
-        $media->setAbsolute(true);
+        $media->isAbsolute = true;
         self::assertFalse(
             $method->invoke($this->view, $media)
         );
 
         $media->setPath(__DIR__ . '/test.md');
-        $media->setExtension('md');
-        $media->setAbsolute(true);
+        $media->extension = 'md';
+        $media->isAbsolute = true;
         self::assertTrue(
             $method->invoke($this->view, $media)
         );
 
         $media->setPath(__DIR__ . '/test.jpg');
-        $media->setExtension('jpg');
-        $media->setAbsolute(true);
+        $media->extension = 'jpg';
+        $media->isAbsolute = true;
         self::assertTrue(
             $method->invoke($this->view, $media, __DIR__ . '/test.md')
         );