diff --git a/database/migrations/2022_08_18_180137_change_migration_actions_table.php b/database/migrations/2022_08_18_180137_change_migration_actions_table.php
index 7bee9e45..c598de0f 100644
--- a/database/migrations/2022_08_18_180137_change_migration_actions_table.php
+++ b/database/migrations/2022_08_18_180137_change_migration_actions_table.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use DragonCode\LaravelDeployOperations\Helpers\Config;
+use DragonCode\LaravelDeployOperations\Helpers\ConfigHelper;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -49,6 +49,6 @@ protected function doesntHaveColumn(string $column): bool
 
     protected function table(): string
     {
-        return app(Config::class)->table();
+        return app(ConfigHelper::class)->table();
     }
 };
diff --git a/database/migrations/2023_01_21_172923_rename_migrations_actions_table_to_actions.php b/database/migrations/2023_01_21_172923_rename_migrations_actions_table_to_actions.php
index 09b2c3ae..233533c4 100644
--- a/database/migrations/2023_01_21_172923_rename_migrations_actions_table_to_actions.php
+++ b/database/migrations/2023_01_21_172923_rename_migrations_actions_table_to_actions.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use DragonCode\LaravelDeployOperations\Helpers\Config;
+use DragonCode\LaravelDeployOperations\Helpers\ConfigHelper;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\Schema;
 
@@ -39,6 +39,6 @@ protected function doesntSame(string $first, string $second): bool
 
     protected function table(): string
     {
-        return app(Config::class)->table();
+        return app(ConfigHelper::class)->table();
     }
 };
diff --git a/database/migrations/2024_05_21_112438_rename_actions_table_to_operations.php b/database/migrations/2024_05_21_112438_rename_actions_table_to_operations.php
index 7ac147b9..2959b679 100644
--- a/database/migrations/2024_05_21_112438_rename_actions_table_to_operations.php
+++ b/database/migrations/2024_05_21_112438_rename_actions_table_to_operations.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use DragonCode\LaravelDeployOperations\Helpers\Config;
+use DragonCode\LaravelDeployOperations\Helpers\ConfigHelper;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\Schema;
 
@@ -39,6 +39,6 @@ protected function doesntSame(string $first, string $second): bool
 
     protected function table(): string
     {
-        return app(Config::class)->table();
+        return app(ConfigHelper::class)->table();
     }
 };
diff --git a/database/migrations/2024_05_21_114318_rename_column_in_operations_table.php b/database/migrations/2024_05_21_114318_rename_column_in_operations_table.php
index 8bb18a92..7ad24c46 100644
--- a/database/migrations/2024_05_21_114318_rename_column_in_operations_table.php
+++ b/database/migrations/2024_05_21_114318_rename_column_in_operations_table.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use DragonCode\LaravelDeployOperations\Helpers\Config;
+use DragonCode\LaravelDeployOperations\Helpers\ConfigHelper;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -27,6 +27,6 @@ protected function rename(string $from, string $to): void
 
     protected function table(): string
     {
-        return app(Config::class)->table();
+        return app(ConfigHelper::class)->table();
     }
 };
diff --git a/src/Concerns/About.php b/src/Concerns/HasAbout.php
similarity index 98%
rename from src/Concerns/About.php
rename to src/Concerns/HasAbout.php
index 3aac372e..2089a2ed 100644
--- a/src/Concerns/About.php
+++ b/src/Concerns/HasAbout.php
@@ -9,7 +9,7 @@
 use DragonCode\Support\Facades\Helpers\Str;
 use Illuminate\Foundation\Console\AboutCommand;
 
