diff --git a/tests/SPT/Domain/Account/Services/AccountAclServiceTest.php b/tests/SPT/Domain/Account/Services/AccountAclTest.php
similarity index 99%
rename from tests/SPT/Domain/Account/Services/AccountAclServiceTest.php
rename to tests/SPT/Domain/Account/Services/AccountAclTest.php
index 6030ea35..cb82b9e3 100644
--- a/tests/SPT/Domain/Account/Services/AccountAclServiceTest.php
+++ b/tests/SPT/Domain/Account/Services/AccountAclTest.php
@@ -45,7 +45,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountAclServiceTest extends UnitaryTestCase
+class AccountAclTest extends UnitaryTestCase
 {
     private const ACTIONS = [
         AclActionsInterface::ACCOUNT_SEARCH,
diff --git a/tests/SPT/Domain/Account/Services/AccountCacheServiceTest.php b/tests/SPT/Domain/Account/Services/AccountCacheTest.php
similarity index 96%
rename from tests/SPT/Domain/Account/Services/AccountCacheServiceTest.php
rename to tests/SPT/Domain/Account/Services/AccountCacheTest.php
index 26f45b89..e4fa29bf 100644
--- a/tests/SPT/Domain/Account/Services/AccountCacheServiceTest.php
+++ b/tests/SPT/Domain/Account/Services/AccountCacheTest.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.
  *
@@ -41,7 +41,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountCacheServiceTest extends UnitaryTestCase
+class AccountCacheTest extends UnitaryTestCase
 {
 
     private AccountToUserRepository|MockObject $accountToUserRepository;
diff --git a/tests/SPT/Domain/Account/Services/AccountCryptServiceTest.php b/tests/SPT/Domain/Account/Services/AccountCryptTest.php
similarity index 99%
rename from tests/SPT/Domain/Account/Services/AccountCryptServiceTest.php
rename to tests/SPT/Domain/Account/Services/AccountCryptTest.php
index 9f74c170..bf5d9f33 100644
--- a/tests/SPT/Domain/Account/Services/AccountCryptServiceTest.php
+++ b/tests/SPT/Domain/Account/Services/AccountCryptTest.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.
  *
@@ -46,7 +46,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountCryptServiceTest extends UnitaryTestCase
+class AccountCryptTest extends UnitaryTestCase
 {
 
     private MockObject|AccountService        $account;
diff --git a/tests/SPT/Domain/Account/Services/AccountFileServiceTest.php b/tests/SPT/Domain/Account/Services/AccountFileTest.php
similarity index 98%
rename from tests/SPT/Domain/Account/Services/AccountFileServiceTest.php
rename to tests/SPT/Domain/Account/Services/AccountFileTest.php
index f28c4112..51161d47 100644
--- a/tests/SPT/Domain/Account/Services/AccountFileServiceTest.php
+++ b/tests/SPT/Domain/Account/Services/AccountFileTest.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.
  *
@@ -45,7 +45,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountFileServiceTest extends UnitaryTestCase
+class AccountFileTest extends UnitaryTestCase
 {
 
     private MockObject|AccountFileRepository $accountFileRepository;
diff --git a/tests/SPT/Domain/Account/Services/AccountHistoryServiceTest.php b/tests/SPT/Domain/Account/Services/AccountHistoryTest.php
similarity index 98%
rename from tests/SPT/Domain/Account/Services/AccountHistoryServiceTest.php
rename to tests/SPT/Domain/Account/Services/AccountHistoryTest.php
index 2bd4c6e1..aeb9cf08 100644
--- a/tests/SPT/Domain/Account/Services/AccountHistoryServiceTest.php
+++ b/tests/SPT/Domain/Account/Services/AccountHistoryTest.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.
  *
@@ -43,7 +43,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountHistoryServiceTest extends UnitaryTestCase
+class AccountHistoryTest extends UnitaryTestCase
 {
 
     private AccountHistory                      $accountHistory;
diff --git a/tests/SPT/Domain/Account/Services/AccountPresetServiceTest.php b/tests/SPT/Domain/Account/Services/AccountPresetTest.php
similarity index 98%
rename from tests/SPT/Domain/Account/Services/AccountPresetServiceTest.php
rename to tests/SPT/Domain/Account/Services/AccountPresetTest.php
index 3635d142..929e5c59 100644
--- a/tests/SPT/Domain/Account/Services/AccountPresetServiceTest.php
+++ b/tests/SPT/Domain/Account/Services/AccountPresetTest.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.
  *
@@ -45,7 +45,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountPresetServiceTest extends UnitaryTestCase
+class AccountPresetTest extends UnitaryTestCase
 {
 
     private ItemPresetServiceInterface|MockObject $itemPresetService;
diff --git a/tests/SPT/Domain/Account/Services/AccountSearchServiceTest.php b/tests/SPT/Domain/Account/Services/AccountSearchTest.php
similarity index 99%
rename from tests/SPT/Domain/Account/Services/AccountSearchServiceTest.php
rename to tests/SPT/Domain/Account/Services/AccountSearchTest.php
index d8b078c5..830f25de 100644
--- a/tests/SPT/Domain/Account/Services/AccountSearchServiceTest.php
+++ b/tests/SPT/Domain/Account/Services/AccountSearchTest.php
@@ -48,7 +48,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountSearchServiceTest extends UnitaryTestCase
+class AccountSearchTest extends UnitaryTestCase
 {
     use AccountSearchTokenizerDataTrait;
 
diff --git a/tests/SPT/Domain/Account/Services/AccountServiceTest.php b/tests/SPT/Domain/Account/Services/AccountTest.php
similarity index 99%
rename from tests/SPT/Domain/Account/Services/AccountServiceTest.php
rename to tests/SPT/Domain/Account/Services/AccountTest.php
index 6ffa09ef..5e6e0051 100644
--- a/tests/SPT/Domain/Account/Services/AccountServiceTest.php
+++ b/tests/SPT/Domain/Account/Services/AccountTest.php
@@ -62,7 +62,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountServiceTest extends UnitaryTestCase
+class AccountTest extends UnitaryTestCase
 {
     private AccountRepository|MockObject            $accountRepository;
     private AccountToUserGroupRepository|MockObject $accountToUserGroupRepository;
diff --git a/tests/SPT/Domain/Account/Services/AccountToFavoriteServiceTest.php b/tests/SPT/Domain/Account/Services/AccountToFavoriteTest.php
similarity index 96%
rename from tests/SPT/Domain/Account/Services/AccountToFavoriteServiceTest.php
rename to tests/SPT/Domain/Account/Services/AccountToFavoriteTest.php
index 9d0594ae..13e6410a 100644
--- a/tests/SPT/Domain/Account/Services/AccountToFavoriteServiceTest.php
+++ b/tests/SPT/Domain/Account/Services/AccountToFavoriteTest.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.
  *
@@ -38,7 +38,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountToFavoriteServiceTest extends UnitaryTestCase
+class AccountToFavoriteTest extends UnitaryTestCase
 {
 
     private AccountToFavoriteRepository|MockObject $accountToFavoriteRepository;
diff --git a/tests/SPT/Domain/Account/Services/AccountToTagServiceTest.php b/tests/SPT/Domain/Account/Services/AccountToTagTest.php
similarity index 96%
rename from tests/SPT/Domain/Account/Services/AccountToTagServiceTest.php
rename to tests/SPT/Domain/Account/Services/AccountToTagTest.php
index e666cefe..4a80ae02 100644
--- a/tests/SPT/Domain/Account/Services/AccountToTagServiceTest.php
+++ b/tests/SPT/Domain/Account/Services/AccountToTagTest.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.
  *
@@ -40,7 +40,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountToTagServiceTest extends UnitaryTestCase
+class AccountToTagTest extends UnitaryTestCase
 {
 
     private AccountToTag                      $accountToTag;
diff --git a/tests/SPT/Domain/Account/Services/AccountToUserGroupServiceTest.php b/tests/SPT/Domain/Account/Services/AccountToUserGroupTest.php
similarity index 96%
rename from tests/SPT/Domain/Account/Services/AccountToUserGroupServiceTest.php
rename to tests/SPT/Domain/Account/Services/AccountToUserGroupTest.php
index 6e8c02e0..e625c154 100644
--- a/tests/SPT/Domain/Account/Services/AccountToUserGroupServiceTest.php
+++ b/tests/SPT/Domain/Account/Services/AccountToUserGroupTest.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.
  *
@@ -39,7 +39,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountToUserGroupServiceTest extends UnitaryTestCase
+class AccountToUserGroupTest extends UnitaryTestCase
 {
 
     private AccountToUserGroup                      $accountToUserGroup;
diff --git a/tests/SPT/Domain/Account/Services/AccountToUserServiceTest.php b/tests/SPT/Domain/Account/Services/AccountToUserTest.php
similarity index 96%
rename from tests/SPT/Domain/Account/Services/AccountToUserServiceTest.php
rename to tests/SPT/Domain/Account/Services/AccountToUserTest.php
index e20db8fd..72c15a03 100644
--- a/tests/SPT/Domain/Account/Services/AccountToUserServiceTest.php
+++ b/tests/SPT/Domain/Account/Services/AccountToUserTest.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.
  *
@@ -39,7 +39,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountToUserServiceTest extends UnitaryTestCase
+class AccountToUserTest extends UnitaryTestCase
 {
 
     private AccountToUserRepository|MockObject $accountToUserRepository;
diff --git a/tests/SPT/Domain/Account/Services/PublicLinkServiceTest.php b/tests/SPT/Domain/Account/Services/PublicLinkTest.php
similarity index 99%
rename from tests/SPT/Domain/Account/Services/PublicLinkServiceTest.php
rename to tests/SPT/Domain/Account/Services/PublicLinkTest.php
index 12f5043c..bea15a28 100644
--- a/tests/SPT/Domain/Account/Services/PublicLinkServiceTest.php
+++ b/tests/SPT/Domain/Account/Services/PublicLinkTest.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.
  *
@@ -51,7 +51,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class PublicLinkServiceTest extends UnitaryTestCase
+class PublicLinkTest extends UnitaryTestCase
 {
 
     private PublicLinkRepository|MockObject $publicLinkRepository;
diff --git a/tests/SPT/Domain/Account/Services/UpgradePublicLinkServiceTest.php b/tests/SPT/Domain/Account/Services/UpgradePublicLinkTest.php
similarity index 96%
rename from tests/SPT/Domain/Account/Services/UpgradePublicLinkServiceTest.php
rename to tests/SPT/Domain/Account/Services/UpgradePublicLinkTest.php
index 8477e78b..49599136 100644
--- a/tests/SPT/Domain/Account/Services/UpgradePublicLinkServiceTest.php
+++ b/tests/SPT/Domain/Account/Services/UpgradePublicLinkTest.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.
  *
@@ -39,7 +39,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class UpgradePublicLinkServiceTest extends UnitaryTestCase
+class UpgradePublicLinkTest extends UnitaryTestCase
 {
 
     private PublicLinkRepository|MockObject $publicLinkRepository;
diff --git a/tests/SPT/Domain/Api/Services/ApiServiceTest.php b/tests/SPT/Domain/Api/Services/ApiTest.php
similarity index 99%
rename from tests/SPT/Domain/Api/Services/ApiServiceTest.php
rename to tests/SPT/Domain/Api/Services/ApiTest.php
index 16041178..1da00f2c 100644
--- a/tests/SPT/Domain/Api/Services/ApiServiceTest.php
+++ b/tests/SPT/Domain/Api/Services/ApiTest.php
@@ -60,7 +60,7 @@ use function PHPUnit\Framework\onConsecutiveCalls;
  *
  * @group unitary
  */
-class ApiServiceTest extends UnitaryTestCase
+class ApiTest extends UnitaryTestCase
 {
 
     private TrackServiceInterface|MockObject     $trackService;
diff --git a/tests/SPT/Infrastructure/Account/Repositories/AccountFileRepositoryTest.php b/tests/SPT/Infrastructure/Account/Repositories/AccountFileTest.php
similarity index 98%
rename from tests/SPT/Infrastructure/Account/Repositories/AccountFileRepositoryTest.php
rename to tests/SPT/Infrastructure/Account/Repositories/AccountFileTest.php
index e7e56d68..e42ef131 100644
--- a/tests/SPT/Infrastructure/Account/Repositories/AccountFileRepositoryTest.php
+++ b/tests/SPT/Infrastructure/Account/Repositories/AccountFileTest.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.
  *
@@ -44,7 +44,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountFileRepositoryTest extends UnitaryTestCase
+class AccountFileTest extends UnitaryTestCase
 {
     private DatabaseInterface|MockObject $database;
     private AccountFile $accountFile;
diff --git a/tests/SPT/Infrastructure/Account/Repositories/AccountHistoryRepositoryTest.php b/tests/SPT/Infrastructure/Account/Repositories/AccountHistoryTest.php
similarity index 99%
rename from tests/SPT/Infrastructure/Account/Repositories/AccountHistoryRepositoryTest.php
rename to tests/SPT/Infrastructure/Account/Repositories/AccountHistoryTest.php
index 489e877a..1436737d 100644
--- a/tests/SPT/Infrastructure/Account/Repositories/AccountHistoryRepositoryTest.php
+++ b/tests/SPT/Infrastructure/Account/Repositories/AccountHistoryTest.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.
  *
@@ -45,7 +45,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountHistoryRepositoryTest extends UnitaryTestCase
+class AccountHistoryTest extends UnitaryTestCase
 {
     private DatabaseInterface|MockObject $database;
     private AccountHistory $accountHistory;
diff --git a/tests/SPT/Infrastructure/Account/Repositories/AccountSearchRepositoryTest.php b/tests/SPT/Infrastructure/Account/Repositories/AccountSearchTest.php
similarity index 98%
rename from tests/SPT/Infrastructure/Account/Repositories/AccountSearchRepositoryTest.php
rename to tests/SPT/Infrastructure/Account/Repositories/AccountSearchTest.php
index 47445707..b1dee5f8 100644
--- a/tests/SPT/Infrastructure/Account/Repositories/AccountSearchRepositoryTest.php
+++ b/tests/SPT/Infrastructure/Account/Repositories/AccountSearchTest.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.
  *
@@ -41,7 +41,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountSearchRepositoryTest extends UnitaryTestCase
+class AccountSearchTest extends UnitaryTestCase
 {
 
     private MockObject|DatabaseInterface    $database;
diff --git a/tests/SPT/Infrastructure/Account/Repositories/AccountRepositoryTest.php b/tests/SPT/Infrastructure/Account/Repositories/AccountTest.php
similarity index 99%
rename from tests/SPT/Infrastructure/Account/Repositories/AccountRepositoryTest.php
rename to tests/SPT/Infrastructure/Account/Repositories/AccountTest.php
index c477607f..1c2c6bba 100644
--- a/tests/SPT/Infrastructure/Account/Repositories/AccountRepositoryTest.php
+++ b/tests/SPT/Infrastructure/Account/Repositories/AccountTest.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.
  *
@@ -48,7 +48,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountRepositoryTest extends UnitaryTestCase
+class AccountTest extends UnitaryTestCase
 {
     private DatabaseInterface|MockObject    $database;
     private Account                         $account;
diff --git a/tests/SPT/Infrastructure/Account/Repositories/AccountToFavoriteRepositoryTest.php b/tests/SPT/Infrastructure/Account/Repositories/AccountToFavoriteTest.php
similarity index 97%
rename from tests/SPT/Infrastructure/Account/Repositories/AccountToFavoriteRepositoryTest.php
rename to tests/SPT/Infrastructure/Account/Repositories/AccountToFavoriteTest.php
index dfefb0ba..041d3398 100644
--- a/tests/SPT/Infrastructure/Account/Repositories/AccountToFavoriteRepositoryTest.php
+++ b/tests/SPT/Infrastructure/Account/Repositories/AccountToFavoriteTest.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.
  *
@@ -41,7 +41,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountToFavoriteRepositoryTest extends UnitaryTestCase
+class AccountToFavoriteTest extends UnitaryTestCase
 {
     private MockObject|DatabaseInterface $database;
     private AccountToFavorite $accountToFavorite;
diff --git a/tests/SPT/Infrastructure/Account/Repositories/AccountToTagRepositoryTest.php b/tests/SPT/Infrastructure/Account/Repositories/AccountToTagTest.php
similarity index 97%
rename from tests/SPT/Infrastructure/Account/Repositories/AccountToTagRepositoryTest.php
rename to tests/SPT/Infrastructure/Account/Repositories/AccountToTagTest.php
index b0702d34..298dc223 100644
--- a/tests/SPT/Infrastructure/Account/Repositories/AccountToTagRepositoryTest.php
+++ b/tests/SPT/Infrastructure/Account/Repositories/AccountToTagTest.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.
  *
@@ -43,7 +43,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountToTagRepositoryTest extends UnitaryTestCase
+class AccountToTagTest extends UnitaryTestCase
 {
     private MockObject|DatabaseInterface $database;
     private AccountToTag $accountToTag;
diff --git a/tests/SPT/Infrastructure/Account/Repositories/AccountToUserGroupRepositoryTest.php b/tests/SPT/Infrastructure/Account/Repositories/AccountToUserGroupTest.php
similarity index 98%
rename from tests/SPT/Infrastructure/Account/Repositories/AccountToUserGroupRepositoryTest.php
rename to tests/SPT/Infrastructure/Account/Repositories/AccountToUserGroupTest.php
index 9b68664a..6f063ac3 100644
--- a/tests/SPT/Infrastructure/Account/Repositories/AccountToUserGroupRepositoryTest.php
+++ b/tests/SPT/Infrastructure/Account/Repositories/AccountToUserGroupTest.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.
  *
@@ -41,7 +41,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountToUserGroupRepositoryTest extends UnitaryTestCase
+class AccountToUserGroupTest extends UnitaryTestCase
 {
     private MockObject|DatabaseInterface $database;
     private AccountToUserGroup $accountToUserGroup;
diff --git a/tests/SPT/Infrastructure/Account/Repositories/AccountToUserRepositoryTest.php b/tests/SPT/Infrastructure/Account/Repositories/AccountToUserTest.php
similarity index 97%
rename from tests/SPT/Infrastructure/Account/Repositories/AccountToUserRepositoryTest.php
rename to tests/SPT/Infrastructure/Account/Repositories/AccountToUserTest.php
index ecabc5a6..f753db37 100644
--- a/tests/SPT/Infrastructure/Account/Repositories/AccountToUserRepositoryTest.php
+++ b/tests/SPT/Infrastructure/Account/Repositories/AccountToUserTest.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.
  *
@@ -41,7 +41,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class AccountToUserRepositoryTest extends UnitaryTestCase
+class AccountToUserTest extends UnitaryTestCase
 {
     private MockObject|DatabaseInterface $database;
     private AccountToUser $accountToUser;
diff --git a/tests/SPT/Infrastructure/Account/Repositories/PublicLinkRepositoryTest.php b/tests/SPT/Infrastructure/Account/Repositories/PublicLinkTest.php
similarity index 99%
rename from tests/SPT/Infrastructure/Account/Repositories/PublicLinkRepositoryTest.php
rename to tests/SPT/Infrastructure/Account/Repositories/PublicLinkTest.php
index fb81c653..e884146a 100644
--- a/tests/SPT/Infrastructure/Account/Repositories/PublicLinkRepositoryTest.php
+++ b/tests/SPT/Infrastructure/Account/Repositories/PublicLinkTest.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.
  *
@@ -45,7 +45,7 @@ use SPT\UnitaryTestCase;
  *
  * @group unitary
  */
-class PublicLinkRepositoryTest extends UnitaryTestCase
+class PublicLinkTest extends UnitaryTestCase
 {
 
     private PublicLink $publicLink;