diff --git a/app/Console/Commands/CleanupImages.php b/app/Console/Commands/CleanupImagesCommand.php
similarity index 98%
rename from app/Console/Commands/CleanupImages.php
rename to app/Console/Commands/CleanupImagesCommand.php
index c37cadef0..fe924b0f4 100644
--- a/app/Console/Commands/CleanupImages.php
+++ b/app/Console/Commands/CleanupImagesCommand.php
@@ -6,7 +6,7 @@ use BookStack\Uploads\ImageService;
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class CleanupImages extends Command
+class CleanupImagesCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/app/Console/Commands/ClearActivity.php b/app/Console/Commands/ClearActivityCommand.php
similarity index 93%
rename from app/Console/Commands/ClearActivity.php
rename to app/Console/Commands/ClearActivityCommand.php
index b88408e0c..54085c12b 100644
--- a/app/Console/Commands/ClearActivity.php
+++ b/app/Console/Commands/ClearActivityCommand.php
@@ -5,7 +5,7 @@ namespace BookStack\Console\Commands;
 use BookStack\Activity\Models\Activity;
 use Illuminate\Console\Command;
 
-class ClearActivity extends Command
+class ClearActivityCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/app/Console/Commands/ClearRevisions.php b/app/Console/Commands/ClearRevisionsCommand.php
similarity index 95%
rename from app/Console/Commands/ClearRevisions.php
rename to app/Console/Commands/ClearRevisionsCommand.php
index e90503c56..ad001fdb1 100644
--- a/app/Console/Commands/ClearRevisions.php
+++ b/app/Console/Commands/ClearRevisionsCommand.php
@@ -5,7 +5,7 @@ namespace BookStack\Console\Commands;
 use BookStack\Entities\Models\PageRevision;
 use Illuminate\Console\Command;
 
-class ClearRevisions extends Command
+class ClearRevisionsCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/app/Console/Commands/ClearViews.php b/app/Console/Commands/ClearViewsCommand.php
similarity index 93%
rename from app/Console/Commands/ClearViews.php
rename to app/Console/Commands/ClearViewsCommand.php
index 6cfbd5d5f..87ea503dc 100644
--- a/app/Console/Commands/ClearViews.php
+++ b/app/Console/Commands/ClearViewsCommand.php
@@ -5,7 +5,7 @@ namespace BookStack\Console\Commands;
 use BookStack\Activity\Models\View;
 use Illuminate\Console\Command;
 
-class ClearViews extends Command
+class ClearViewsCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/app/Console/Commands/CopyShelfPermissions.php b/app/Console/Commands/CopyShelfPermissionsCommand.php
similarity index 97%
rename from app/Console/Commands/CopyShelfPermissions.php
rename to app/Console/Commands/CopyShelfPermissionsCommand.php
index 95673cacd..fc11484bd 100644
--- a/app/Console/Commands/CopyShelfPermissions.php
+++ b/app/Console/Commands/CopyShelfPermissionsCommand.php
@@ -6,7 +6,7 @@ use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Tools\PermissionsUpdater;
 use Illuminate\Console\Command;
 
-class CopyShelfPermissions extends Command
+class CopyShelfPermissionsCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/app/Console/Commands/CreateAdmin.php b/app/Console/Commands/CreateAdminCommand.php
similarity index 98%
rename from app/Console/Commands/CreateAdmin.php
rename to app/Console/Commands/CreateAdminCommand.php
index 617e6ab2f..82b6e50aa 100644
--- a/app/Console/Commands/CreateAdmin.php
+++ b/app/Console/Commands/CreateAdminCommand.php
@@ -10,7 +10,7 @@ use Illuminate\Support\Str;
 use Illuminate\Validation\Rules\Password;
 use Illuminate\Validation\Rules\Unique;
 
-class CreateAdmin extends Command
+class CreateAdminCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/app/Console/Commands/DeleteUsers.php b/app/Console/Commands/DeleteUsersCommand.php
similarity index 96%
rename from app/Console/Commands/DeleteUsers.php
rename to app/Console/Commands/DeleteUsersCommand.php
index f3e7c6852..d5c85dc8c 100644
--- a/app/Console/Commands/DeleteUsers.php
+++ b/app/Console/Commands/DeleteUsersCommand.php
@@ -6,7 +6,7 @@ use BookStack\Users\Models\User;
 use BookStack\Users\UserRepo;
 use Illuminate\Console\Command;
 
