diff --git a/api.php b/api.php
index ce9762aa..ec4779d1 100644
--- a/api.php
+++ b/api.php
@@ -26,7 +26,7 @@ use Psr\Container\ContainerInterface;
 use SP\Domain\Core\Bootstrap\BootstrapInterface;
 use SP\Domain\Core\Bootstrap\ModuleInterface;
 use SP\Modules\Api\Bootstrap;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 
 use function SP\processException;
 
@@ -34,7 +34,7 @@ const APP_ROOT = __DIR__;
 const APP_MODULE = 'api';
 
 try {
-    $dic = FileSystemUtil::require(FileSystemUtil::buildPath(APP_ROOT, 'lib', 'Base.php'), ContainerInterface::class);
+    $dic = FileSystem::require(FileSystem::buildPath(APP_ROOT, 'lib', 'Base.php'), ContainerInterface::class);
 
     Bootstrap::run($dic->get(BootstrapInterface::class), $dic->get(ModuleInterface::class));
 } catch (Throwable $e) {
diff --git a/app/modules/api/Init.php b/app/modules/api/Init.php
index b0f2aca9..818cdd1b 100644
--- a/app/modules/api/Init.php
+++ b/app/modules/api/Init.php
@@ -41,7 +41,7 @@ use SP\Domain\Upgrade\Services\UpgradeDatabaseService;
 use SP\Domain\Upgrade\Services\UpgradeUtil;
 use SP\Infrastructure\Database\DatabaseUtil;
 use SP\Infrastructure\File\FileException;
-use SP\Util\HttpUtil;
+use SP\Util\Http;
 
 use function SP\logger;
 
@@ -91,7 +91,7 @@ final class Init extends HttpModuleBase
         $this->language->setLanguage();
 
         // Checks if it needs to switch the request over HTTPS
-        HttpUtil::checkHttps($this->configData, $this->request);
+        Http::checkHttps($this->configData, $this->request);
 
         // Checks if sysPass is installed
         $this->checkInstalled();
diff --git a/app/modules/cli/Init.php b/app/modules/cli/Init.php
index 5c8bce5e..2f7f8cfa 100644
--- a/app/modules/cli/Init.php
+++ b/app/modules/cli/Init.php
@@ -31,7 +31,7 @@ use SP\Core\Language;
 use SP\Core\ModuleBase;
 use SP\Core\ProvidersHelper;
 use SP\Domain\Core\LanguageInterface;
-use SP\Util\VersionUtil;
+use SP\Util\Version;
 use Symfony\Component\Console\Application as ConsoleApplication;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -96,7 +96,7 @@ final class Init extends ModuleBase
     private function initCli(): void
     {
         $this->consoleApplication->setName('sysPass CLI');
-        $this->consoleApplication->setVersion(implode('.', VersionUtil::getVersionArray()));
+        $this->consoleApplication->setVersion(implode('.', Version::getVersionArray()));
         $this->consoleApplication->addCommands($this->cliCommandHelper->getCommands());
 
         $this->consoleApplication->run(
diff --git a/app/modules/web/Controllers/AccountFile/ViewController.php b/app/modules/web/Controllers/AccountFile/ViewController.php
index 0cea826e..65550868 100644
--- a/app/modules/web/Controllers/AccountFile/ViewController.php
+++ b/app/modules/web/Controllers/AccountFile/ViewController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 
 /**
  * Class ViewController
@@ -61,7 +61,7 @@ final class ViewController extends AccountFileBase
 
             $this->view->addTemplate('file', 'itemshow');
 
-            if (FileSystemUtil::isImage($fileData)) {
+            if (FileSystem::isImage($fileData)) {
                 $this->view->assign('data', chunk_split(base64_encode($fileData->getContent())));
                 $this->view->assign('fileData', $fileData);
                 $this->view->assign('isImage', 1);
diff --git a/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php b/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php
index 39271d53..1799fb87 100644
--- a/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -37,7 +37,7 @@ use SP\Html\DataGrid\DataGridInterface;
 use SP\Html\DataGrid\Layout\DataGridHeader;
 use SP\Html\Html;
 use SP\Infrastructure\Database\QueryResult;
-use SP\Util\DateUtil;
+use SP\Util\Date;
 
 use function SP\__;
 
@@ -143,7 +143,7 @@ final class NotificationGrid extends GridBase
             'date',
             false,
             function ($value) {
-                return DateUtil::getDateFromUnix($value);
+                return Date::getDateFromUnix($value);
             }
         );
         $gridData->addDataRowSource('type');
diff --git a/app/modules/web/Controllers/Helpers/LayoutHelper.php b/app/modules/web/Controllers/Helpers/LayoutHelper.php
index a0a2c5fd..c6dcbeac 100644
--- a/app/modules/web/Controllers/Helpers/LayoutHelper.php
+++ b/app/modules/web/Controllers/Helpers/LayoutHelper.php
@@ -40,8 +40,8 @@ use SP\Html\DataGrid\Action\DataGridAction;
 use SP\Http\Uri;
 use SP\Mvc\View\TemplateInterface;
 use SP\Plugin\PluginManager;
-use SP\Util\FileSystemUtil;
-use SP\Util\VersionUtil;
+use SP\Util\FileSystem;
+use SP\Util\Version;
 
 use function SP\__;
 use function SP\processException;
@@ -151,7 +151,7 @@ final class LayoutHelper extends HelperBase
      */
     protected function getResourcesLinks(): void
     {
-        $version = VersionUtil::getVersionStringNormalized();
+        $version = Version::getVersionStringNormalized();
         $baseUrl = ($this->configData->getApplicationUrl() ?? $this->uriContext->getWebUri()) .
                    $this->uriContext->getSubUri();
 
@@ -171,7 +171,7 @@ final class LayoutHelper extends HelperBase
             $jsUriTheme = new Uri($baseUrl);
             $jsUriTheme->addParams(
                 [
-                    'b' => FileSystemUtil::buildPath($this->theme->getPath(), 'js'),
+                    'b' => FileSystem::buildPath($this->theme->getPath(), 'js'),
                     'f' => implode(',', $themeInfo['js'])
                 ]
             );
@@ -207,7 +207,7 @@ final class LayoutHelper extends HelperBase
             $cssUriTheme = new Uri($baseUrl);
             $cssUriTheme->addParams(
                 [
-                    'b' => FileSystemUtil::buildPath($this->theme->getPath(), 'css'),
+                    'b' => FileSystem::buildPath($this->theme->getPath(), 'css'),
                     'f' => implode(',', $themeInfo['css'])
                 ]
             );
@@ -228,7 +228,7 @@ final class LayoutHelper extends HelperBase
             if (count($jsResources) > 0) {
                 $jsUriPlugin = new Uri($baseUrl);
                 $jsUriPlugin->addParams([
-                                            'b' => FileSystemUtil::buildPath($base, 'js'),
+                                            'b' => FileSystem::buildPath($base, 'js'),
                                             'f' => implode(',', $jsResources)
                                         ]);
 
@@ -239,7 +239,7 @@ final class LayoutHelper extends HelperBase
                 $cssUriPlugin = new Uri($baseUrl);
                 $cssUriPlugin->addParams(
                     [
-                        'b' => FileSystemUtil::buildPath($base, 'css'),
+                        'b' => FileSystem::buildPath($base, 'css'),
                         'f' => implode(',', $cssResources)
                     ]
                 );
diff --git a/app/modules/web/Controllers/PublicLink/SaveCreateFromAccountController.php b/app/modules/web/Controllers/PublicLink/SaveCreateFromAccountController.php
index ea04d9df..30f26d22 100644
--- a/app/modules/web/Controllers/PublicLink/SaveCreateFromAccountController.php
+++ b/app/modules/web/Controllers/PublicLink/SaveCreateFromAccountController.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -32,7 +32,7 @@ use SP\Domain\Account\Services\PublicLink;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
-use SP\Util\PasswordUtil;
+use SP\Util\Password;
 
 /**
  * Class SaveCreateFromAccountController
@@ -65,7 +65,7 @@ final class SaveCreateFromAccountController extends PublicLinkSaveBase
                     'id' => PublicLink::TYPE_ACCOUNT,
                     'itemId' => $accountId,
                     'notify' => (bool)$notify,
-                    'hash' => PasswordUtil::generateRandomBytes()
+                    'hash' => Password::generateRandomBytes()
                 ]
             );
 
diff --git a/app/modules/web/Controllers/Resource/CssController.php b/app/modules/web/Controllers/Resource/CssController.php
index 82e8f87b..378ac29b 100644
--- a/app/modules/web/Controllers/Resource/CssController.php
+++ b/app/modules/web/Controllers/Resource/CssController.php
@@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\Resource;
 
 use SP\Http\Request as HttpRequest;
 use SP\Infrastructure\File\FileHandler;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 
 /**
  * Class CssController
@@ -57,11 +57,11 @@ final class CssController extends ResourceBase
                          ->addFiles($files)
                          ->getMinified();
         } else {
-            $files = $this->buildFiles(FileSystemUtil::buildPath(PUBLIC_PATH, 'vendor', 'css'), self::CSS_MIN_FILES);
+            $files = $this->buildFiles(FileSystem::buildPath(PUBLIC_PATH, 'vendor', 'css'), self::CSS_MIN_FILES);
 
             $this->minify->builder()
                          ->addFiles($files, false)
-                ->addFile(new FileHandler(FileSystemUtil::buildPath(PUBLIC_PATH, 'css', 'fonts.min.css')), false)
+                ->addFile(new FileHandler(FileSystem::buildPath(PUBLIC_PATH, 'css', 'fonts.min.css')), false)
                          ->getMinified();
         }
     }
@@ -77,7 +77,7 @@ final class CssController extends ResourceBase
         $base = $insecure ? HttpRequest::getSecureAppPath($base) : $base;
 
         return array_map(
-            fn(string $file) => new FileHandler(FileSystemUtil::buildPath($base, $file)),
+            fn(string $file) => new FileHandler(FileSystem::buildPath($base, $file)),
             $files
         );
     }
diff --git a/app/modules/web/Controllers/Resource/JsController.php b/app/modules/web/Controllers/Resource/JsController.php
index 2e95363e..f797fee6 100644
--- a/app/modules/web/Controllers/Resource/JsController.php
+++ b/app/modules/web/Controllers/Resource/JsController.php
@@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\Resource;
 
 use SP\Http\Request as HttpRequest;
 use SP\Infrastructure\File\FileHandler;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 
 /**
  * Class JsController
@@ -80,7 +80,7 @@ final class JsController extends ResourceBase
                 $this->minify
                     ->builder()
                     ->addFiles(
-                        $this->buildFiles(FileSystemUtil::buildPath(PUBLIC_PATH, 'vendor', 'js'), self::JS_MIN_FILES),
+                        $this->buildFiles(FileSystem::buildPath(PUBLIC_PATH, 'vendor', 'js'), self::JS_MIN_FILES),
                         false
                     )
                     ->getMinified();
@@ -88,7 +88,7 @@ final class JsController extends ResourceBase
                 $this->minify
                     ->builder()
                     ->addFiles(
-                        $this->buildFiles(FileSystemUtil::buildPath(PUBLIC_PATH, 'js'), self::JS_APP_MIN_FILES),
+                        $this->buildFiles(FileSystem::buildPath(PUBLIC_PATH, 'js'), self::JS_APP_MIN_FILES),
                         false
                     )
                     ->getMinified();
@@ -107,7 +107,7 @@ final class JsController extends ResourceBase
         $base = $insecure ? HttpRequest::getSecureAppPath($base) : $base;
 
         return array_map(
-            fn(string $file) => new FileHandler(FileSystemUtil::buildPath($base, $file)),
+            fn(string $file) => new FileHandler(FileSystem::buildPath($base, $file)),
             $files
         );
     }
diff --git a/app/modules/web/Controllers/Status/StatusController.php b/app/modules/web/Controllers/Status/StatusController.php
index 2ff45c0e..4454dcff 100644
--- a/app/modules/web/Controllers/Status/StatusController.php
+++ b/app/modules/web/Controllers/Status/StatusController.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -29,7 +29,7 @@ use SP\Domain\Core\AppInfoInterface;
 use SP\Domain\Core\Exceptions\CheckException;
 use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
-use SP\Util\VersionUtil;
+use SP\Util\Version;
 use Throwable;
 
 /**
@@ -69,7 +69,7 @@ final class StatusController extends StatusBase
                                   '.'.
                                   $matches['build'];
 
-                    if (VersionUtil::checkVersion(VersionUtil::getVersionStringNormalized(), $pubVersion)) {
+                    if (Version::checkVersion(Version::getVersionStringNormalized(), $pubVersion)) {
                         return $this->returnJsonResponseData([
                             'version'     => $requestData->tag_name,
                             'url'         => $requestData->html_url,
diff --git a/app/modules/web/Init.php b/app/modules/web/Init.php
index 14413e1c..96d7b072 100644
--- a/app/modules/web/Init.php
+++ b/app/modules/web/Init.php
@@ -80,7 +80,7 @@ use SP\Modules\Web\Controllers\Status\StatusController;
 use SP\Modules\Web\Controllers\Task\TrackStatusController;
 use SP\Modules\Web\Controllers\Upgrade\IndexController as UpgradeIndexController;
 use SP\Modules\Web\Controllers\Upgrade\UpgradeController;
-use SP\Util\HttpUtil;
+use SP\Util\Http;
 
 use function SP\logger;
 use function SP\processException;
@@ -211,7 +211,7 @@ final class Init extends HttpModuleBase
         $this->language->setLanguage($isReload);
 
         // Comprobar si es necesario cambiar a HTTPS
-        HttpUtil::checkHttps($this->configData, $this->request);
+        Http::checkHttps($this->configData, $this->request);
 
         $partialInit = in_array($controller, self::PARTIAL_INIT, true);
 
diff --git a/app/modules/web/themes/material-blue/views/account/search-rows.inc b/app/modules/web/themes/material-blue/views/account/search-rows.inc
index 32c9b1e7..715cb665 100644
--- a/app/modules/web/themes/material-blue/views/account/search-rows.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-rows.inc
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -26,7 +26,7 @@
  * @var ThemeIconsInterface $icons
  * @var callable $_getvar
  * @var ConfigDataInterface $configData
- * @var \SP\Domain\Account\Adapters\AccountSearchItem $account
+ * @var AccountSearchItem $account
  * @var DataGridTab $data
  * @var DataGridActionBase $actionMenu
  * @var DataGridActionBase $action
@@ -39,7 +39,7 @@ use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Html\DataGrid\Action\DataGridActionBase;
 use SP\Html\DataGrid\DataGridTab;
-use SP\Util\DateUtil;
+use SP\Util\Date;
 
 if (!isset($data)) {
     $data = $_getvar('data');
@@ -373,7 +373,7 @@ $favoriteRouteOff = $_getvar('favoriteRouteOff');
                                         printf(
                                             '%s: %s',
                                             __('Expiry Date'),
-                                            DateUtil::getDateFromUnix($accountSearchData->getPublicLinkDateExpire())
+                                            Date::getDateFromUnix($accountSearchData->getPublicLinkDateExpire())
                                         ); ?>
                                         <br>
                                         <?php
diff --git a/app/modules/web/themes/material-blue/views/config/info.inc b/app/modules/web/themes/material-blue/views/config/info.inc
index aa0f86ba..4f46fe38 100644
--- a/app/modules/web/themes/material-blue/views/config/info.inc
+++ b/app/modules/web/themes/material-blue/views/config/info.inc
@@ -39,7 +39,7 @@
     use SP\Domain\Install\Services\Installer;
     use SP\Domain\Plugin\Ports\Plugin;
     use SP\Mvc\View\TemplateInterface;
-    use SP\Util\VersionUtil;
+    use SP\Util\Version;
 
     use function SP\__;
 
@@ -60,7 +60,7 @@
             printf(
                 '%s (<b>%s</b>)',
                 Installer::VERSION_TEXT,
-                VersionUtil::getVersionStringNormalized()
+                Version::getVersionStringNormalized()
             ); ?>
             <br>
             <?php
diff --git a/app/modules/web/themes/material-blue/views/main/upgrade.inc b/app/modules/web/themes/material-blue/views/main/upgrade.inc
index 8065cca7..5f08dc9c 100644
--- a/app/modules/web/themes/material-blue/views/main/upgrade.inc
+++ b/app/modules/web/themes/material-blue/views/main/upgrade.inc
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -23,7 +23,7 @@
  */
 
 /**
- * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
+ * @var ThemeIconsInterface $icons
  * @var ConfigDataInterface $configData
  * @var callable $_getvar
  * @var TemplateInterface $this
@@ -35,8 +35,9 @@
             <h1><?php
 
                 use SP\Domain\Config\Ports\ConfigDataInterface;
+                use SP\Domain\Core\UI\ThemeIconsInterface;
                 use SP\Mvc\View\TemplateInterface;
-                use SP\Util\VersionUtil;
+                use SP\Util\Version;
 
                 printf(__('Update %s'), $_getvar('upgradeVersion')); ?></h1>
         </div>
@@ -76,7 +77,7 @@
                 </div>
 
                 <?php
-                if (VersionUtil::checkVersion($_getvar('version'), '130.16011001')
+                if (Version::checkVersion($_getvar('version'), '130.16011001')
                     && count($_getvar('constraints')) > 0
                 ):
                     ?>
@@ -189,7 +190,7 @@
                 endif; ?>
 
                 <?php
-                if (VersionUtil::checkVersion($_getvar('version'), '210.17022601')): ?>
+                if (Version::checkVersion($_getvar('version'), '210.17022601')): ?>
                     <div>
                         <ul class="errors">
                             <li class="msg-warning">
diff --git a/app/modules/web/themes/material-blue/views/notification/notification.inc b/app/modules/web/themes/material-blue/views/notification/notification.inc
index 23d8ada3..e29a46fe 100644
--- a/app/modules/web/themes/material-blue/views/notification/notification.inc
+++ b/app/modules/web/themes/material-blue/views/notification/notification.inc
@@ -35,7 +35,7 @@ use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Domain\Notification\Models\Notification;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;
-use SP\Util\DateUtil;
+use SP\Util\Date;
 
 $notification = $_getvar('notification');
 ?>
@@ -98,7 +98,7 @@ $notification = $_getvar('notification');
                                    name="notification_date" type="text"
                                    class="mdl-textfield__input mdl-color-text--indigo-400"
                                    value="<?php
-                                   echo DateUtil::getDateFromUnix($notification->getDate()); ?>"
+                                   echo Date::getDateFromUnix($notification->getDate()); ?>"
                                 <?php
                                 echo $_getvar('disabled'); ?>>
                             <label class="mdl-textfield__label"
diff --git a/cli.php b/cli.php
index 7729cd1d..346ac6e5 100644
--- a/cli.php
+++ b/cli.php
@@ -24,7 +24,7 @@
 
 use Psr\Container\ContainerInterface;
 use SP\Domain\Core\Bootstrap\ModuleInterface;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 
 use function SP\logger;
 use function SP\processException;
@@ -33,7 +33,7 @@ const APP_ROOT = __DIR__;
 const APP_MODULE = 'cli';
 
 try {
-    $dic = FileSystemUtil::require(FileSystemUtil::buildPath(APP_ROOT, 'lib', 'Base.php'), ContainerInterface::class);
+    $dic = FileSystem::require(FileSystem::buildPath(APP_ROOT, 'lib', 'Base.php'), ContainerInterface::class);
 
     logger('------------');
     logger('Boostrap:cli');
diff --git a/index.php b/index.php
index c3880826..96293340 100644
--- a/index.php
+++ b/index.php
@@ -26,7 +26,7 @@ use Psr\Container\ContainerInterface;
 use SP\Domain\Core\Bootstrap\BootstrapInterface;
 use SP\Domain\Core\Bootstrap\ModuleInterface;
 use SP\Modules\Web\Bootstrap;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 
 use function SP\processException;
 
@@ -34,7 +34,7 @@ const APP_ROOT = __DIR__;
 const APP_MODULE = 'web';
 
 try {
-    $dic = FileSystemUtil::require(FileSystemUtil::buildPath(APP_ROOT, 'lib', 'Base.php'), ContainerInterface::class);
+    $dic = FileSystem::require(FileSystem::buildPath(APP_ROOT, 'lib', 'Base.php'), ContainerInterface::class);
 
     Bootstrap::run($dic->get(BootstrapInterface::class), $dic->get(ModuleInterface::class));
 } catch (Throwable $e) {
diff --git a/lib/BaseFunctions.php b/lib/BaseFunctions.php
index 11861edd..e63597e2 100644
--- a/lib/BaseFunctions.php
+++ b/lib/BaseFunctions.php
@@ -26,7 +26,7 @@ namespace SP;
 
 use Exception;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 use Throwable;
 
 /**
@@ -252,7 +252,7 @@ function initModule(string $module): array
     logger(sprintf('Initializing module: %s', $module));
 
     try {
-        $definitions = FileSystemUtil::require(FileSystemUtil::buildPath(MODULES_PATH, $module, 'module.php'));
+        $definitions = FileSystem::require(FileSystem::buildPath(MODULES_PATH, $module, 'module.php'));
 
         if (is_array($definitions)) {
             return $definitions;
diff --git a/lib/SP/Core/UI/Theme.php b/lib/SP/Core/UI/Theme.php
index dc8d90aa..e700d650 100644
--- a/lib/SP/Core/UI/Theme.php
+++ b/lib/SP/Core/UI/Theme.php
@@ -31,7 +31,7 @@ use SP\Domain\Core\UI\ThemeContextInterface;
 use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Domain\Core\UI\ThemeInterface;
 use SP\Infrastructure\File\FileException;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 
 use function SP\processException;
 
@@ -70,8 +70,8 @@ final class Theme implements ThemeInterface
         while (false !== ($themeDir = $directory->read())) {
             if (is_dir($themeDir) && $themeDir !== '.' && $themeDir !== '..') {
                 try {
-                    $themeInfo = FileSystemUtil::require(
-                        FileSystemUtil::buildPath($this->themeContext->getViewsPath(), $themeDir, 'index.php')
+                    $themeInfo = FileSystem::require(
+                        FileSystem::buildPath($this->themeContext->getViewsPath(), $themeDir, 'index.php')
                     );
 
                     if (is_array($themeInfo) && isset($themeInfo['name'])) {
@@ -107,8 +107,8 @@ final class Theme implements ThemeInterface
     public function getInfo(): array
     {
         try {
-            $themeInfo = FileSystemUtil::require(
-                FileSystemUtil::buildPath($this->themeContext->getFullPath(), 'index.php')
+            $themeInfo = FileSystem::require(
+                FileSystem::buildPath($this->themeContext->getFullPath(), 'index.php')
             );
 
             if (is_array($themeInfo)) {
diff --git a/lib/SP/Core/UI/ThemeContext.php b/lib/SP/Core/UI/ThemeContext.php
index 19a8bd3b..281319e3 100644
--- a/lib/SP/Core/UI/ThemeContext.php
+++ b/lib/SP/Core/UI/ThemeContext.php
@@ -26,7 +26,7 @@ namespace SP\Core\UI;
 
 use Directory;
 use SP\Domain\Core\UI\ThemeContextInterface;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 
 /**
  * Class ThemeContext
@@ -45,9 +45,9 @@ final class ThemeContext implements ThemeContextInterface
         private readonly string $module,
         private readonly string $name
     ) {
-        $this->fullPath = FileSystemUtil::buildPath($basePath, $name);
-        $this->path = FileSystemUtil::buildPath(str_replace(APP_ROOT, '', $basePath), $name);
-        $this->viewsPath = FileSystemUtil::buildPath($this->fullPath, 'views');
+        $this->fullPath = FileSystem::buildPath($basePath, $name);
+        $this->path = FileSystem::buildPath(str_replace(APP_ROOT, '', $basePath), $name);
+        $this->viewsPath = FileSystem::buildPath($this->fullPath, 'views');
         $this->uri = sprintf(
             '%s/app/modules/%s/themes/%s',
             $baseUri,
diff --git a/lib/SP/Core/UI/ThemeIcons.php b/lib/SP/Core/UI/ThemeIcons.php
index 7dc00631..1be41f57 100644
--- a/lib/SP/Core/UI/ThemeIcons.php
+++ b/lib/SP/Core/UI/ThemeIcons.php
@@ -33,7 +33,7 @@ use SP\Domain\Storage\Ports\FileCacheService;
 use SP\Html\Assets\FontIcon;
 use SP\Html\Assets\IconInterface;
 use SP\Infrastructure\File\FileException;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 
 use function SP\logger;
 use function SP\processException;
@@ -73,8 +73,8 @@ final class ThemeIcons implements ThemeIconsInterface
                 // logger('Loaded icons cache', 'INFO');
             }
 
-            $icons = FileSystemUtil::require(
-                FileSystemUtil::buildPath($themeContext->getFullPath(), 'inc', 'Icons.php'),
+            $icons = FileSystem::require(
+                FileSystem::buildPath($themeContext->getFullPath(), 'inc', 'Icons.php'),
                 ThemeIconsInterface::class
             );
 
diff --git a/lib/SP/Domain/Account/Dtos/PublicLinkKey.php b/lib/SP/Domain/Account/Dtos/PublicLinkKey.php
index 5fcd915c..9ef98273 100644
--- a/lib/SP/Domain/Account/Dtos/PublicLinkKey.php
+++ b/lib/SP/Domain/Account/Dtos/PublicLinkKey.php
@@ -25,7 +25,7 @@
 namespace SP\Domain\Account\Dtos;
 
 use Defuse\Crypto\Exception\EnvironmentIsBrokenException;
-use SP\Util\PasswordUtil;
+use SP\Util\Password;
 
 /**
  * Class PublicLinkKey
@@ -45,7 +45,7 @@ final class PublicLinkKey
         $this->salt = $salt;
 
         if ($hash === null) {
-            $this->hash = PasswordUtil::generateRandomBytes();
+            $this->hash = Password::generateRandomBytes();
         } else {
             $this->hash = $hash;
         }
diff --git a/lib/SP/Domain/Account/Services/AccountFile.php b/lib/SP/Domain/Account/Services/AccountFile.php
index 96c7e496..c1733456 100644
--- a/lib/SP/Domain/Account/Services/AccountFile.php
+++ b/lib/SP/Domain/Account/Services/AccountFile.php
@@ -39,7 +39,7 @@ use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Image\Ports\ImageService;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Infrastructure\Database\QueryResult;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 
 use function SP\__u;
 
@@ -69,7 +69,7 @@ final class AccountFile extends Service implements AccountFileService
      */
     public function create(File $itemData): int
     {
-        if (FileSystemUtil::isImage($itemData)) {
+        if (FileSystem::isImage($itemData)) {
             $itemData->setThumb($this->imageUtil->createThumbnail($itemData->getContent()));
         } else {
             $itemData->setThumb('no_thumb');
diff --git a/lib/SP/Domain/Auth/Services/AuthToken.php b/lib/SP/Domain/Auth/Services/AuthToken.php
index 30e085f8..4e9126bb 100644
--- a/lib/SP/Domain/Auth/Services/AuthToken.php
+++ b/lib/SP/Domain/Auth/Services/AuthToken.php
@@ -46,7 +46,7 @@ use SP\Domain\Core\Exceptions\SPException;
 use SP\Infrastructure\Common\Repositories\DuplicatedItemException;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Infrastructure\Database\QueryResult;
-use SP\Util\PasswordUtil;
+use SP\Util\Password;
 use SP\Util\Serde;
 
 use function SP\__u;
@@ -218,7 +218,7 @@ final class AuthToken extends Service implements AuthTokenService
      */
     private function generateToken(): string
     {
-        return PasswordUtil::generateRandomBytes(32);
+        return Password::generateRandomBytes(32);
     }
 
     /**
diff --git a/lib/SP/Domain/Auth/Services/LoginUser.php b/lib/SP/Domain/Auth/Services/LoginUser.php
index 9a6d0c8b..3b258665 100644
--- a/lib/SP/Domain/Auth/Services/LoginUser.php
+++ b/lib/SP/Domain/Auth/Services/LoginUser.php
@@ -38,7 +38,7 @@ use SP\Domain\Http\RequestInterface;
 use SP\Domain\Security\Ports\TrackService;
 use SP\Domain\User\Dtos\UserDataDto;
 use SP\Domain\User\Ports\UserPassRecoverService;
-use SP\Util\PasswordUtil;
+use SP\Util\Password;
 
 use function SP\__u;
 
@@ -89,7 +89,7 @@ final class LoginUser extends LoginBase implements LoginUserService
                     new Event($this, EventMessage::factory()->addDetail(__u('User'), $userDataDto->getLogin()))
                 );
 
-                $hash = PasswordUtil::generateRandomBytes(16);
+                $hash = Password::generateRandomBytes(16);
 
                 $this->userPassRecoverService->add($userDataDto->getId(), $hash);
 
diff --git a/lib/SP/Domain/Config/Adapters/ConfigData.php b/lib/SP/Domain/Config/Adapters/ConfigData.php
index 50b0a9c8..87755f7a 100644
--- a/lib/SP/Domain/Config/Adapters/ConfigData.php
+++ b/lib/SP/Domain/Config/Adapters/ConfigData.php
@@ -27,7 +27,7 @@ namespace SP\Domain\Config\Adapters;
 use SP\Core\DataCollection;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Util\Serde;
-use SP\Util\VersionUtil;
+use SP\Util\Version;
 
 /**
  * Class ConfigData
@@ -1142,7 +1142,7 @@ final class ConfigData extends DataCollection implements ConfigDataInterface
 
     public function getAppVersion(): string
     {
-        return $this->get(ConfigDataInterface::APP_VERSION, VersionUtil::getVersionStringNormalized());
+        return $this->get(ConfigDataInterface::APP_VERSION, Version::getVersionStringNormalized());
     }
 
     public function setAppVersion(?string $appVersion): ConfigDataInterface
diff --git a/lib/SP/Domain/Config/Services/ConfigFile.php b/lib/SP/Domain/Config/Services/ConfigFile.php
index 09734806..db19ac11 100644
--- a/lib/SP/Domain/Config/Services/ConfigFile.php
+++ b/lib/SP/Domain/Config/Services/ConfigFile.php
@@ -36,7 +36,7 @@ use SP\Domain\Core\Exceptions\ConfigException;
 use SP\Domain\Storage\Ports\FileCacheService;
 use SP\Domain\Storage\Ports\XmlFileStorageService;
 use SP\Infrastructure\File\FileException;
-use SP\Util\PasswordUtil;
+use SP\Util\Password;
 
 use function SP\logger;
 use function SP\processException;
@@ -187,7 +187,7 @@ class ConfigFile implements ConfigFileService
         $configData = new ConfigData();
 
         // Generate a random salt that is used to add more seed to some passwords
-        $configData->setPasswordSalt(PasswordUtil::generateRandomBytes());
+        $configData->setPasswordSalt(Password::generateRandomBytes());
 
         $this->save($configData, false);
 
@@ -227,7 +227,7 @@ class ConfigFile implements ConfigFileService
         if (empty($this->configData->getUpgradeKey())) {
             logger('Generating upgrade key');
 
-            return $this->save($this->configData->setUpgradeKey(PasswordUtil::generateRandomBytes(16)), false);
+            return $this->save($this->configData->setUpgradeKey(Password::generateRandomBytes(16)), false);
         }
 
         return $this;
diff --git a/lib/SP/Domain/Crypt/Services/TemporaryMasterPass.php b/lib/SP/Domain/Crypt/Services/TemporaryMasterPass.php
index b75f9781..9719cedf 100644
--- a/lib/SP/Domain/Crypt/Services/TemporaryMasterPass.php
+++ b/lib/SP/Domain/Crypt/Services/TemporaryMasterPass.php
@@ -43,7 +43,7 @@ use SP\Domain\Crypt\Ports\TemporaryMasterPassService;
 use SP\Domain\Notification\Ports\MailService;
 use SP\Domain\User\Ports\UserService;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
-use SP\Util\PasswordUtil;
+use SP\Util\Password;
 
 use function SP\__;
 use function SP\__u;
@@ -95,7 +95,7 @@ final class TemporaryMasterPass extends Service implements TemporaryMasterPassSe
             $this->maxTime = time() + $maxTime;
 
             // Encriptar la clave maestra con hash aleatorio generado
-            $randomKey = PasswordUtil::generateRandomBytes(32);
+            $randomKey = Password::generateRandomBytes(32);
             $secureKey = $this->crypt->makeSecuredKey($randomKey);
 
             $configRequest = new ConfigRequest();
diff --git a/lib/SP/Domain/Export/Services/BackupFileHelper.php b/lib/SP/Domain/Export/Services/BackupFileHelper.php
index 16fc6a65..86a79bd7 100644
--- a/lib/SP/Domain/Export/Services/BackupFileHelper.php
+++ b/lib/SP/Domain/Export/Services/BackupFileHelper.php
@@ -33,7 +33,7 @@ use SP\Domain\File\Ports\DirectoryHandlerService;
 use SP\Domain\File\Ports\FileHandlerInterface;
 use SP\Infrastructure\File\ArchiveHandler;
 use SP\Infrastructure\File\FileHandler;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 
 /**
  * BackupFileHelper
@@ -73,7 +73,7 @@ final class BackupFileHelper implements BackupFileHelperService
         string $hash,
         bool   $compressed = false
     ): string {
-        $file = sprintf('%s_app-%s', FileSystemUtil::buildPath($path, AppInfoInterface::APP_NAME), $hash);
+        $file = sprintf('%s_app-%s', FileSystem::buildPath($path, AppInfoInterface::APP_NAME), $hash);
 
         if ($compressed) {
             return $file . ArchiveHandler::COMPRESS_EXTENSION;
@@ -87,7 +87,7 @@ final class BackupFileHelper implements BackupFileHelperService
         string $hash,
         bool   $compressed = false
     ): string {
-        $file = sprintf('%s_db-%s', FileSystemUtil::buildPath($path, AppInfoInterface::APP_NAME), $hash);
+        $file = sprintf('%s_db-%s', FileSystem::buildPath($path, AppInfoInterface::APP_NAME), $hash);
 
         if ($compressed) {
             return $file . ArchiveHandler::COMPRESS_EXTENSION;
diff --git a/lib/SP/Domain/Export/Services/XmlExport.php b/lib/SP/Domain/Export/Services/XmlExport.php
index b443377b..75b33d41 100644
--- a/lib/SP/Domain/Export/Services/XmlExport.php
+++ b/lib/SP/Domain/Export/Services/XmlExport.php
@@ -46,8 +46,8 @@ use SP\Domain\Export\Ports\XmlTagExportService;
 use SP\Domain\File\Ports\DirectoryHandlerService;
 use SP\Infrastructure\File\ArchiveHandler;
 use SP\Infrastructure\File\FileException;
-use SP\Util\FileSystemUtil;
-use SP\Util\VersionUtil;
+use SP\Util\FileSystem;
+use SP\Util\Version;
 
 use function SP\__u;
 
@@ -116,7 +116,7 @@ final class XmlExport extends Service implements XmlExportService
 
     private static function deleteExportFiles(string $path): void
     {
-        $path = FileSystemUtil::buildPath($path, AppInfoInterface::APP_NAME);
+        $path = FileSystem::buildPath($path, AppInfoInterface::APP_NAME);
 
         array_map(
             static fn($file) => @unlink($file),
@@ -186,7 +186,7 @@ final class XmlExport extends Service implements XmlExportService
             $nodeMeta = $this->document->createElement('Meta');
             $nodeMeta->append(
                 $this->document->createElement('Generator', 'sysPass'),
-                $this->document->createElement('Version', VersionUtil::getVersionStringNormalized()),
+                $this->document->createElement('Version', Version::getVersionStringNormalized()),
                 $this->document->createElement('Time', time()),
                 $this->document->createElement(
                     'User',
diff --git a/lib/SP/Domain/Export/Services/XmlVerify.php b/lib/SP/Domain/Export/Services/XmlVerify.php
index a0c8d219..dd36ae24 100644
--- a/lib/SP/Domain/Export/Services/XmlVerify.php
+++ b/lib/SP/Domain/Export/Services/XmlVerify.php
@@ -34,7 +34,7 @@ use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Crypt\CryptInterface;
 use SP\Domain\Core\Exceptions\CryptException;
 use SP\Domain\Export\Ports\XmlVerifyService;
-use SP\Util\VersionUtil;
+use SP\Util\Version;
 
 use function SP\__u;
 
@@ -125,7 +125,7 @@ final class XmlVerify extends Service implements XmlVerifyService
      */
     private static function checkVersion(string $version): void
     {
-        if (VersionUtil::checkVersion($version, [self::XML_MIN_VERSION])) {
+        if (Version::checkVersion($version, [self::XML_MIN_VERSION])) {
             throw ServiceException::error(
                 sprintf(
                     'Sorry, this XML version is not compatible. Please use >= %s',
@@ -177,7 +177,7 @@ final class XmlVerify extends Service implements XmlVerifyService
     {
         $dataNodes = (new DOMXPath($this->document))->query('/Root/Encrypted/Data');
 
-        $decode = VersionUtil::checkVersion($this->getXmlVersion(), '320.0');
+        $decode = Version::checkVersion($this->getXmlVersion(), '320.0');
 
         /** @var $node DOMElement */
         foreach ($dataNodes as $node) {
diff --git a/lib/SP/Domain/Import/Services/SyspassImport.php b/lib/SP/Domain/Import/Services/SyspassImport.php
index e43eb412..e2f1eded 100644
--- a/lib/SP/Domain/Import/Services/SyspassImport.php
+++ b/lib/SP/Domain/Import/Services/SyspassImport.php
@@ -42,7 +42,7 @@ use SP\Domain\Export\Services\XmlVerify;
 use SP\Domain\Import\Dtos\ImportParamsDto;
 use SP\Domain\Import\Ports\ItemsImportService;
 use SP\Domain\Tag\Models\Tag;
-use SP\Util\VersionUtil;
+use SP\Util\Version;
 
 use function SP\__;
 use function SP\__u;
@@ -97,7 +97,7 @@ final class SyspassImport extends XmlImportBase implements ItemsImportService
      */
     private function getXmlVersion(): float|int
     {
-        return VersionUtil::versionToInteger(
+        return Version::versionToInteger(
             (new DOMXPath($this->document))->query('/Root/Meta/Version')->item(0)?->nodeValue ?? 0
         );
     }
diff --git a/lib/SP/Domain/Install/Services/Installer.php b/lib/SP/Domain/Install/Services/Installer.php
index 569b2536..f8b25153 100644
--- a/lib/SP/Domain/Install/Services/Installer.php
+++ b/lib/SP/Domain/Install/Services/Installer.php
@@ -47,7 +47,7 @@ use SP\Domain\User\Ports\UserProfileService;
 use SP\Domain\User\Ports\UserService;
 use SP\Infrastructure\Database\DatabaseConnectionData;
 use SP\Infrastructure\File\FileException;
-use SP\Util\VersionUtil;
+use SP\Util\Version;
 
 use function SP\__u;
 use function SP\processException;
@@ -192,7 +192,7 @@ final class Installer implements InstallerService
         $this->configService->create(
             new Config([
                            'parameter' => 'version',
-                           'value' => VersionUtil::getVersionStringNormalized()
+                           'value' => Version::getVersionStringNormalized()
                        ])
         );
 
@@ -258,9 +258,9 @@ final class Installer implements InstallerService
     private function setupConfig(): ConfigDataInterface
     {
         $configData = $this->config->getConfigData()
-                                   ->setConfigVersion(VersionUtil::getVersionStringNormalized())
-                                   ->setDatabaseVersion(VersionUtil::getVersionStringNormalized())
-                                   ->setAppVersion(VersionUtil::getVersionStringNormalized())
+            ->setConfigVersion(Version::getVersionStringNormalized())
+            ->setDatabaseVersion(Version::getVersionStringNormalized())
+            ->setAppVersion(Version::getVersionStringNormalized())
                                    ->setUpgradeKey(null)
                                    ->setDbHost($this->installData->getDbHost())
                                    ->setDbSocket($this->installData->getDbSocket())
diff --git a/lib/SP/Domain/Install/Services/MysqlService.php b/lib/SP/Domain/Install/Services/MysqlService.php
index c4218a62..12ab8302 100644
--- a/lib/SP/Domain/Install/Services/MysqlService.php
+++ b/lib/SP/Domain/Install/Services/MysqlService.php
@@ -33,7 +33,7 @@ use SP\Domain\Install\Adapters\InstallData;
 use SP\Infrastructure\Database\DatabaseException;
 use SP\Infrastructure\Database\DatabaseUtil;
 use SP\Infrastructure\File\FileException;
-use SP\Util\PasswordUtil;
+use SP\Util\Password;
 
 use function SP\__;
 use function SP\__u;
@@ -87,7 +87,7 @@ final readonly class MysqlService implements DatabaseSetupInterface
     public function setupDbUser(): array
     {
         $user = substr(uniqid('sp_', true), 0, 16);
-        $pass = PasswordUtil::randomPassword();
+        $pass = Password::randomPassword();
 
         try {
             // Comprobar si el usuario proporcionado existe
diff --git a/lib/SP/Domain/Plugin/Services/PluginUpgrader.php b/lib/SP/Domain/Plugin/Services/PluginUpgrader.php
index 052fb3c3..6d6d6566 100644
--- a/lib/SP/Domain/Plugin/Services/PluginUpgrader.php
+++ b/lib/SP/Domain/Plugin/Services/PluginUpgrader.php
@@ -34,7 +34,7 @@ use SP\Domain\Plugin\Ports\Plugin;
 use SP\Domain\Plugin\Ports\PluginManagerService;
 use SP\Domain\Plugin\Ports\PluginUpgraderInterface;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
-use SP\Util\VersionUtil;
+use SP\Util\Version;
 
 use function SP\__;
 use function SP\__u;
@@ -75,7 +75,7 @@ final class PluginUpgrader extends Service implements PluginUpgraderInterface
         }
 
         if ($pluginModel->getVersionLevel() === null
-            || VersionUtil::checkVersion($pluginModel->getVersionLevel(), $version)
+            || Version::checkVersion($pluginModel->getVersionLevel(), $version)
         ) {
             $this->eventDispatcher->notify(
                 'plugin.upgrade.process',
diff --git a/lib/SP/Domain/Providers/Acl/AclHandler.php b/lib/SP/Domain/Providers/Acl/AclHandler.php
index 86a76b03..4cef69e7 100644
--- a/lib/SP/Domain/Providers/Acl/AclHandler.php
+++ b/lib/SP/Domain/Providers/Acl/AclHandler.php
@@ -35,7 +35,7 @@ use SP\Domain\Providers\EventsTrait;
 use SP\Domain\Providers\Provider;
 use SP\Domain\User\Ports\UserGroupService;
 use SP\Domain\User\Ports\UserProfileService;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 
 use function SP\__u;
 use function SP\logger;
@@ -140,7 +140,7 @@ final class AclHandler extends Provider implements EventReceiver
         logger(sprintf('Clearing ACL for user ID: %d', $userId));
 
         try {
-            if (FileSystemUtil::rmdirRecursive(AccountAcl::ACL_PATH . $userId) === false) {
+            if (FileSystem::rmdirRecursive(AccountAcl::ACL_PATH . $userId) === false) {
                 logger(sprintf('Unable to delete %s directory', AccountAcl::ACL_PATH . $userId));
 
                 return false;
diff --git a/lib/SP/Domain/Task/Services/Task.php b/lib/SP/Domain/Task/Services/Task.php
index a9485862..9f4817c2 100644
--- a/lib/SP/Domain/Task/Services/Task.php
+++ b/lib/SP/Domain/Task/Services/Task.php
@@ -31,7 +31,7 @@ use SP\Domain\File\Ports\FileHandlerInterface;
 use SP\Domain\Task\Ports\TaskInterface;
 use SP\Infrastructure\File\FileException;
 use SP\Infrastructure\File\FileHandler;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 use SP\Util\Serde;
 
 use function SP\logger;
@@ -73,7 +73,7 @@ final class Task implements TaskInterface
      */
     private function checkFile(): bool
     {
-        $tempDir = FileSystemUtil::getTempDir();
+        $tempDir = FileSystem::getTempDir();
 
         if ($tempDir !== false) {
             $this->fileOut = new FileHandler(
diff --git a/lib/SP/Domain/Task/Services/TaskService.php b/lib/SP/Domain/Task/Services/TaskService.php
index 19174458..6fc88861 100644
--- a/lib/SP/Domain/Task/Services/TaskService.php
+++ b/lib/SP/Domain/Task/Services/TaskService.php
@@ -31,7 +31,7 @@ use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Task\Ports\TaskServiceInterface;
 use SP\Infrastructure\File\FileException;
 use SP\Infrastructure\File\FileHandler;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 
 /**
  * Class TaskService
@@ -64,7 +64,7 @@ final class TaskService extends Service implements TaskServiceInterface
     public function trackStatus(string $taskId, Closure $messagePusher): void
     {
         $this->taskId = $taskId;
-        $this->taskDirectory = FileSystemUtil::getTempDir();
+        $this->taskDirectory = FileSystem::getTempDir();
         $this->messagePusher = $messagePusher;
 
         if ($this->taskDirectory === false || !$this->getLock()) {
diff --git a/lib/SP/Domain/Upgrade/Services/UpgradeBase.php b/lib/SP/Domain/Upgrade/Services/UpgradeBase.php
index 9ad3c460..fd9f16e7 100644
--- a/lib/SP/Domain/Upgrade/Services/UpgradeBase.php
+++ b/lib/SP/Domain/Upgrade/Services/UpgradeBase.php
@@ -32,7 +32,7 @@ use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Providers\Ports\FileLogHandlerProvider;
 use SP\Domain\Upgrade\Ports\UpgradeService;
 use SP\Infrastructure\File\FileException;
-use SP\Util\VersionUtil;
+use SP\Util\Version;
 
 use function SP\__u;
 use function SP\logger;
@@ -56,7 +56,7 @@ abstract class UpgradeBase extends Service implements UpgradeService
      */
     final public static function needsUpgrade(string $version): bool
     {
-        return !empty($version) && VersionUtil::checkVersion($version, static::getUpgrades());
+        return !empty($version) && Version::checkVersion($version, static::getUpgrades());
     }
 
     abstract protected static function getUpgrades(): array;
@@ -82,7 +82,7 @@ abstract class UpgradeBase extends Service implements UpgradeService
 
         $upgradeVersions = array_filter(
             static::getUpgrades(),
-            static fn(string $appVersion) => VersionUtil::checkVersion($version, $appVersion)
+            static fn(string $appVersion) => Version::checkVersion($version, $appVersion)
         );
 
         foreach ($upgradeVersions as $upgradeVersion) {
diff --git a/lib/SP/Domain/Upgrade/Services/UpgradeUtil.php b/lib/SP/Domain/Upgrade/Services/UpgradeUtil.php
index 0dd2e50a..c0e4eea0 100644
--- a/lib/SP/Domain/Upgrade/Services/UpgradeUtil.php
+++ b/lib/SP/Domain/Upgrade/Services/UpgradeUtil.php
@@ -27,7 +27,7 @@ namespace SP\Domain\Upgrade\Services;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Config\Ports\ConfigFileService;
 use SP\Infrastructure\File\FileException;
-use SP\Util\VersionUtil;
+use SP\Util\Version;
 
 /**
  * Class UpgradeUtil
@@ -59,7 +59,7 @@ final class UpgradeUtil
         // when upgrading from v2
         // $dbVersion is always '' when upgrading from v2
         if (!empty($configData->getDatabaseVersion()) && empty($configData->getAppVersion())) {
-            $configData->setAppVersion(VersionUtil::getVersionStringNormalized());
+            $configData->setAppVersion(Version::getVersionStringNormalized());
             $config->save($configData, false);
         }
     }
diff --git a/lib/SP/Domain/User/Services/UserPassRecover.php b/lib/SP/Domain/User/Services/UserPassRecover.php
index 1f253976..75644071 100644
--- a/lib/SP/Domain/User/Services/UserPassRecover.php
+++ b/lib/SP/Domain/User/Services/UserPassRecover.php
@@ -36,7 +36,7 @@ use SP\Domain\User\Models\UserPassRecover as UserPassRecoverModel;
 use SP\Domain\User\Ports\UserPassRecoverRepository;
 use SP\Domain\User\Ports\UserPassRecoverService;
 use SP\Html\Html;
-use SP\Util\PasswordUtil;
+use SP\Util\Password;
 
 use function SP\__;
 use function SP\__u;
@@ -104,7 +104,7 @@ final class UserPassRecover extends Service implements UserPassRecoverService
             throw ServiceException::warning(__u('Attempts exceeded'));
         }
 
-        $hash = PasswordUtil::generateRandomBytes(16);
+        $hash = Password::generateRandomBytes(16);
 
         $this->add($id, $hash);
 
diff --git a/lib/SP/Http/Request.php b/lib/SP/Http/Request.php
index bc83dc6e..eb07d6df 100644
--- a/lib/SP/Http/Request.php
+++ b/lib/SP/Http/Request.php
@@ -33,7 +33,7 @@ use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Html\Header;
 use SP\Domain\Http\Method;
 use SP\Domain\Http\RequestInterface;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 use SP\Util\Filter;
 use SP\Util\Util;
 
@@ -110,7 +110,7 @@ class Request implements RequestInterface
             return '';
         }
 
-        $realPath = realpath(FileSystemUtil::buildPath($base, $path));
+        $realPath = realpath(FileSystem::buildPath($base, $path));
 
         if ($realPath === false || !str_starts_with($realPath, $base)) {
             return '';
diff --git a/lib/SP/Mvc/Controller/Validators/Validator.php b/lib/SP/Mvc/Controller/Validators/Validator.php
index ae4b81ab..4762d022 100644
--- a/lib/SP/Mvc/Controller/Validators/Validator.php
+++ b/lib/SP/Mvc/Controller/Validators/Validator.php
@@ -26,8 +26,6 @@ namespace SP\Mvc\Controller\Validators;
 
 /**
  * Class Validator
- *
- * @package SP\Util
  */
 final class Validator
 {
diff --git a/lib/SP/Mvc/View/Components/DataTab.php b/lib/SP/Mvc/View/Components/DataTab.php
index a497655b..48c9bef5 100644
--- a/lib/SP/Mvc/View/Components/DataTab.php
+++ b/lib/SP/Mvc/View/Components/DataTab.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -29,18 +29,12 @@ use SP\Mvc\View\TemplateInterface;
 
 /**
  * Class DataTab
- *
- * @package SP\Mvc\View\Components
  */
-final class DataTab
+final readonly class DataTab
 {
-    protected string            $title;
-    protected TemplateInterface $template;
 
-    public function __construct(string $title, TemplateInterface $template)
+    public function __construct(protected string $title, protected TemplateInterface $template)
     {
-        $this->title = $title;
-        $this->template = $template;
     }
 
     public function getTitle(): string
@@ -48,13 +42,6 @@ final class DataTab
         return $this->title;
     }
 
-    public function setTitle(string $title): DataTab
-    {
-        $this->title = $title;
-
-        return $this;
-    }
-
     public function render(): string
     {
         try {
@@ -63,5 +50,4 @@ final class DataTab
             return $e->getMessage();
         }
     }
-
 }
diff --git a/lib/SP/Mvc/View/Components/SelectItem.php b/lib/SP/Mvc/View/Components/SelectItem.php
index 0c28e1d4..e5e0d0d4 100644
--- a/lib/SP/Mvc/View/Components/SelectItem.php
+++ b/lib/SP/Mvc/View/Components/SelectItem.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -25,32 +25,21 @@
 namespace SP\Mvc\View\Components;
 
 use JsonSerializable;
+use SP\Domain\Common\Models\ItemWithIdAndNameModel;
 
 /**
  * Class SelectItem
- *
- * @package SP\Mvc\View\Components
  */
 final class SelectItem implements JsonSerializable
 {
-    protected int|string $id;
-    protected string     $name;
-    protected mixed      $item;
-    protected bool       $selected = false;
-    protected bool       $skip     = false;
+    protected bool $selected = false;
+    protected bool $skip     = false;
 
-    /**
-     * SelectItem constructor.
-     *
-     * @param  int|string  $id
-     * @param  string  $name
-     * @param  mixed  $item
-     */
-    public function __construct(int|string $id, string $name, mixed $item = null)
-    {
-        $this->id = $id;
-        $this->name = $name;
-        $this->item = $item;
+    public function __construct(
+        protected readonly int|string              $id,
+        protected readonly string                  $name,
+        protected readonly ?ItemWithIdAndNameModel $item = null
+    ) {
     }
 
     /**
@@ -77,17 +66,13 @@ final class SelectItem implements JsonSerializable
     }
 
     /**
-     * @param  string  $property
+     * @param string $property
      *
      * @return mixed
      */
     public function getItemProperty(string $property): mixed
     {
-        if (null !== $this->item) {
-            return $this->item->{$property} ?? null;
-        }
-
-        return null;
+        return $this->item?->{$property};
     }
 
     public function isSkip(): bool
diff --git a/lib/SP/Mvc/View/Components/SelectItemAdapter.php b/lib/SP/Mvc/View/Components/SelectItemAdapter.php
index 0845c0b0..83905ea3 100644
--- a/lib/SP/Mvc/View/Components/SelectItemAdapter.php
+++ b/lib/SP/Mvc/View/Components/SelectItemAdapter.php
@@ -33,16 +33,12 @@ use function SP\__u;
 
 /**
  * Class SelectItemAdapter
- *
- * @package SP\Mvc\View\Components
  */
-final class SelectItemAdapter implements ItemAdapterInterface
+final readonly class SelectItemAdapter implements ItemAdapterInterface
 {
-    protected array $items;
 
-    public function __construct(array $items)
+    public function __construct(protected array $items)
     {
-        $this->items = $items;
     }
 
     public static function factory(array $items): SelectItemAdapter
@@ -55,15 +51,10 @@ final class SelectItemAdapter implements ItemAdapterInterface
      */
     public static function getIdFromArrayOfObjects(array $items): array
     {
-        $ids = [];
-
-        foreach ($items as $item) {
-            if (is_object($item) && null !== $item->id) {
-                $ids[] = $item->id;
-            }
-        }
-
-        return $ids;
+        return array_map(
+            static fn(object $item) => $item->id,
+            array_filter($items, static fn(mixed $item) => is_object($item) && isset($item->id))
+        );
     }
 
     /**
@@ -73,17 +64,12 @@ final class SelectItemAdapter implements ItemAdapterInterface
      */
     public function getJsonItemsFromModel(): string
     {
-        $out = [];
-
-        foreach ($this->items as $item) {
-            if (!$item instanceof ItemWithIdAndNameModel) {
-                throw new RuntimeException(__u('Wrong object type'));
-            }
-
-            $out[] = ['id' => $item->getId(), 'name' => $item->getName()];
-        }
-
-        return JsonResponse::buildJsonFrom($out);
+        return JsonResponse::buildJsonFrom(
+            array_map(
+                static fn(ItemWithIdAndNameModel $item) => ['id' => $item->getId(), 'name' => $item->getName()],
+                array_filter($this->items, static fn(mixed $item) => $item instanceof ItemWithIdAndNameModel)
+            )
+        );
     }
 
     /**
@@ -105,15 +91,13 @@ final class SelectItemAdapter implements ItemAdapterInterface
     /**
      * Returns a collection of items for a select component and set selected ones from an array
      *
-     * @param  array  $selected
-     * @param  string|int|null  $skip
+     * @param array $selected
+     * @param string|int|null $skip
      *
      * @return SelectItem[]
      */
-    public function getItemsFromModelSelected(
-        array $selected,
-        mixed $skip = null
-    ): array {
+    public function getItemsFromModelSelected(array $selected, mixed $skip = null): array
+    {
         $items = $this->getItemsFromModel();
 
         array_walk(
diff --git a/lib/SP/Mvc/View/Template.php b/lib/SP/Mvc/View/Template.php
index a76d2bdf..187e52d1 100644
--- a/lib/SP/Mvc/View/Template.php
+++ b/lib/SP/Mvc/View/Template.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -47,14 +47,8 @@ final class Template implements TemplateInterface
     private const TEMPLATE_EXTENSION = '.inc';
     public const  PARTIALS_DIR       = '_partials';
 
-    /**
-     * @var array List of templates to load into the view
-     */
-    private array                 $templates = [];
+    private array  $templates        = [];
     private TemplateVarCollection $vars;
-    /**
-     * @var string Base path for imcluding templates
-     */
     private string $base;
     private array  $contentTemplates = [];
     private bool   $upgraded         = false;
diff --git a/lib/SP/Mvc/View/TemplateVarCollection.php b/lib/SP/Mvc/View/TemplateVarCollection.php
index e71cccfb..a5747dc8 100644
--- a/lib/SP/Mvc/View/TemplateVarCollection.php
+++ b/lib/SP/Mvc/View/TemplateVarCollection.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -28,10 +28,8 @@ use SP\Core\DataCollection;
 
 /**
  * Class TemplateVarCollection
- *
- * @package SP\Mvc\View
  */
 final class TemplateVarCollection extends DataCollection
 {
 
-}
\ No newline at end of file
+}
diff --git a/lib/SP/Util/DateUtil.php b/lib/SP/Util/Date.php
similarity index 93%
rename from lib/SP/Util/DateUtil.php
rename to lib/SP/Util/Date.php
index 9a25ff82..6e804862 100644
--- a/lib/SP/Util/DateUtil.php
+++ b/lib/SP/Util/Date.php
@@ -27,13 +27,13 @@ namespace SP\Util;
 /**
  * Class DateUtil
  */
-final class DateUtil
+final class Date
 {
     /**
      * Returns date string from UNIX timestamp
      *
-     * @param  int|string  $date
-     * @param  string  $format
+     * @param int|string $date
+     * @param string $format
      *
      * @return int|string
      */
diff --git a/lib/SP/Util/FileSystemUtil.php b/lib/SP/Util/FileSystem.php
similarity index 97%
rename from lib/SP/Util/FileSystemUtil.php
rename to lib/SP/Util/FileSystem.php
index 1772cd94..a80bbdeb 100644
--- a/lib/SP/Util/FileSystemUtil.php
+++ b/lib/SP/Util/FileSystem.php
@@ -36,9 +36,9 @@ use function SP\__;
 use function SP\__u;
 
 /**
- * Class FilesystemUtil
+ * Class FileSystem
  */
-class FileSystemUtil
+class FileSystem
 {
     private const IMAGE_MIME = [
         'image/jpeg',
@@ -117,7 +117,7 @@ class FileSystemUtil
         $sysTmp = sys_get_temp_dir();
 
         $checkDir = static function ($dir) {
-            $path = FileSystemUtil::buildPath($dir, 'syspass.test');
+            $path = self::buildPath($dir, 'syspass.test');
 
             if (file_exists($path)) {
                 return $dir;
diff --git a/lib/SP/Util/HttpUtil.php b/lib/SP/Util/Http.php
similarity index 97%
rename from lib/SP/Util/HttpUtil.php
rename to lib/SP/Util/Http.php
index 8b17c1ee..2db98c99 100644
--- a/lib/SP/Util/HttpUtil.php
+++ b/lib/SP/Util/Http.php
@@ -28,9 +28,9 @@ use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Http\RequestInterface;
 
 /**
- * Class HttpUtil
+ * Class Http
  */
-final class HttpUtil
+final class Http
 {
     /**
      * Comprobar y forzar (si es necesario) la conexión HTTPS
diff --git a/lib/SP/Util/PasswordUtil.php b/lib/SP/Util/Password.php
similarity index 98%
rename from lib/SP/Util/PasswordUtil.php
rename to lib/SP/Util/Password.php
index 76674f2a..73ca6a02 100644
--- a/lib/SP/Util/PasswordUtil.php
+++ b/lib/SP/Util/Password.php
@@ -31,11 +31,9 @@ use Exception;
 use Random\RandomException;
 
 /**
- * Class PasswordUtil
- *
- * @package SP\Util
+ * Class Password
  */
-final class PasswordUtil
+final class Password
 {
     private const CHARS                  = 'abcdefghijklmnopqrstuwxyz';
     private const CHARS_SPECIAL          = '@$%&/()!_:.;{}^-';
diff --git a/lib/SP/Util/Util.php b/lib/SP/Util/Util.php
index b8840d8a..db26f3ae 100644
--- a/lib/SP/Util/Util.php
+++ b/lib/SP/Util/Util.php
@@ -180,9 +180,7 @@ final class Util
     public static function itemsIdAdapter(string $itemsId, string $delimiter = ','): array
     {
         return array_map(
-            static function ($value) {
-                return (int)$value;
-            },
+            static fn(string|int $value) => (int)$value,
             explode($delimiter, $itemsId)
         );
     }
diff --git a/lib/SP/Util/VersionUtil.php b/lib/SP/Util/Version.php
similarity index 98%
rename from lib/SP/Util/VersionUtil.php
rename to lib/SP/Util/Version.php
index a81b72d7..2b99dcbe 100644
--- a/lib/SP/Util/VersionUtil.php
+++ b/lib/SP/Util/Version.php
@@ -27,11 +27,9 @@ namespace SP\Util;
 use SP\Domain\Install\Services\Installer;
 
 /**
- * Class VersionUtil
- *
- * @package SP\Util
+ * Class Version
  */
-final class VersionUtil
+final class Version
 {
     /**
      * Devolver versión normalizada en cadena
diff --git a/tests/SPT/Domain/Export/Services/XmlExportTest.php b/tests/SPT/Domain/Export/Services/XmlExportTest.php
index d81b29ad..69de894f 100644
--- a/tests/SPT/Domain/Export/Services/XmlExportTest.php
+++ b/tests/SPT/Domain/Export/Services/XmlExportTest.php
@@ -49,7 +49,7 @@ use SP\Domain\Export\Services\XmlExport;
 use SP\Domain\File\Ports\DirectoryHandlerService;
 use SP\Domain\User\Dtos\UserDataDto;
 use SP\Infrastructure\File\FileException;
-use SP\Util\VersionUtil;
+use SP\Util\Version;
 use SPT\Generators\UserDataGenerator;
 use SPT\UnitaryTestCase;
 
@@ -139,7 +139,7 @@ class XmlExportTest extends UnitaryTestCase
             $meta,
             [
                 'Generator' => 'sysPass',
-                'Version' => VersionUtil::getVersionStringNormalized(),
+                'Version' => Version::getVersionStringNormalized(),
                 'Time' => static fn(string $value) => self::assertTrue($value > 0),
                 'User' => 'test_user',
                 'Group' => 'test_group',
diff --git a/tests/SPT/Domain/Install/Services/InstallerTest.php b/tests/SPT/Domain/Install/Services/InstallerTest.php
index 47fca877..09677196 100644
--- a/tests/SPT/Domain/Install/Services/InstallerTest.php
+++ b/tests/SPT/Domain/Install/Services/InstallerTest.php
@@ -41,7 +41,7 @@ use SP\Domain\User\Ports\UserProfileService;
 use SP\Domain\User\Ports\UserService;
 use SP\Domain\User\Services\User;
 use SP\Infrastructure\Database\DatabaseConnectionData;
-use SP\Util\VersionUtil;
+use SP\Util\Version;
 use SPT\UnitaryTestCase;
 
 /**
@@ -108,8 +108,8 @@ class InstallerTest extends UnitaryTestCase
         $this->assertEquals($expectedDbSetup[0], $configData->getDbUser());
         $this->assertEquals($expectedDbSetup[1], $configData->getDbPass());
         $this->assertEquals($params->getSiteLang(), $configData->getSiteLang());
-        $this->assertEquals(VersionUtil::getVersionStringNormalized(), $configData->getConfigVersion());
-        $this->assertEquals(VersionUtil::getVersionStringNormalized(), $configData->getDatabaseVersion());
+        $this->assertEquals(Version::getVersionStringNormalized(), $configData->getConfigVersion());
+        $this->assertEquals(Version::getVersionStringNormalized(), $configData->getDatabaseVersion());
         $this->assertEquals(SELF_IP_ADDRESS, $params->getDbAuthHost());
         $this->assertNull($configData->getUpgradeKey());
         $this->assertNull($configData->getDbSocket());
diff --git a/tests/SPT/Util/DateUtilTest.php b/tests/SPT/Util/DateUtilTest.php
index b941f9af..ce9c35cc 100644
--- a/tests/SPT/Util/DateUtilTest.php
+++ b/tests/SPT/Util/DateUtilTest.php
@@ -25,7 +25,7 @@
 namespace SPT\Util;
 
 use PHPUnit\Framework\Attributes\Group;
-use SP\Util\DateUtil;
+use SP\Util\Date;
 use SPT\UnitaryTestCase;
 
 /**
@@ -36,7 +36,7 @@ class DateUtilTest extends UnitaryTestCase
 {
     public function testGetDateFromUnix()
     {
-        $out = DateUtil::getDateFromUnix(self::$faker->unixTime());
+        $out = Date::getDateFromUnix(self::$faker->unixTime());
 
         $this->assertMatchesRegularExpression('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}/', $out);
     }
@@ -44,7 +44,7 @@ class DateUtilTest extends UnitaryTestCase
     public function testGetDateFromUnixFromString()
     {
         $date = self::$faker->date();
-        $out = DateUtil::getDateFromUnix($date);
+        $out = Date::getDateFromUnix($date);
 
         $this->assertEquals($date, $out);
     }
diff --git a/tests/SPT/Util/HttpUtilTest.php b/tests/SPT/Util/HttpUtilTest.php
index d143ba9f..06892deb 100644
--- a/tests/SPT/Util/HttpUtilTest.php
+++ b/tests/SPT/Util/HttpUtilTest.php
@@ -29,7 +29,7 @@ use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\TestCase;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Http\RequestInterface;
-use SP\Util\HttpUtil;
+use SP\Util\Http;
 
 /**
  * Class HttpUtilTest
@@ -62,7 +62,7 @@ class HttpUtilTest extends TestCase
                 ->method('getHttpHost')
                 ->willReturn('localhost');
 
-        HttpUtil::checkHttps($configData, $request);
+        Http::checkHttps($configData, $request);
     }
 
     /**
@@ -86,7 +86,7 @@ class HttpUtilTest extends TestCase
         $request->expects($this->never())
                 ->method('getHttpHost');
 
-        HttpUtil::checkHttps($configData, $request);
+        Http::checkHttps($configData, $request);
     }
 
     /**
@@ -111,6 +111,6 @@ class HttpUtilTest extends TestCase
         $request->expects($this->never())
                 ->method('getHttpHost');
 
-        HttpUtil::checkHttps($configData, $request);
+        Http::checkHttps($configData, $request);
     }
 }
diff --git a/tests/SPT/Util/PasswordUtilTest.php b/tests/SPT/Util/PasswordUtilTest.php
index 2d16376f..4b08f5b8 100644
--- a/tests/SPT/Util/PasswordUtilTest.php
+++ b/tests/SPT/Util/PasswordUtilTest.php
@@ -28,7 +28,7 @@ use Defuse\Crypto\Exception\EnvironmentIsBrokenException;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Random\RandomException;
-use SP\Util\PasswordUtil;
+use SP\Util\Password;
 
 /**
  * Class PasswordUtilTest
@@ -44,15 +44,15 @@ class PasswordUtilTest extends TestCase
         $passwordSpecial = str_split('%._-$&/()');
         $passwordNumber = str_split('18675249');
 
-        $this->assertEquals(count($passwordLower), PasswordUtil::checkStrength($passwordLower)['lower']);
-        $this->assertEquals(count($passwordUpper), PasswordUtil::checkStrength($passwordUpper)['upper']);
-        $this->assertEquals(count($passwordSpecial), PasswordUtil::checkStrength($passwordSpecial)['special']);
-        $this->assertEquals(count($passwordNumber), PasswordUtil::checkStrength($passwordNumber)['number']);
+        $this->assertEquals(count($passwordLower), Password::checkStrength($passwordLower)['lower']);
+        $this->assertEquals(count($passwordUpper), Password::checkStrength($passwordUpper)['upper']);
+        $this->assertEquals(count($passwordSpecial), Password::checkStrength($passwordSpecial)['special']);
+        $this->assertEquals(count($passwordNumber), Password::checkStrength($passwordNumber)['number']);
 
         $passwordMixed = array_merge($passwordLower, $passwordUpper, $passwordSpecial, $passwordNumber);
         shuffle($passwordMixed);
 
-        foreach (PasswordUtil::checkStrength($passwordMixed) as $count) {
+        foreach (Password::checkStrength($passwordMixed) as $count) {
             $this->assertGreaterThan(0, $count);
         }
     }
@@ -65,11 +65,11 @@ class PasswordUtilTest extends TestCase
         $lengths = [16, 32, 64];
 
         foreach ($lengths as $length) {
-            $pass = PasswordUtil::randomPassword($length);
+            $pass = Password::randomPassword($length);
 
             $this->assertEquals($length, strlen($pass));
 
-            foreach (PasswordUtil::checkStrength(str_split($pass)) as $type => $count) {
+            foreach (Password::checkStrength(str_split($pass)) as $type => $count) {
                 $this->assertGreaterThan(0, $count);
             }
         }
@@ -80,8 +80,8 @@ class PasswordUtilTest extends TestCase
      */
     public function testRandomPasswordNoFlags()
     {
-        $pass = PasswordUtil::randomPassword(16, 0);
-        $strength = PasswordUtil::checkStrength(str_split($pass));
+        $pass = Password::randomPassword(16, 0);
+        $strength = Password::checkStrength(str_split($pass));
 
         $this->assertGreaterThan(0, $strength['lower']);
         $this->assertGreaterThan(0, $strength['upper']);
@@ -94,9 +94,9 @@ class PasswordUtilTest extends TestCase
      */
     public function testRandomPasswordSpecial()
     {
-        $flags = PasswordUtil::FLAG_PASSWORD_SPECIAL | PasswordUtil::FLAG_PASSWORD_STRENGTH;
-        $pass = PasswordUtil::randomPassword(16, $flags);
-        $strength = PasswordUtil::checkStrength(str_split($pass));
+        $flags = Password::FLAG_PASSWORD_SPECIAL | Password::FLAG_PASSWORD_STRENGTH;
+        $pass = Password::randomPassword(16, $flags);
+        $strength = Password::checkStrength(str_split($pass));
 
         $this->assertGreaterThan(0, $strength['lower']);
         $this->assertGreaterThan(0, $strength['upper']);
@@ -109,9 +109,9 @@ class PasswordUtilTest extends TestCase
      */
     public function testRandomPasswordNumbers()
     {
-        $flags = PasswordUtil::FLAG_PASSWORD_NUMBER | PasswordUtil::FLAG_PASSWORD_STRENGTH;
-        $pass = PasswordUtil::randomPassword(16, $flags);
-        $strength = PasswordUtil::checkStrength(str_split($pass));
+        $flags = Password::FLAG_PASSWORD_NUMBER | Password::FLAG_PASSWORD_STRENGTH;
+        $pass = Password::randomPassword(16, $flags);
+        $strength = Password::checkStrength(str_split($pass));
 
         $this->assertGreaterThan(0, $strength['lower']);
         $this->assertGreaterThan(0, $strength['upper']);
@@ -125,10 +125,10 @@ class PasswordUtilTest extends TestCase
      */
     public function testRandomPasswordAll()
     {
-        $flags = PasswordUtil::FLAG_PASSWORD_NUMBER | PasswordUtil::FLAG_PASSWORD_SPECIAL |
-                 PasswordUtil::FLAG_PASSWORD_STRENGTH;
-        $pass = PasswordUtil::randomPassword(16, $flags);
-        $strength = PasswordUtil::checkStrength(str_split($pass));
+        $flags = Password::FLAG_PASSWORD_NUMBER | Password::FLAG_PASSWORD_SPECIAL |
+                 Password::FLAG_PASSWORD_STRENGTH;
+        $pass = Password::randomPassword(16, $flags);
+        $strength = Password::checkStrength(str_split($pass));
 
         $this->assertGreaterThan(0, $strength['lower']);
         $this->assertGreaterThan(0, $strength['upper']);
@@ -141,15 +141,15 @@ class PasswordUtilTest extends TestCase
      */
     public function testGenerateRandomBytes()
     {
-        $bytesHex = PasswordUtil::generateRandomBytes(16);
+        $bytesHex = Password::generateRandomBytes(16);
 
         $this->assertEquals(32, strlen($bytesHex));
 
-        $bytesHex = PasswordUtil::generateRandomBytes(32);
+        $bytesHex = Password::generateRandomBytes(32);
 
         $this->assertEquals(64, strlen($bytesHex));
 
-        $bytesHex = PasswordUtil::generateRandomBytes(64);
+        $bytesHex = Password::generateRandomBytes(64);
 
         $this->assertEquals(128, strlen($bytesHex));
     }
diff --git a/tests/SPT/bootstrap.php b/tests/SPT/bootstrap.php
index 8d278ba3..11274752 100644
--- a/tests/SPT/bootstrap.php
+++ b/tests/SPT/bootstrap.php
@@ -36,7 +36,7 @@ use SP\Domain\User\Dtos\UserDataDto;
 use SP\Domain\User\Models\ProfileData;
 use SP\Infrastructure\Database\DatabaseConnectionData;
 use SP\Infrastructure\Database\MysqlHandler;
-use SP\Util\FileSystemUtil;
+use SP\Util\FileSystem;
 
 use function SP\logger;
 use function SP\processException;
@@ -174,7 +174,7 @@ function recreateDir(string $dir): void
     if (is_dir($dir)) {
         logger('Deleting ' . $dir);
 
-        FileSystemUtil::rmdirRecursive($dir);
+        FileSystem::rmdirRecursive($dir);
     }
 
     logger('Creating ' . $dir);