diff --git a/src/app/Console/Commands/AuthAttempt/ListCommand.php b/src/app/Console/Commands/AuthAttempt/ListCommand.php
--- a/src/app/Console/Commands/AuthAttempt/ListCommand.php
+++ b/src/app/Console/Commands/AuthAttempt/ListCommand.php
@@ -12,7 +12,7 @@
      *
      * @var string
      */
-    protected $signature = 'authattempt:list';
+    protected $signature = 'authattempts';
 
     /**
      * The console command description.
diff --git a/src/app/Console/Commands/DiscountsCommand.php b/src/app/Console/Commands/Discount/ListCommand.php
rename from src/app/Console/Commands/DiscountsCommand.php
rename to src/app/Console/Commands/Discount/ListCommand.php
--- a/src/app/Console/Commands/DiscountsCommand.php
+++ b/src/app/Console/Commands/Discount/ListCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Discount;
 
 use App\Console\ObjectListCommand;
 
@@ -27,7 +27,7 @@
  * (...)
  * ```
  */
-class DiscountsCommand extends ObjectListCommand
+class ListCommand extends ObjectListCommand
 {
     protected $objectClass = \App\Discount::class;
     protected $objectName = 'discount';
diff --git a/src/app/Console/Commands/DomainsCommand.php b/src/app/Console/Commands/Domain/ListCommand.php
rename from src/app/Console/Commands/DomainsCommand.php
rename to src/app/Console/Commands/Domain/ListCommand.php
--- a/src/app/Console/Commands/DomainsCommand.php
+++ b/src/app/Console/Commands/Domain/ListCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Domain;
 
 use App\Console\ObjectListCommand;
 
@@ -27,7 +27,7 @@
  * (...)
  * ```
  */
-class DomainsCommand extends ObjectListCommand
+class ListCommand extends ObjectListCommand
 {
     protected $objectClass = \App\Domain::class;
     protected $objectName = 'domain';
diff --git a/src/app/Console/Commands/GroupsCommand.php b/src/app/Console/Commands/Group/ListCommand.php
rename from src/app/Console/Commands/GroupsCommand.php
rename to src/app/Console/Commands/Group/ListCommand.php
--- a/src/app/Console/Commands/GroupsCommand.php
+++ b/src/app/Console/Commands/Group/ListCommand.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Group;
 
 use App\Console\ObjectListCommand;
 
-class GroupsCommand extends ObjectListCommand
+class ListCommand extends ObjectListCommand
 {
     protected $objectClass = \App\Group::class;
     protected $objectName = 'group';
diff --git a/src/app/Console/Commands/Meet/RoomCreate.php b/src/app/Console/Commands/Meet/RoomCreateCommand.php
rename from src/app/Console/Commands/Meet/RoomCreate.php
rename to src/app/Console/Commands/Meet/RoomCreateCommand.php
--- a/src/app/Console/Commands/Meet/RoomCreate.php
+++ b/src/app/Console/Commands/Meet/RoomCreateCommand.php
@@ -5,7 +5,7 @@
 use App\Console\Command;
 use App\Meet\Room;
 
-class RoomCreate extends Command
+class RoomCreateCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/src/app/Console/Commands/Meet/Rooms.php b/src/app/Console/Commands/Meet/RoomsCommand.php
rename from src/app/Console/Commands/Meet/Rooms.php
rename to src/app/Console/Commands/Meet/RoomsCommand.php
--- a/src/app/Console/Commands/Meet/Rooms.php
+++ b/src/app/Console/Commands/Meet/RoomsCommand.php
@@ -4,7 +4,7 @@
 
 use App\Console\Command;
 
-class Rooms extends Command
+class RoomsCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/src/app/Console/Commands/Meet/Sessions.php b/src/app/Console/Commands/Meet/SessionsCommand.php
rename from src/app/Console/Commands/Meet/Sessions.php
rename to src/app/Console/Commands/Meet/SessionsCommand.php
--- a/src/app/Console/Commands/Meet/Sessions.php
+++ b/src/app/Console/Commands/Meet/SessionsCommand.php
@@ -4,7 +4,7 @@
 
 use App\Console\Command;
 
-class Sessions extends Command
+class SessionsCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/src/app/Console/Commands/PackagesCommand.php b/src/app/Console/Commands/Package/ListCommand.php
rename from src/app/Console/Commands/PackagesCommand.php
rename to src/app/Console/Commands/Package/ListCommand.php
--- a/src/app/Console/Commands/PackagesCommand.php
+++ b/src/app/Console/Commands/Package/ListCommand.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Package;
 
 use App\Console\ObjectListCommand;
 
-class PackagesCommand extends ObjectListCommand
+class ListCommand extends ObjectListCommand
 {
     protected $objectClass = \App\Package::class;
     protected $objectName = 'package';
diff --git a/src/app/Console/Commands/PackageSkus.php b/src/app/Console/Commands/Package/SkusCommand.php
rename from src/app/Console/Commands/PackageSkus.php
rename to src/app/Console/Commands/Package/SkusCommand.php
--- a/src/app/Console/Commands/PackageSkus.php
+++ b/src/app/Console/Commands/Package/SkusCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Package;
 
 use App\Console\Command;
 use App\Package;
 
-class PackageSkus extends Command
+class SkusCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/src/app/Console/Commands/PlansCommand.php b/src/app/Console/Commands/Plan/ListCommand.php
rename from src/app/Console/Commands/PlansCommand.php
rename to src/app/Console/Commands/Plan/ListCommand.php
--- a/src/app/Console/Commands/PlansCommand.php
+++ b/src/app/Console/Commands/Plan/ListCommand.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Plan;
 
 use App\Console\ObjectListCommand;
 
-class PlansCommand extends ObjectListCommand
+class ListCommand extends ObjectListCommand
 {
     protected $objectClass = \App\Plan::class;
     protected $objectName = 'plan';
diff --git a/src/app/Console/Commands/PlanPackages.php b/src/app/Console/Commands/Plan/PackagesCommand.php
rename from src/app/Console/Commands/PlanPackages.php
rename to src/app/Console/Commands/Plan/PackagesCommand.php
--- a/src/app/Console/Commands/PlanPackages.php
+++ b/src/app/Console/Commands/Plan/PackagesCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Plan;
 
 use App\Plan;
 use Illuminate\Console\Command;
 
-class PlanPackages extends Command
+class PackagesCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/src/app/Console/Commands/ResourcesCommand.php b/src/app/Console/Commands/Resource/ListCommand.php
rename from src/app/Console/Commands/ResourcesCommand.php
rename to src/app/Console/Commands/Resource/ListCommand.php
--- a/src/app/Console/Commands/ResourcesCommand.php
+++ b/src/app/Console/Commands/Resource/ListCommand.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Resource;
 
 use App\Console\ObjectListCommand;
 
-class ResourcesCommand extends ObjectListCommand
+class ListCommand extends ObjectListCommand
 {
     protected $objectClass = \App\Resource::class;
     protected $objectName = 'resource';
diff --git a/src/app/Console/Commands/SharedFoldersCommand.php b/src/app/Console/Commands/SharedFolder/ListCommand.php
rename from src/app/Console/Commands/SharedFoldersCommand.php
rename to src/app/Console/Commands/SharedFolder/ListCommand.php
--- a/src/app/Console/Commands/SharedFoldersCommand.php
+++ b/src/app/Console/Commands/SharedFolder/ListCommand.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\SharedFolder;
 
 use App\Console\ObjectListCommand;
 
-class SharedFoldersCommand extends ObjectListCommand
+class ListCommand extends ObjectListCommand
 {
     protected $objectClass = \App\SharedFolder::class;
     protected $objectName = 'shared-folder';
diff --git a/src/app/Console/Commands/SkusCommand.php b/src/app/Console/Commands/Sku/ListCommand.php
rename from src/app/Console/Commands/SkusCommand.php
rename to src/app/Console/Commands/Sku/ListCommand.php
--- a/src/app/Console/Commands/SkusCommand.php
+++ b/src/app/Console/Commands/Sku/ListCommand.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Sku;
 
 use App\Console\ObjectListCommand;
 
-class SkusCommand extends ObjectListCommand
+class ListCommand extends ObjectListCommand
 {
     protected $objectClass = \App\Sku::class;
     protected $objectName = 'sku';
diff --git a/src/app/Console/Commands/Sku/ListUsers.php b/src/app/Console/Commands/Sku/ListUsersCommand.php
rename from src/app/Console/Commands/Sku/ListUsers.php
rename to src/app/Console/Commands/Sku/ListUsersCommand.php
--- a/src/app/Console/Commands/Sku/ListUsers.php
+++ b/src/app/Console/Commands/Sku/ListUsersCommand.php
@@ -4,7 +4,7 @@
 
 use App\Console\Command;
 
-class ListUsers extends Command
+class ListUsersCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/src/app/Console/Commands/TenantsCommand.php b/src/app/Console/Commands/Tenant/ListCommand.php
rename from src/app/Console/Commands/TenantsCommand.php
rename to src/app/Console/Commands/Tenant/ListCommand.php
--- a/src/app/Console/Commands/TenantsCommand.php
+++ b/src/app/Console/Commands/Tenant/ListCommand.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Tenant;
 
 use App\Console\ObjectListCommand;
 
-class TenantsCommand extends ObjectListCommand
+class ListCommand extends ObjectListCommand
 {
     protected $objectClass = \App\Tenant::class;
     protected $objectName = 'tenant';
diff --git a/src/app/Console/Commands/UsersCommand.php b/src/app/Console/Commands/User/ListCommand.php
rename from src/app/Console/Commands/UsersCommand.php
rename to src/app/Console/Commands/User/ListCommand.php
--- a/src/app/Console/Commands/UsersCommand.php
+++ b/src/app/Console/Commands/User/ListCommand.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Console\ObjectListCommand;
 
-class UsersCommand extends ObjectListCommand
+class ListCommand extends ObjectListCommand
 {
     protected $objectClass = \App\User::class;
     protected $objectName = 'user';
diff --git a/src/app/Console/Commands/WalletsCommand.php b/src/app/Console/Commands/Wallet/ListCommand.php
rename from src/app/Console/Commands/WalletsCommand.php
rename to src/app/Console/Commands/Wallet/ListCommand.php
--- a/src/app/Console/Commands/WalletsCommand.php
+++ b/src/app/Console/Commands/Wallet/ListCommand.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Wallet;
 
 use App\Console\ObjectListCommand;
 
-class WalletsCommand extends ObjectListCommand
+class ListCommand extends ObjectListCommand
 {
     protected $objectClass = \App\Wallet::class;
     protected $objectName = 'wallet';
diff --git a/src/tests/Feature/Console/AuthAttempt/ListTest.php b/src/tests/Feature/Console/AuthAttempt/ListTest.php
--- a/src/tests/Feature/Console/AuthAttempt/ListTest.php
+++ b/src/tests/Feature/Console/AuthAttempt/ListTest.php
@@ -32,17 +32,17 @@
     {
         // Warning: We're not using artisan() here, as this will not
         // allow us to test "empty output" cases
-        $code = \Artisan::call('authattempt:list');
+        $code = \Artisan::call('authattempts');
         $output = trim(\Artisan::output());
         $this->assertSame(0, $code);
         $this->assertSame('', $output);
 
         $user = $this->getTestUser('john@kolab.org');
-        $authAttempt = AuthAttempt::recordAuthAttempt($user, "10.0.0.1");
+        $authAttempt = AuthAttempt::recordAuthAttempt($user, '10.0.0.1');
         //For up-to date timestamps and whatnot
         $authAttempt->refresh();
 
-        $code = \Artisan::call("authattempt:list");
+        $code = \Artisan::call('authattempts');
         $output = trim(\Artisan::output());
         $this->assertSame(0, $code);
 
diff --git a/src/tests/Feature/Console/DataCountriesTest.php b/src/tests/Feature/Console/Data/Import/CountriesTest.php
rename from src/tests/Feature/Console/DataCountriesTest.php
rename to src/tests/Feature/Console/Data/Import/CountriesTest.php
--- a/src/tests/Feature/Console/DataCountriesTest.php
+++ b/src/tests/Feature/Console/Data/Import/CountriesTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Feature\Console;
+namespace Tests\Feature\Console\Data\Import;
 
 use Tests\TestCase;
 
-class DataCountriesTest extends TestCase
+class CountriesTest extends TestCase
 {
     public function testHandle(): void
     {
diff --git a/src/tests/Feature/Console/DiscountsTest.php b/src/tests/Feature/Console/Discount/ListTest.php
rename from src/tests/Feature/Console/DiscountsTest.php
rename to src/tests/Feature/Console/Discount/ListTest.php
--- a/src/tests/Feature/Console/DiscountsTest.php
+++ b/src/tests/Feature/Console/Discount/ListTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Feature\Console;
+namespace Tests\Feature\Console\Discount;
 
 use Tests\TestCase;
 
-class DiscountsTest extends TestCase
+class ListTest extends TestCase
 {
     public function testHandle(): void
     {
diff --git a/src/tests/Feature/Console/DomainsTest.php b/src/tests/Feature/Console/Domain/ListTest.php
rename from src/tests/Feature/Console/DomainsTest.php
rename to src/tests/Feature/Console/Domain/ListTest.php
--- a/src/tests/Feature/Console/DomainsTest.php
+++ b/src/tests/Feature/Console/Domain/ListTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Feature\Console;
+namespace Tests\Feature\Console\Domain;
 
 use Tests\TestCase;
 
-class DomainsTest extends TestCase
+class ListTest extends TestCase
 {
     /**
      * Test the command
diff --git a/src/tests/Feature/Console/PackageSkusTest.php b/src/tests/Feature/Console/Package/SkusTest.php
rename from src/tests/Feature/Console/PackageSkusTest.php
rename to src/tests/Feature/Console/Package/SkusTest.php
--- a/src/tests/Feature/Console/PackageSkusTest.php
+++ b/src/tests/Feature/Console/Package/SkusTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Feature\Console;
+namespace Tests\Feature\Console\Package;
 
 use Tests\TestCase;
 
-class PackageSkusTest extends TestCase
+class SkusTest extends TestCase
 {
     public function testHandle(): void
     {
diff --git a/src/tests/Feature/Console/PlanPackagesTest.php b/src/tests/Feature/Console/Plan/PackagesTest.php
rename from src/tests/Feature/Console/PlanPackagesTest.php
rename to src/tests/Feature/Console/Plan/PackagesTest.php
--- a/src/tests/Feature/Console/PlanPackagesTest.php
+++ b/src/tests/Feature/Console/Plan/PackagesTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Feature\Console;
+namespace Tests\Feature\Console\Plan;
 
 use Tests\TestCase;
 
-class PlanPackagesTest extends TestCase
+class PackagesTest extends TestCase
 {
     public function testHandle(): void
     {
diff --git a/src/tests/Feature/Console/UsersTest.php b/src/tests/Feature/Console/User/ListTest.php
rename from src/tests/Feature/Console/UsersTest.php
rename to src/tests/Feature/Console/User/ListTest.php
--- a/src/tests/Feature/Console/UsersTest.php
+++ b/src/tests/Feature/Console/User/ListTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Feature\Console;
+namespace Tests\Feature\Console\User;
 
 use Tests\TestCase;
 
-class UsersTest extends TestCase
+class ListTest extends TestCase
 {
     /**
      * Test the command
diff --git a/src/tests/Feature/Console/WalletsTest.php b/src/tests/Feature/Console/Wallet/ListTest.php
rename from src/tests/Feature/Console/WalletsTest.php
rename to src/tests/Feature/Console/Wallet/ListTest.php
--- a/src/tests/Feature/Console/WalletsTest.php
+++ b/src/tests/Feature/Console/Wallet/ListTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Feature\Console;
+namespace Tests\Feature\Console\Wallet;
 
 use Tests\TestCase;
 
-class WalletsTest extends TestCase
+class ListTest extends TestCase
 {
     public function testHandle(): void
     {