diff --git a/src/Commands/CompileSchemas.php b/src/Commands/CompileSchemasCommand.php
similarity index 97%
rename from src/Commands/CompileSchemas.php
rename to src/Commands/CompileSchemasCommand.php
index 7203c34..e0c175f 100644
--- a/src/Commands/CompileSchemas.php
+++ b/src/Commands/CompileSchemasCommand.php
@@ -8,7 +8,7 @@ use Lucent\Data\Schema;
 use Lucent\Schema\SchemaService;
 use Lucent\File\FileService;
 
-class CompileSchemas extends Command
+class CompileSchemasCommand extends Command
 {
     protected $signature = "lucent:schemas";
 
diff --git a/src/Commands/Export.php b/src/Commands/ExportCommand.php
similarity index 98%
rename from src/Commands/Export.php
rename to src/Commands/ExportCommand.php
index 470662e..9ebefae 100644
--- a/src/Commands/Export.php
+++ b/src/Commands/ExportCommand.php
@@ -6,7 +6,7 @@ use Illuminate\Console\Command;
 use Lucent\File\FileService;
 use ZipArchive;
 
-class Export extends Command
+class ExportCommand extends Command
 {
     protected $signature = "lucent:export";
     protected $prefix = "lucent_";
diff --git a/src/Commands/GenerateCollectionSchema.php b/src/Commands/GenerateCollectionSchemaCommand.php
similarity index 94%
rename from src/Commands/GenerateCollectionSchema.php
rename to src/Commands/GenerateCollectionSchemaCommand.php
index bf8a845..0dadb93 100644
--- a/src/Commands/GenerateCollectionSchema.php
+++ b/src/Commands/GenerateCollectionSchemaCommand.php
@@ -6,7 +6,7 @@ use Illuminate\Console\Command;
 use Lucent\Primitive\Collection;
 use Lucent\Schema\CollectionSchema;
 
-class GenerateCollectionSchema extends Command
+class GenerateCollectionSchemaCommand extends Command
 {
 
     protected $signature = 'lucent:generate:collection {name}';
diff --git a/src/Commands/GenerateImageFilter.php b/src/Commands/GenerateImageFilterCommand.php
similarity index 97%
rename from src/Commands/GenerateImageFilter.php
rename to src/Commands/GenerateImageFilterCommand.php
index 6404a91..fb71690 100644
--- a/src/Commands/GenerateImageFilter.php
+++ b/src/Commands/GenerateImageFilterCommand.php
@@ -5,7 +5,7 @@ namespace Lucent\Commands;
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
 
-class GenerateImageFilter extends Command
+class GenerateImageFilterCommand extends Command
 {
     protected $signature = "lucent:generate:image_filter {name}";
 
diff --git a/src/Commands/Import.php b/src/Commands/ImportCommand.php
similarity index 99%
rename from src/Commands/Import.php
rename to src/Commands/ImportCommand.php
index a93b714..a106ca2 100644
--- a/src/Commands/Import.php
+++ b/src/Commands/ImportCommand.php
@@ -9,7 +9,7 @@ use Lucent\ResultType\Result;
 use Lucent\ResultType\Success;
 use ZipArchive;
 
-class Import extends Command
+class ImportCommand extends Command
 {
     protected $signature = "lucent:import";
 
diff --git a/src/Commands/LiveLink.php b/src/Commands/LiveLinkCommand.php
similarity index 90%
rename from src/Commands/LiveLink.php
rename to src/Commands/LiveLinkCommand.php
index 599297d..d828dc3 100644
--- a/src/Commands/LiveLink.php
+++ b/src/Commands/LiveLinkCommand.php
@@ -5,7 +5,7 @@ namespace Lucent\Commands;
 use DirectoryIterator;
 use Illuminate\Console\Command;
 
-class LiveLink extends Command
+class LiveLinkCommand extends Command
 {
 
     protected $signature = 'lucent:livelink';
diff --git a/src/Commands/RebuildThumbnails.php b/src/Commands/RebuildThumbnailsCommand.php
similarity index 95%
rename from src/Commands/RebuildThumbnails.php
rename to src/Commands/RebuildThumbnailsCommand.php
index 1af2218..249bf6f 100644
--- a/src/Commands/RebuildThumbnails.php
+++ b/src/Commands/RebuildThumbnailsCommand.php
@@ -8,7 +8,7 @@ use Lucent\File\FileRepo;
 use Lucent\File\FileService;
 use Lucent\Query\Query;
 
-class RebuildThumbnails extends Command
+class RebuildThumbnailsCommand extends Command
 {
     protected $signature = "lucent:rebuild:thumbnails";
 
diff --git a/src/Commands/RemoveOrphanEdges.php b/src/Commands/RemoveOrphanEdgesCommand.php
similarity index 94%
rename from src/Commands/RemoveOrphanEdges.php
rename to src/Commands/RemoveOrphanEdgesCommand.php
index 55c33eb..506ec80 100644
--- a/src/Commands/RemoveOrphanEdges.php
+++ b/src/Commands/RemoveOrphanEdgesCommand.php
@@ -6,7 +6,7 @@ use Illuminate\Console\Command;
 use Lucent\Edge\EdgeService;
 use Lucent\Query\Query;
 
-class RemoveOrphanEdges extends Command
+class RemoveOrphanEdgesCommand extends Command
 {
 
     protected $signature = 'lucent:removeOrphanEdges';
diff --git a/src/Commands/Setup.php b/src/Commands/SetupCommand.php
similarity index 97%
rename from src/Commands/Setup.php
rename to src/Commands/SetupCommand.php
index 83d2418..c475b1f 100644
--- a/src/Commands/Setup.php
+++ b/src/Commands/SetupCommand.php
@@ -11,7 +11,7 @@ use Lucent\Setup\Step\LucentConfigStep;
 use Lucent\Setup\Step\StorageLinkSetupStep;
 use Lucent\Setup\Step\StorageSetupStep;
 
-class Setup extends Command
+class SetupCommand extends Command
 {
     protected $signature = "lucent:setup";
 
diff --git a/src/Commands/SetupDatabase.php b/src/Commands/SetupDatabaseCommand.php
similarity index 99%
rename from src/Commands/SetupDatabase.php
rename to src/Commands/SetupDatabaseCommand.php
index 39e05c8..6ae5c86 100644
--- a/src/Commands/SetupDatabase.php
+++ b/src/Commands/SetupDatabaseCommand.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Lucent\Database\Database;
 
-class SetupDatabase extends Command
+class SetupDatabaseCommand extends Command
 {
     protected $signature = "lucent:setup-db";
     protected $prefix = "lucent_";
diff --git a/src/LucentServiceProvider.php b/src/LucentServiceProvider.php
index 1e375a1..fb3e870 100644
--- a/src/LucentServiceProvider.php
+++ b/src/LucentServiceProvider.php
@@ -14,16 +14,16 @@ use Lucent\Account\UserRepo;
 use Lucent\Account\UserRepoLucent;
 use Lucent\Account\UserRepoLunar;
 use Lucent\Channel\ChannelService;
-use Lucent\Commands\CompileSchemas;
-use Lucent\Commands\GenerateCollectionSchema;
-use Lucent\Commands\GenerateImageFilter;
-use Lucent\Commands\LiveLink;
-use Lucent\Commands\RebuildThumbnails;
-use Lucent\Commands\RemoveOrphanEdges;
-use Lucent\Commands\SetupDatabase;
-use Lucent\Commands\Export;
-use Lucent\Commands\Import;
-use Lucent\Commands\Setup;
+use Lucent\Commands\CompileSchemasCommand;
+use Lucent\Commands\ExportCommand;
+use Lucent\Commands\GenerateCollectionSchemaCommand;
+use Lucent\Commands\GenerateImageFilterCommand;
+use Lucent\Commands\ImportCommand;
+use Lucent\Commands\LiveLinkCommand;
+use Lucent\Commands\RebuildThumbnailsCommand;
+use Lucent\Commands\RemoveOrphanEdgesCommand;
+use Lucent\Commands\SetupCommand;
+use Lucent\Commands\SetupDatabaseCommand;
 use Lucent\Data\ChannelAuth;
 use Lucent\File\FileService;
 use Lucent\Query\DatabaseGraph\DatabaseGraph;
@@ -95,16 +95,16 @@ class LucentServiceProvider extends ServiceProvider
 
         if ($this->app->runningInConsole()) {
             $this->commands([
-                CompileSchemas::class,
-                RebuildThumbnails::class,
-                LiveLink::class,
-                RemoveOrphanEdges::class,
-                SetupDatabase::class,
-                GenerateCollectionSchema::class,
-                GenerateImageFilter::class,
-                Export::class,
-                Import::class,
-                Setup::class,
+                CompileSchemasCommand::class,
+                RebuildThumbnailsCommand::class,
+                LiveLinkCommand::class,
+                RemoveOrphanEdgesCommand::class,
+                SetupDatabaseCommand::class,
+                GenerateCollectionSchemaCommand::class,
+                GenerateImageFilterCommand::class,
+                ExportCommand::class,
+                ImportCommand::class,
+                SetupCommand::class,
             ]);
         }