-class DeleteUsers extends Command
+class DeleteUsersCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/app/Console/Commands/RegenerateCommentContent.php b/app/Console/Commands/RegenerateCommentContentCommand.php
similarity index 95%
rename from app/Console/Commands/RegenerateCommentContent.php
rename to app/Console/Commands/RegenerateCommentContentCommand.php
index 37e254335..f7ec42620 100644
--- a/app/Console/Commands/RegenerateCommentContent.php
+++ b/app/Console/Commands/RegenerateCommentContentCommand.php
@@ -7,7 +7,7 @@ use BookStack\Activity\Models\Comment;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 
-class RegenerateCommentContent extends Command
+class RegenerateCommentContentCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/app/Console/Commands/RegeneratePermissions.php b/app/Console/Commands/RegeneratePermissionsCommand.php
similarity index 95%
rename from app/Console/Commands/RegeneratePermissions.php
rename to app/Console/Commands/RegeneratePermissionsCommand.php
index 2c994781f..856e943c5 100644
--- a/app/Console/Commands/RegeneratePermissions.php
+++ b/app/Console/Commands/RegeneratePermissionsCommand.php
@@ -6,7 +6,7 @@ use BookStack\Permissions\JointPermissionBuilder;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 
-class RegeneratePermissions extends Command
+class RegeneratePermissionsCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/app/Console/Commands/RegenerateReferences.php b/app/Console/Commands/RegenerateReferencesCommand.php
similarity index 95%
rename from app/Console/Commands/RegenerateReferences.php
rename to app/Console/Commands/RegenerateReferencesCommand.php
index f85e0cd40..ea8ff8e00 100644
--- a/app/Console/Commands/RegenerateReferences.php
+++ b/app/Console/Commands/RegenerateReferencesCommand.php
@@ -6,7 +6,7 @@ use BookStack\References\ReferenceStore;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 
-class RegenerateReferences extends Command
+class RegenerateReferencesCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/app/Console/Commands/RegenerateSearch.php b/app/Console/Commands/RegenerateSearchCommand.php
similarity index 96%
rename from app/Console/Commands/RegenerateSearch.php
rename to app/Console/Commands/RegenerateSearchCommand.php
index 23e2d2d0c..f67a51e3d 100644
--- a/app/Console/Commands/RegenerateSearch.php
+++ b/app/Console/Commands/RegenerateSearchCommand.php
@@ -7,7 +7,7 @@ use BookStack\Search\SearchIndex;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 
-class RegenerateSearch extends Command
+class RegenerateSearchCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/app/Console/Commands/ResetMfa.php b/app/Console/Commands/ResetMfaCommand.php
similarity index 97%
rename from app/Console/Commands/ResetMfa.php
rename to app/Console/Commands/ResetMfaCommand.php
index 2d27fd01e..b8076d2d6 100644
--- a/app/Console/Commands/ResetMfa.php
+++ b/app/Console/Commands/ResetMfaCommand.php
@@ -5,7 +5,7 @@ namespace BookStack\Console\Commands;
 use BookStack\Users\Models\User;
 use Illuminate\Console\Command;
 
-class ResetMfa extends Command
+class ResetMfaCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/app/Console/Commands/UpdateUrl.php b/app/Console/Commands/UpdateUrlCommand.php
similarity index 99%
rename from app/Console/Commands/UpdateUrl.php
rename to app/Console/Commands/UpdateUrlCommand.php
index 2db413ff4..27f84cc89 100644
--- a/app/Console/Commands/UpdateUrl.php
+++ b/app/Console/Commands/UpdateUrlCommand.php
@@ -5,7 +5,7 @@ namespace BookStack\Console\Commands;
 use Illuminate\Console\Command;
 use Illuminate\Database\Connection;
 
-class UpdateUrl extends Command
+class UpdateUrlCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/app/Console/Commands/UpgradeDatabaseEncoding.php b/app/Console/Commands/UpgradeDatabaseEncodingCommand.php
similarity index 96%
rename from app/Console/Commands/UpgradeDatabaseEncoding.php
rename to app/Console/Commands/UpgradeDatabaseEncodingCommand.php
index 0692cf6eb..245ce57c6 100644
--- a/app/Console/Commands/UpgradeDatabaseEncoding.php
+++ b/app/Console/Commands/UpgradeDatabaseEncodingCommand.php
@@ -5,7 +5,7 @@ namespace BookStack\Console\Commands;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 
-class UpgradeDatabaseEncoding extends Command
+class UpgradeDatabaseEncodingCommand extends Command
 {
     /**
      * The name and signature of the console command.