-trait About
+trait HasAbout
 {
     protected string $composer = __DIR__ . '/../../composer.json';
 
diff --git a/src/Concerns/Artisan.php b/src/Concerns/HasArtisan.php
similarity index 66%
rename from src/Concerns/Artisan.php
rename to src/Concerns/HasArtisan.php
index 6de137a5..81c2b32c 100644
--- a/src/Concerns/Artisan.php
+++ b/src/Concerns/HasArtisan.php
@@ -5,12 +5,12 @@
 namespace DragonCode\LaravelDeployOperations\Concerns;
 
 use Illuminate\Console\OutputStyle;
-use Illuminate\Support\Facades\Artisan as Command;
+use Illuminate\Support\Facades\Artisan;
 
-trait Artisan
+trait HasArtisan
 {
     protected function artisan(string $command, array $parameters = [], ?OutputStyle $outputBuffer = null): void
     {
-        Command::call($command, $parameters, $outputBuffer);
+        Artisan::call($command, $parameters, $outputBuffer);
     }
 }
diff --git a/src/Concerns/Isolatable.php b/src/Concerns/HasIsolatable.php
similarity index 80%
rename from src/Concerns/Isolatable.php
rename to src/Concerns/HasIsolatable.php
index 1face739..fa367cf5 100644
--- a/src/Concerns/Isolatable.php
+++ b/src/Concerns/HasIsolatable.php
@@ -5,15 +5,15 @@
 namespace DragonCode\LaravelDeployOperations\Concerns;
 
 use DragonCode\LaravelDeployOperations\Constants\Options;
-use DragonCode\LaravelDeployOperations\Services\Mutex;
+use DragonCode\LaravelDeployOperations\Services\MutexService;
 
 use function is_numeric;
 
-trait Isolatable
+trait HasIsolatable
 {
-    protected function isolationMutex(): Mutex
+    protected function isolationMutex(): MutexService
     {
-        return app(Mutex::class);
+        return app(MutexService::class);
     }
 
     protected function isolatedStatusCode(): int
diff --git a/src/Concerns/Optionable.php b/src/Concerns/HasOptionable.php
similarity index 99%
rename from src/Concerns/Optionable.php
rename to src/Concerns/HasOptionable.php
index bd283308..493565fc 100644
--- a/src/Concerns/Optionable.php
+++ b/src/Concerns/HasOptionable.php
@@ -12,7 +12,7 @@
 use function in_array;
 
 /** @mixin \DragonCode\LaravelDeployOperations\Console\Command */
-trait Optionable
+trait HasOptionable
 {
     protected array $arguments = [];
 
diff --git a/src/Console/Command.php b/src/Console/Command.php
index 68163f1a..436f150e 100644
--- a/src/Console/Command.php
+++ b/src/Console/Command.php
@@ -5,10 +5,10 @@
 namespace DragonCode\LaravelDeployOperations\Console;
 
 use DragonCode\LaravelDeployOperations\Concerns\ConfirmableTrait;
-use DragonCode\LaravelDeployOperations\Concerns\Isolatable;
-use DragonCode\LaravelDeployOperations\Concerns\Optionable;
+use DragonCode\LaravelDeployOperations\Concerns\HasIsolatable;
+use DragonCode\LaravelDeployOperations\Concerns\HasOptionable;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
-use DragonCode\LaravelDeployOperations\Values\Options as OptionsData;
+use DragonCode\LaravelDeployOperations\Values\OptionsData;
 use Illuminate\Console\Command as BaseCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -19,8 +19,8 @@
 abstract class Command extends BaseCommand
 {
     use ConfirmableTrait;
-    use Isolatable;
-    use Optionable;
+    use HasIsolatable;
+    use HasOptionable;
 
     protected Processor|string $processor;
 
diff --git a/src/Console/Fresh.php b/src/Console/FreshCommand.php
similarity index 86%
rename from src/Console/Fresh.php
rename to src/Console/FreshCommand.php
index b567a627..4cdaf609 100644
--- a/src/Console/Fresh.php
+++ b/src/Console/FreshCommand.php
@@ -6,10 +6,10 @@
 
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
-use DragonCode\LaravelDeployOperations\Processors\Fresh as FreshProcessor;
+use DragonCode\LaravelDeployOperations\Processors\FreshProcessor;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
 
-class Fresh extends Command
+class FreshCommand extends Command
 {
     protected $name = Names::Fresh;
 
diff --git a/src/Console/Install.php b/src/Console/InstallCommand.php
similarity index 78%
rename from src/Console/Install.php
rename to src/Console/InstallCommand.php
index 374b2b36..40263e3d 100644
--- a/src/Console/Install.php
+++ b/src/Console/InstallCommand.php
@@ -5,10 +5,10 @@
 namespace DragonCode\LaravelDeployOperations\Console;
 
 use DragonCode\LaravelDeployOperations\Constants\Names;
-use DragonCode\LaravelDeployOperations\Processors\Install as InstallProcessor;
+use DragonCode\LaravelDeployOperations\Processors\InstallProcessor;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
 
-class Install extends Command
+class InstallCommand extends Command
 {
     protected $name = Names::Install;
 
diff --git a/src/Console/Make.php b/src/Console/MakeCommand.php
similarity index 87%
rename from src/Console/Make.php
rename to src/Console/MakeCommand.php
index f00e03a1..4b519689 100644
--- a/src/Console/Make.php
+++ b/src/Console/MakeCommand.php
@@ -6,10 +6,10 @@
 
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
-use DragonCode\LaravelDeployOperations\Processors\Make as MakeProcessor;
+use DragonCode\LaravelDeployOperations\Processors\MakeProcessor;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
 
-class Make extends Command
+class MakeCommand extends Command
 {
     protected $signature = Names::Make;
 
diff --git a/src/Console/Operations.php b/src/Console/OperationsCommand.php
similarity index 85%
rename from src/Console/Operations.php
rename to src/Console/OperationsCommand.php
index 4fae9e32..2ee1bfbc 100644
--- a/src/Console/Operations.php
+++ b/src/Console/OperationsCommand.php
@@ -6,10 +6,10 @@
 
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
-use DragonCode\LaravelDeployOperations\Processors\Operations as OperationsProcessor;
+use DragonCode\LaravelDeployOperations\Processors\OperationsProcessor;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
 
-class Operations extends Command
+class OperationsCommand extends Command
 {
     protected $signature = Names::Operations;
 
diff --git a/src/Console/Refresh.php b/src/Console/RefreshCommand.php
similarity index 85%
rename from src/Console/Refresh.php
rename to src/Console/RefreshCommand.php
index c871ebae..a5eb5f47 100644
--- a/src/Console/Refresh.php
+++ b/src/Console/RefreshCommand.php
@@ -7,9 +7,9 @@
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
-use DragonCode\LaravelDeployOperations\Processors\Refresh as RefreshProcessor;
+use DragonCode\LaravelDeployOperations\Processors\RefreshProcessor;
 
-class Refresh extends Command
+class RefreshCommand extends Command
 {
     protected $name = Names::Refresh;
 
diff --git a/src/Console/Reset.php b/src/Console/ResetCommand.php
similarity index 85%
rename from src/Console/Reset.php
rename to src/Console/ResetCommand.php
index 79a85b93..a334f921 100644
--- a/src/Console/Reset.php
+++ b/src/Console/ResetCommand.php
@@ -7,9 +7,9 @@
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
-use DragonCode\LaravelDeployOperations\Processors\Reset as ResetProcessor;
+use DragonCode\LaravelDeployOperations\Processors\ResetProcessor;
 
-class Reset extends Command
+class ResetCommand extends Command
 {
     protected $name = Names::Reset;
 
diff --git a/src/Console/Rollback.php b/src/Console/RollbackCommand.php
similarity index 85%
rename from src/Console/Rollback.php
rename to src/Console/RollbackCommand.php
index cbccab60..e3581501 100644
--- a/src/Console/Rollback.php
+++ b/src/Console/RollbackCommand.php
@@ -7,9 +7,9 @@
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
-use DragonCode\LaravelDeployOperations\Processors\Rollback as RollbackProcessor;
+use DragonCode\LaravelDeployOperations\Processors\RollbackProcessor;
 
-class Rollback extends Command
+class RollbackCommand extends Command
 {
     protected $name = Names::Rollback;
 
diff --git a/src/Console/Status.php b/src/Console/StatusCommand.php
similarity index 85%
rename from src/Console/Status.php
rename to src/Console/StatusCommand.php
index b5155b38..4c034e89 100644
--- a/src/Console/Status.php
+++ b/src/Console/StatusCommand.php
@@ -7,9 +7,9 @@
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
 use DragonCode\LaravelDeployOperations\Processors\Processor;
-use DragonCode\LaravelDeployOperations\Processors\Status as StatusProcessor;
+use DragonCode\LaravelDeployOperations\Processors\StatusProcessor;
 
-class Status extends Command
+class StatusCommand extends Command
 {
     protected $name = Names::Status;
 
diff --git a/src/Helpers/Config.php b/src/Helpers/ConfigHelper.php
similarity index 98%
rename from src/Helpers/Config.php
rename to src/Helpers/ConfigHelper.php
index 59e9d178..d35e57b4 100644
--- a/src/Helpers/Config.php
+++ b/src/Helpers/ConfigHelper.php
@@ -12,7 +12,7 @@
 use function rtrim;
 use function str_replace;
 
-class Config
+class ConfigHelper
 {
     public function __construct(
         protected Repository $config
diff --git a/src/Helpers/Git.php b/src/Helpers/GitHelper.php
similarity index 95%
rename from src/Helpers/Git.php
rename to src/Helpers/GitHelper.php
index df042b1e..ced0bd29 100644
--- a/src/Helpers/Git.php
+++ b/src/Helpers/GitHelper.php
@@ -11,10 +11,10 @@
 use function rtrim;
 use function sprintf;
 
-class Git
+class GitHelper
 {
     public function __construct(
-        protected Config $config
+        protected ConfigHelper $config
     ) {}
 
     public function currentBranch(?string $path = null): ?string
diff --git a/src/Helpers/Sorter.php b/src/Helpers/SorterHelper.php
similarity index 98%
rename from src/Helpers/Sorter.php
rename to src/Helpers/SorterHelper.php
index 1a755a25..b55474c8 100644
--- a/src/Helpers/Sorter.php
+++ b/src/Helpers/SorterHelper.php
@@ -10,7 +10,7 @@
 
 use function in_array;
 
-class Sorter
+class SorterHelper
 {
     public function byValues(array $items): array
     {
diff --git a/src/Operation.php b/src/Operation.php
index 96d2117d..cca3a7ad 100644
--- a/src/Operation.php
+++ b/src/Operation.php
@@ -4,11 +4,11 @@
 
 namespace DragonCode\LaravelDeployOperations;
 
-use DragonCode\LaravelDeployOperations\Concerns\Artisan;
+use DragonCode\LaravelDeployOperations\Concerns\HasArtisan;
 
 abstract class Operation
 {
-    use Artisan;
+    use HasArtisan;
 
     /**
      * Determines the type of launch of the deploy operation.
diff --git a/src/Processors/Fresh.php b/src/Processors/FreshProcessor.php
similarity index 95%
rename from src/Processors/Fresh.php
rename to src/Processors/FreshProcessor.php
index dd325212..ec730711 100644
--- a/src/Processors/Fresh.php
+++ b/src/Processors/FreshProcessor.php
@@ -7,7 +7,7 @@
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
 
-class Fresh extends Processor
+class FreshProcessor extends Processor
 {
     public function handle(): void
     {
diff --git a/src/Processors/Install.php b/src/Processors/InstallProcessor.php
similarity index 96%
rename from src/Processors/Install.php
rename to src/Processors/InstallProcessor.php
index 5767a07f..33dd6ea2 100644
--- a/src/Processors/Install.php
+++ b/src/Processors/InstallProcessor.php
@@ -8,7 +8,7 @@
 use DragonCode\Support\Facades\Filesystem\Path;
 use DragonCode\Support\Facades\Helpers\Str;
 
-class Install extends Processor
+class InstallProcessor extends Processor
 {
     public function handle(): void
     {
diff --git a/src/Processors/Make.php b/src/Processors/MakeProcessor.php
similarity index 98%
rename from src/Processors/Make.php
rename to src/Processors/MakeProcessor.php
index 2b77bad4..98bd8760 100644
--- a/src/Processors/Make.php
+++ b/src/Processors/MakeProcessor.php
@@ -14,7 +14,7 @@
 use function Laravel\Prompts\text;
 use function realpath;
 
-class Make extends Processor
+class MakeProcessor extends Processor
 {
     protected string $fallback = 'auto';
 
diff --git a/src/Processors/Operations.php b/src/Processors/OperationsProcessor.php
similarity index 98%
rename from src/Processors/Operations.php
rename to src/Processors/OperationsProcessor.php
index 9a1e7711..b4486ba6 100644
--- a/src/Processors/Operations.php
+++ b/src/Processors/OperationsProcessor.php
@@ -14,7 +14,7 @@
 use DragonCode\Support\Facades\Helpers\Str;
 use Throwable;
 
-class Operations extends Processor
+class OperationsProcessor extends Processor
 {
     public function handle(): void
     {
diff --git a/src/Processors/Processor.php b/src/Processors/Processor.php
index 2f8c8b94..8e727407 100644
--- a/src/Processors/Processor.php
+++ b/src/Processors/Processor.php
@@ -5,15 +5,15 @@
 namespace DragonCode\LaravelDeployOperations\Processors;
 
 use Closure;
-use DragonCode\LaravelDeployOperations\Concerns\Artisan;
+use DragonCode\LaravelDeployOperations\Concerns\HasArtisan;
 use DragonCode\LaravelDeployOperations\Enums\MethodEnum;
-use DragonCode\LaravelDeployOperations\Helpers\Config;
-use DragonCode\LaravelDeployOperations\Helpers\Git;
-use DragonCode\LaravelDeployOperations\Helpers\Sorter;
+use DragonCode\LaravelDeployOperations\Helpers\ConfigHelper;
+use DragonCode\LaravelDeployOperations\Helpers\GitHelper;
+use DragonCode\LaravelDeployOperations\Helpers\SorterHelper;
 use DragonCode\LaravelDeployOperations\Notifications\Notification;
 use DragonCode\LaravelDeployOperations\Repositories\OperationsRepository;
-use DragonCode\LaravelDeployOperations\Services\Migrator;
-use DragonCode\LaravelDeployOperations\Values\Options;
+use DragonCode\LaravelDeployOperations\Services\MigratorService;
+use DragonCode\LaravelDeployOperations\Values\OptionsData;
 use DragonCode\Support\Facades\Helpers\Arr;
 use DragonCode\Support\Facades\Helpers\Str;
 use DragonCode\Support\Filesystem\File;
@@ -25,22 +25,22 @@
 
 abstract class Processor
 {
-    use Artisan;
+    use HasArtisan;
 
     abstract public function handle(): void;
 
     public function __construct(
-        protected Options $options,
+        protected OptionsData $options,
         protected InputInterface $input,
         protected OutputStyle $output,
-        protected Config $config,
+        protected ConfigHelper $config,
         protected OperationsRepository $repository,
-        protected Git $git,
+        protected GitHelper $git,
         protected File $file,
-        protected Migrator $migrator,
+        protected MigratorService $migrator,
         protected Notification $notification,
         protected Dispatcher $events,
-        protected Sorter $sorter
+        protected SorterHelper $sorter
     ) {
         $this->notification->setOutput($this->output, $this->options->mute);
         $this->repository->setConnection($this->options->connection);
diff --git a/src/Processors/Refresh.php b/src/Processors/RefreshProcessor.php
similarity index 96%
rename from src/Processors/Refresh.php
rename to src/Processors/RefreshProcessor.php
index a14773b4..4205aff4 100644
--- a/src/Processors/Refresh.php
+++ b/src/Processors/RefreshProcessor.php
@@ -7,7 +7,7 @@
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
 
-class Refresh extends Processor
+class RefreshProcessor extends Processor
 {
     public function handle(): void
     {
diff --git a/src/Processors/Reset.php b/src/Processors/ResetProcessor.php
similarity index 95%
rename from src/Processors/Reset.php
rename to src/Processors/ResetProcessor.php
index 53c51df9..2c62e37c 100644
--- a/src/Processors/Reset.php
+++ b/src/Processors/ResetProcessor.php
@@ -7,7 +7,7 @@
 use DragonCode\LaravelDeployOperations\Constants\Names;
 use DragonCode\LaravelDeployOperations\Constants\Options;
 
-class Reset extends Processor
+class ResetProcessor extends Processor
 {
     public function handle(): void
     {
diff --git a/src/Processors/Rollback.php b/src/Processors/RollbackProcessor.php
similarity index 97%
rename from src/Processors/Rollback.php
rename to src/Processors/RollbackProcessor.php
index 604d4e1f..b967a0e0 100644
--- a/src/Processors/Rollback.php
+++ b/src/Processors/RollbackProcessor.php
@@ -9,7 +9,7 @@
 use DragonCode\LaravelDeployOperations\Events\DeployOperationStarted;
 use DragonCode\LaravelDeployOperations\Events\NoPendingDeployOperations;
 
-class Rollback extends Processor
+class RollbackProcessor extends Processor
 {
     public function handle(): void
     {
diff --git a/src/Processors/Status.php b/src/Processors/StatusProcessor.php
similarity index 98%
rename from src/Processors/Status.php
rename to src/Processors/StatusProcessor.php
index 7277cefb..b09ce71c 100644
--- a/src/Processors/Status.php
+++ b/src/Processors/StatusProcessor.php
@@ -8,7 +8,7 @@
 
 use function sprintf;
 
-class Status extends Processor
+class StatusProcessor extends Processor
 {
     protected string $columnName = '<fg=gray>Operation name</>';
 
diff --git a/src/Repositories/OperationsRepository.php b/src/Repositories/OperationsRepository.php
index f9a4fb8e..3961eb50 100644
--- a/src/Repositories/OperationsRepository.php
+++ b/src/Repositories/OperationsRepository.php
@@ -5,7 +5,7 @@
 namespace DragonCode\LaravelDeployOperations\Repositories;
 
 use DragonCode\LaravelDeployOperations\Constants\Order;
-use DragonCode\LaravelDeployOperations\Helpers\Config;
+use DragonCode\LaravelDeployOperations\Helpers\ConfigHelper;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Database\ConnectionResolverInterface as Resolver;
 use Illuminate\Database\Query\Builder as Query;
@@ -21,7 +21,7 @@ class OperationsRepository
 
     public function __construct(
         protected Resolver $resolver,
-        protected Config $config
+        protected ConfigHelper $config
     ) {}
 
     public function getCompleted(): Collection
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
index f3eec5bb..78f28448 100644
--- a/src/ServiceProvider.php
+++ b/src/ServiceProvider.php
@@ -4,12 +4,12 @@
 
 namespace DragonCode\LaravelDeployOperations;
 
-use DragonCode\LaravelDeployOperations\Concerns\About;
+use DragonCode\LaravelDeployOperations\Concerns\HasAbout;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
 
 class ServiceProvider extends BaseServiceProvider
 {
-    use About;
+    use HasAbout;
 
     public function boot(): void
     {
@@ -31,14 +31,14 @@ public function register(): void
     protected function registerCommands(): void
     {
         $this->commands([
-            Console\Operations::class,
-            Console\Fresh::class,
-            Console\Install::class,
-            Console\Make::class,
-            Console\Refresh::class,
-            Console\Reset::class,
-            Console\Rollback::class,
-            Console\Status::class,
+            Console\OperationsCommand::class,
+            Console\FreshCommand::class,
+            Console\InstallCommand::class,
+            Console\MakeCommand::class,
+            Console\RefreshCommand::class,
+            Console\ResetCommand::class,
+            Console\RollbackCommand::class,
+            Console\StatusCommand::class,
         ]);
     }
 
diff --git a/src/Services/Migrator.php b/src/Services/MigratorService.php
similarity index 91%
rename from src/Services/Migrator.php
rename to src/Services/MigratorService.php
index 4121d02f..6917baf7 100644
--- a/src/Services/Migrator.php
+++ b/src/Services/MigratorService.php
@@ -4,12 +4,12 @@
 
 namespace DragonCode\LaravelDeployOperations\Services;
 
-use DragonCode\LaravelDeployOperations\Helpers\Config;
+use DragonCode\LaravelDeployOperations\Helpers\ConfigHelper;
 use DragonCode\LaravelDeployOperations\Jobs\OperationJob;
 use DragonCode\LaravelDeployOperations\Notifications\Notification;
 use DragonCode\LaravelDeployOperations\Operation;
 use DragonCode\LaravelDeployOperations\Repositories\OperationsRepository;
-use DragonCode\LaravelDeployOperations\Values\Options;
+use DragonCode\LaravelDeployOperations\Values\OptionsData;
 use DragonCode\Support\Exceptions\FileNotFoundException;
 use DragonCode\Support\Facades\Helpers\Str;
 use DragonCode\Support\Filesystem\File;
@@ -21,13 +21,13 @@
 use function method_exists;
 use function realpath;
 
-class Migrator
+class MigratorService
 {
     public function __construct(
         protected File $file,
         protected Notification $notification,
         protected OperationsRepository $repository,
-        protected Config $config,
+        protected ConfigHelper $config,
         protected Container $container
     ) {}
 
@@ -45,7 +45,7 @@ public function setOutput(OutputStyle $output): self
         return $this;
     }
 
-    public function runUp(string $filename, int $batch, Options $options): void
+    public function runUp(string $filename, int $batch, OptionsData $options): void
     {
         $path      = $this->resolvePath($filename, $options->path);
         $operation = $this->resolveOperation($path);
@@ -76,7 +76,7 @@ public function runUp(string $filename, int $batch, Options $options): void
         });
     }
 
-    public function runDown(string $filename, Options $options): void
+    public function runDown(string $filename, OptionsData $options): void
     {
         $path      = $this->resolvePath($filename, $options->path);
         $operation = $this->resolveOperation($path);
@@ -109,7 +109,7 @@ protected function hasOperation(Operation $operation, string $method): bool
         return method_exists($operation, $method);
     }
 
-    protected function hasAsync(Operation $operation, Options $options): bool
+    protected function hasAsync(Operation $operation, OptionsData $options): bool
     {
         return ! $options->sync && $operation->shouldBeAsync();
     }
@@ -131,7 +131,7 @@ protected function deleteLog(string $name): void
         $this->repository->delete($name);
     }
 
-    protected function allowOperation(Operation $operation, Options $options): bool
+    protected function allowOperation(Operation $operation, OptionsData $options): bool
     {
         if (! $operation->shouldRun()) {
             return false;
@@ -140,7 +140,7 @@ protected function allowOperation(Operation $operation, Options $options): bool
         return ! $this->disallowBefore($operation, $options);
     }
 
-    protected function disallowBefore(Operation $operation, Options $options): bool
+    protected function disallowBefore(Operation $operation, OptionsData $options): bool
     {
         return $options->before && ! $operation->needBefore();
     }
diff --git a/src/Services/Mutex.php b/src/Services/MutexService.php
similarity index 98%
rename from src/Services/Mutex.php
rename to src/Services/MutexService.php
index 5ad42c4e..a14761cc 100644
--- a/src/Services/Mutex.php
+++ b/src/Services/MutexService.php
@@ -9,7 +9,7 @@
 use Illuminate\Contracts\Cache\Factory as Cache;
 use Illuminate\Contracts\Cache\Repository;
 
-class Mutex
+class MutexService
 {
     protected ?string $store = null;
 
diff --git a/src/Values/Options.php b/src/Values/OptionsData.php
similarity index 89%
rename from src/Values/Options.php
rename to src/Values/OptionsData.php
index 77d76f6b..5b9bdb2c 100644
--- a/src/Values/Options.php
+++ b/src/Values/OptionsData.php
@@ -4,14 +4,14 @@
 
 namespace DragonCode\LaravelDeployOperations\Values;
 
-use DragonCode\LaravelDeployOperations\Helpers\Config;
+use DragonCode\LaravelDeployOperations\Helpers\ConfigHelper;
 use DragonCode\SimpleDataTransferObject\DataTransferObject;
 use DragonCode\Support\Facades\Helpers\Boolean;
 use DragonCode\Support\Facades\Helpers\Str;
 
 use function is_numeric;
 
-class Options extends DataTransferObject
+class OptionsData extends DataTransferObject
 {
     public bool $before = false;
 
@@ -75,8 +75,8 @@ protected function castStep(int|string|null $value): ?int
         return is_numeric($value) ? (int) $value : null;
     }
 
-    protected function config(): Config
+    protected function config(): ConfigHelper
     {
-        return app(Config::class);
+        return app(ConfigHelper::class);
     }
 }
diff --git a/tests/Commands/MutexTest.php b/tests/Commands/MutexTest.php
index eeffce67..a3d5ce7a 100644
--- a/tests/Commands/MutexTest.php
+++ b/tests/Commands/MutexTest.php
@@ -6,7 +6,7 @@
 
 use DragonCode\LaravelDeployOperations\Console\Command;
 use DragonCode\LaravelDeployOperations\Constants\Options;
-use DragonCode\LaravelDeployOperations\Services\Mutex;
+use DragonCode\LaravelDeployOperations\Services\MutexService;
 use Illuminate\Container\Container;
 use Mockery as m;
 use Symfony\Component\Console\Input\ArrayInput;
@@ -17,7 +17,7 @@ class MutexTest extends TestCase
 {
     protected Command $command;
 
-    protected Mutex $mutex;
+    protected MutexService $mutex;
 
     protected function setUp(): void
     {
@@ -32,10 +32,10 @@ public function handle(): int
             }
         };
 
-        $this->mutex = m::mock(Mutex::class);
+        $this->mutex = m::mock(MutexService::class);
 
         $container = Container::getInstance();
-        $container->instance(Mutex::class, $this->mutex);
+        $container->instance(MutexService::class, $this->mutex);
         $this->command->setLaravel($container);
     }
 
diff --git a/tests/Helpers/GitTest.php b/tests/Helpers/GitTest.php
index 82f1cb06..fc356d7f 100644
--- a/tests/Helpers/GitTest.php
+++ b/tests/Helpers/GitTest.php
@@ -4,7 +4,7 @@
 
 namespace Tests\Helpers;
 
-use DragonCode\LaravelDeployOperations\Helpers\Git;
+use DragonCode\LaravelDeployOperations\Helpers\GitHelper;
 use Tests\TestCase;
 
 class GitTest extends TestCase
@@ -21,8 +21,8 @@ public function testCurrentBranch()
         $this->assertIsString($branch);
     }
 
-    protected function git(): Git
+    protected function git(): GitHelper
     {
-        return $this->app->make(Git::class);
+        return $this->app->make(GitHelper::class);
     }
 }
diff --git a/tests/Helpers/SorterTest.php b/tests/Helpers/SorterTest.php
index 58442e6b..23da5f43 100644
--- a/tests/Helpers/SorterTest.php
+++ b/tests/Helpers/SorterTest.php
@@ -4,7 +4,7 @@
 
 namespace Tests\Helpers;
 
-use DragonCode\LaravelDeployOperations\Helpers\Sorter;
+use DragonCode\LaravelDeployOperations\Helpers\SorterHelper;
 use Tests\TestCase;
 
 class SorterTest extends TestCase
@@ -84,8 +84,8 @@ public function testByRan(): void
         $this->assertSame($expected, $this->sorter()->byRan($items, $completed));
     }
 
-    protected function sorter(): Sorter
+    protected function sorter(): SorterHelper
     {
-        return new Sorter();
+        return new SorterHelper();
     }
 }