Cleanup usage of Leenooks\Carbon, change ServiceType to be consistent with Products/ Suppliers/

app/Models/Service/Broadband.php

@@ -2,21 +2,20 @@
 
 namespace App\Models\Service;
 
+use Carbon\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
-use Leenooks\Carbon;
 
 use App\Interfaces\ServiceUsage;
-use App\Models\Base\ServiceType;
 use App\Models\Supplier\Broadband as SupplierBroadband;
-use App\Models\Supplier\Type;
+use App\Models\Supplier\Type as SupplierType;
 use App\Models\Usage\Broadband as UsageBroadband;
 
 /**
  * Class Broadband (Service)
  * Services that are Internet Broadband
  */
-class Broadband extends ServiceType implements ServiceUsage
+class Broadband extends Type implements ServiceUsage
 {
 	private const LOGKEY = 'MSB';
 
@@ -105,9 +104,9 @@ class Broadband extends ServiceType implements ServiceUsage
 	/**
 	 * Return the suppliers offering that this service is providing
 	 *
-	 * @return Type
+	 * @return SupplierType
 	 */
-	public function supplied(): Type
+	public function supplied(): SupplierType
 	{
 		return $this->provided_adsl_plan_id
 			? SupplierBroadband::findOrFail($this->provided_adsl_plan_id)