diff --git a/src/app/Console/Commands/PackageSkusCommand.php b/src/app/Console/Commands/PackageSkus.php
similarity index 92%
rename from src/app/Console/Commands/PackageSkusCommand.php
rename to src/app/Console/Commands/PackageSkus.php
index 5c995396..d04ad369 100644
--- a/src/app/Console/Commands/PackageSkusCommand.php
+++ b/src/app/Console/Commands/PackageSkus.php
@@ -1,52 +1,51 @@
 <?php
 
 namespace App\Console\Commands;
 
 use App\Package;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
 
-class PackageSkusCommand extends Command
+class PackageSkus extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
     protected $signature = 'package:skus';
 
     /**
      * The console command description.
      *
      * @var string
      */
     protected $description = "List SKUs for packages.";
 
     /**
      * Create a new command instance.
      *
      * @return void
      */
     public function __construct()
     {
         parent::__construct();
     }
 
     /**
      * Execute the console command.
      *
      * @return mixed
      */
     public function handle()
     {
         $packages = Package::all();
 
         foreach ($packages as $package) {
             $this->info(sprintf("Package: %s", $package->title));
 
             foreach ($package->skus as $sku) {
                 $this->info(sprintf("  SKU: %s (%d)", $sku->title, $sku->pivot->qty));
             }
         }
     }
 }
diff --git a/src/app/Console/Commands/PlanPackagesCommand.php b/src/app/Console/Commands/PlanPackages.php
similarity index 96%
rename from src/app/Console/Commands/PlanPackagesCommand.php
rename to src/app/Console/Commands/PlanPackages.php
index 3f5439fc..e406d5f3 100644
--- a/src/app/Console/Commands/PlanPackagesCommand.php
+++ b/src/app/Console/Commands/PlanPackages.php
@@ -1,88 +1,87 @@
 <?php
 
 namespace App\Console\Commands;
 
 use App\Plan;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
 
-class PlanPackagesCommand extends Command
+class PlanPackages extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
     protected $signature = 'plan:packages';
 
     /**
      * The console command description.
      *
      * @var string
      */
     protected $description = "List packages for plans.";
 
     /**
      * Create a new command instance.
      *
      * @return void
      */
     public function __construct()
     {
         parent::__construct();
     }
 
     /**
      * Execute the console command.
      *
      * @return mixed
      */
     public function handle()
     {
         $plans = Plan::all();
 
         foreach ($plans as $plan) {
             $this->info(sprintf("Plan: %s", $plan->title));
 
             $plan_costs = 0;
 
             foreach ($plan->packages as $package) {
                 $qtyMin = $package->pivot->qty_min;
                 $qtyMax = $package->pivot->qty_max;
 
                 $discountQty = $package->pivot->discount_qty;
                 $discountRate = (100 - $package->pivot->discount_rate) / 100;
 
                 $this->info(
                     sprintf(
                         "  Package: %s (min: %d, max: %d, discount %d%% after the first %d, base cost: %d)",
                         $package->title,
                         $package->pivot->qty_min,
                         $package->pivot->qty_max,
                         $package->pivot->discount_rate,
                         $package->pivot->discount_qty,
                         $package->cost()
                     )
                 );
 
                 foreach ($package->skus as $sku) {
                     $this->info(sprintf("    SKU: %s (%d)", $sku->title, $sku->pivot->qty));
                 }
 
                 if ($qtyMin < $discountQty) {
                     $plan_costs += $qtyMin * $package->cost();
                 } elseif ($qtyMin == $discountQty) {
                     $plan_costs += $package->cost();
                 } else {
                     // base rate
                     $plan_costs += $discountQty * $package->cost();
 
                     // discounted rate
                     $plan_costs += ($qtyMin - $discountQty) * $package->cost() * $discountRate;
                 }
             }
 
             $this->info(sprintf("  Plan costs per month: %d", $plan_costs));
         }
     }
 }
diff --git a/src/app/Console/Commands/UserEntitlementsCommand.php b/src/app/Console/Commands/UserEntitlements.php
similarity index 94%
rename from src/app/Console/Commands/UserEntitlementsCommand.php
rename to src/app/Console/Commands/UserEntitlements.php
index 431842e8..e103bb75 100644
--- a/src/app/Console/Commands/UserEntitlementsCommand.php
+++ b/src/app/Console/Commands/UserEntitlements.php
@@ -1,62 +1,61 @@
 <?php
 
 namespace App\Console\Commands;
 
 use App\Sku;
 use App\User;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
 
-class UserEntitlementsCommand extends Command
+class UserEntitlements extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
     protected $signature = 'user:entitlements {userid}';
 
     /**
      * The console command description.
      *
      * @var string
      */
     protected $description = "List a user's entitlements.";
 
     /**
      * Create a new command instance.
      *
      * @return void
      */
     public function __construct()
     {
         parent::__construct();
     }
 
     /**
      * Execute the console command.
      *
      * @return mixed
      */
     public function handle()
     {
         $user = User::where('email', $this->argument('userid'))->first();
 
         $this->info("Found user: {$user->id}");
 
         $skus_counted = [];
 
         foreach ($user->entitlements as $entitlement) {
             if (!array_key_exists($entitlement->sku_id, $skus_counted)) {
                 $skus_counted[$entitlement->sku_id] = 1;
             } else {
                 $skus_counted[$entitlement->sku_id] += 1;
             }
         }
 
         foreach ($skus_counted as $id => $qty) {
             $sku = Sku::find($id);
             $this->info("SKU: {$sku->title} ({$qty})");
         }
     }
 }