diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index e7c1169e00..f0fd4dac5e 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -2,9 +2,20 @@
 
 namespace App\Exceptions;
 
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Auth\AuthenticationException;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Http\Request as HttpRequest;
+use Illuminate\Http\Response;
+use Illuminate\Queue\MaxAttemptsExceededException;
+use Illuminate\Session\TokenMismatchException;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Request;
+use Illuminate\Validation\ValidationException;
+use League\OAuth2\Server\Exception\OAuthServerException;
+use Symfony\Component\Console\Exception\CommandNotFoundException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Throwable;
 
 class Handler extends ExceptionHandler
@@ -15,16 +26,16 @@ class Handler extends ExceptionHandler
      * @var array
      */
     protected $dontReport = [
-        \Illuminate\Auth\AuthenticationException::class,
-        \Illuminate\Auth\Access\AuthorizationException::class,
-        \Symfony\Component\HttpKernel\Exception\HttpException::class,
-        \Symfony\Component\Console\Exception\CommandNotFoundException::class,
-        \Illuminate\Database\Eloquent\ModelNotFoundException::class,
-        \Illuminate\Session\TokenMismatchException::class,
-        \Illuminate\Validation\ValidationException::class,
-        \Illuminate\Queue\MaxAttemptsExceededException::class,
-        \League\OAuth2\Server\Exception\OAuthServerException::class,
-        \App\Exceptions\Discord\DiscordUserInviteException::class,
+        AuthenticationException::class,
+        AuthorizationException::class,
+        HttpException::class,
+        CommandNotFoundException::class,
+        ModelNotFoundException::class,
+        TokenMismatchException::class,
+        ValidationException::class,
+        MaxAttemptsExceededException::class,
+        OAuthServerException::class,
+        Discord\DiscordUserInviteException::class,
     ];
 
     /**
@@ -61,8 +72,8 @@ public function report(Throwable $e)
     /**
      * Render an exception into an HTTP response.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @param  HttpRequest  $request
+     * @return Response
      */
     public function render($request, Throwable $e)
     {
diff --git a/app/Filament/Admin/Resources/AccountResource.php b/app/Filament/Admin/Resources/AccountResource.php
index 4aeee0d37e..1d9c38fbde 100644
--- a/app/Filament/Admin/Resources/AccountResource.php
+++ b/app/Filament/Admin/Resources/AccountResource.php
@@ -4,6 +4,7 @@
 
 use App\Enums\QualificationTypeEnum;
 use App\Filament\Admin\Helpers\Resources\DefinesGatedAttributes;
+use App\Filament\Training\Resources\AccountResource\RelationManagers\WaitingListsRelationManager;
 use App\Models\Mship\Account;
 use App\Models\Roster;
 use AxonC\FilamentCopyablePlaceholder\Forms\Components\CopyablePlaceholder;
@@ -157,25 +158,25 @@ public static function table(Table $table): Table
     public static function getRelations(): array
     {
         return [
-            \App\Filament\Admin\Resources\AccountResource\RelationManagers\StatesRelationManager::class,
-            \App\Filament\Admin\Resources\AccountResource\RelationManagers\QualificationsRelationManager::class,
-            \App\Filament\Admin\Resources\AccountResource\RelationManagers\FeedbackRelationManager::class,
-            \App\Filament\Admin\Resources\AccountResource\RelationManagers\RolesRelationManager::class,
-            \App\Filament\Admin\Resources\AccountResource\RelationManagers\BansRelationManager::class,
-            \App\Filament\Admin\Resources\AccountResource\RelationManagers\NotesRelationManager::class,
-            \App\Filament\Admin\Resources\AccountResource\RelationManagers\EndorsementsRelationManager::class,
-            \App\Filament\Training\Resources\AccountResource\RelationManagers\WaitingListsRelationManager::class,
-            \App\Filament\Admin\Resources\AccountResource\RelationManagers\RetentionChecksRelationManager::class,
-            \App\Filament\Admin\Resources\AccountResource\RelationManagers\VisitTransferRelationManager::class,
+            AccountResource\RelationManagers\StatesRelationManager::class,
+            AccountResource\RelationManagers\QualificationsRelationManager::class,
+            AccountResource\RelationManagers\FeedbackRelationManager::class,
+            AccountResource\RelationManagers\RolesRelationManager::class,
+            AccountResource\RelationManagers\BansRelationManager::class,
+            AccountResource\RelationManagers\NotesRelationManager::class,
+            AccountResource\RelationManagers\EndorsementsRelationManager::class,
+            WaitingListsRelationManager::class,
+            AccountResource\RelationManagers\RetentionChecksRelationManager::class,
+            AccountResource\RelationManagers\VisitTransferRelationManager::class,
         ];
     }
 
     public static function getPages(): array
     {
         return [
-            'index' => \App\Filament\Admin\Resources\AccountResource\Pages\ListAccounts::route('/'),
-            'view' => \App\Filament\Admin\Resources\AccountResource\Pages\ViewAccount::route('/{record}'),
-            'edit' => \App\Filament\Admin\Resources\AccountResource\Pages\EditAccount::route('/{record}/edit'),
+            'index' => AccountResource\Pages\ListAccounts::route('/'),
+            'view' => AccountResource\Pages\ViewAccount::route('/{record}'),
+            'edit' => AccountResource\Pages\EditAccount::route('/{record}/edit'),
         ];
     }
 
diff --git a/app/Filament/Admin/Resources/BanResource.php b/app/Filament/Admin/Resources/BanResource.php
index 10e34ce8e3..bd3bc194ea 100644
--- a/app/Filament/Admin/Resources/BanResource.php
+++ b/app/Filament/Admin/Resources/BanResource.php
@@ -103,8 +103,8 @@ public static function getRelations(): array
     public static function getPages(): array
     {
         return [
-            'index' => \App\Filament\Admin\Resources\BanResource\Pages\ListBans::route('/'),
-            'view' => \App\Filament\Admin\Resources\BanResource\Pages\ViewBan::route('/{record}'),
+            'index' => BanResource\Pages\ListBans::route('/'),
+            'view' => BanResource\Pages\ViewBan::route('/{record}'),
         ];
     }
 }
diff --git a/app/Filament/Admin/Resources/EndorsementRequestResource.php b/app/Filament/Admin/Resources/EndorsementRequestResource.php
index 6ccb60e722..30fb0d2e19 100644
--- a/app/Filament/Admin/Resources/EndorsementRequestResource.php
+++ b/app/Filament/Admin/Resources/EndorsementRequestResource.php
@@ -154,8 +154,8 @@ public static function table(Table $table): Table
     public static function getPages(): array
     {
         return [
-            'index' => \App\Filament\Admin\Resources\EndorsementRequestResource\Pages\ListEndorsementRequests::route('/'),
-            'create' => \App\Filament\Admin\Resources\EndorsementRequestResource\Pages\CreateEndorsementRequest::route('/create'),
+            'index' => EndorsementRequestResource\Pages\ListEndorsementRequests::route('/'),
+            'create' => EndorsementRequestResource\Pages\CreateEndorsementRequest::route('/create'),
         ];
     }
 }
diff --git a/app/Filament/Admin/Resources/FeedbackResource.php b/app/Filament/Admin/Resources/FeedbackResource.php
index b35fbff1c7..4d2489ba99 100644
--- a/app/Filament/Admin/Resources/FeedbackResource.php
+++ b/app/Filament/Admin/Resources/FeedbackResource.php
@@ -177,8 +177,8 @@ public static function table(Table $table): Table
     public static function getPages(): array
     {
         return [
-            'index' => \App\Filament\Admin\Resources\FeedbackResource\Pages\ListFeedback::route('/'),
-            'view' => \App\Filament\Admin\Resources\FeedbackResource\Pages\ViewFeedback::route('/{record}'),
+            'index' => FeedbackResource\Pages\ListFeedback::route('/'),
+            'view' => FeedbackResource\Pages\ViewFeedback::route('/{record}'),
         ];
     }
 
diff --git a/app/Filament/Admin/Resources/PositionGroupResource.php b/app/Filament/Admin/Resources/PositionGroupResource.php
index 4e0491de49..2f90711f41 100644
--- a/app/Filament/Admin/Resources/PositionGroupResource.php
+++ b/app/Filament/Admin/Resources/PositionGroupResource.php
@@ -56,8 +56,8 @@ public static function getRelations(): array
     public static function getPages(): array
     {
         return [
-            'index' => \App\Filament\Admin\Resources\PositionGroupResource\Pages\ListPositionGroups::route('/'),
-            'view' => \App\Filament\Admin\Resources\PositionGroupResource\Pages\ViewPositionGroup::route('/{record}'),
+            'index' => PositionGroupResource\Pages\ListPositionGroups::route('/'),
+            'view' => PositionGroupResource\Pages\ViewPositionGroup::route('/{record}'),
         ];
     }
 }
diff --git a/app/Filament/Admin/Resources/RoleResource.php b/app/Filament/Admin/Resources/RoleResource.php
index 57d114b206..cee3501d0c 100644
--- a/app/Filament/Admin/Resources/RoleResource.php
+++ b/app/Filament/Admin/Resources/RoleResource.php
@@ -92,17 +92,17 @@ public static function table(Table $table): Table
     public static function getRelations(): array
     {
         return [
-            \App\Filament\Admin\Resources\RoleResource\RelationManagers\UsersRelationManager::class,
-            \App\Filament\Admin\Resources\RoleResource\RelationManagers\DelegatesRelationManager::class,
+            RoleResource\RelationManagers\UsersRelationManager::class,
+            RoleResource\RelationManagers\DelegatesRelationManager::class,
         ];
     }
 
     public static function getPages(): array
     {
         return [
-            'index' => \App\Filament\Admin\Resources\RoleResource\Pages\ListRoles::route('/'),
-            'create' => \App\Filament\Admin\Resources\RoleResource\Pages\CreateRole::route('/create'),
-            'edit' => \App\Filament\Admin\Resources\RoleResource\Pages\EditRole::route('/{record}/edit'),
+            'index' => RoleResource\Pages\ListRoles::route('/'),
+            'create' => RoleResource\Pages\CreateRole::route('/create'),
+            'edit' => RoleResource\Pages\EditRole::route('/{record}/edit'),
         ];
     }
 }
diff --git a/app/Filament/Admin/Resources/RosterRestrictionResource.php b/app/Filament/Admin/Resources/RosterRestrictionResource.php
index deaf2213b2..1397cc30a6 100644
--- a/app/Filament/Admin/Resources/RosterRestrictionResource.php
+++ b/app/Filament/Admin/Resources/RosterRestrictionResource.php
@@ -48,7 +48,7 @@ public static function getEloquentQuery(): Builder
     public static function getPages(): array
     {
         return [
-            'index' => \App\Filament\Admin\Resources\RosterRestrictionResource\Pages\ListRosterRestrictions::route('/'),
+            'index' => RosterRestrictionResource\Pages\ListRosterRestrictions::route('/'),
         ];
     }
 }
diff --git a/app/Filament/Admin/Resources/SoloEndorsementResource.php b/app/Filament/Admin/Resources/SoloEndorsementResource.php
index a4ed4c4846..cc370a33d3 100644
--- a/app/Filament/Admin/Resources/SoloEndorsementResource.php
+++ b/app/Filament/Admin/Resources/SoloEndorsementResource.php
@@ -84,7 +84,7 @@ public static function table(Table $table): Table
     public static function getPages(): array
     {
         return [
-            'index' => \App\Filament\Admin\Resources\SoloEndorsementResource\Pages\ListSoloEndorsements::route('/'),
+            'index' => SoloEndorsementResource\Pages\ListSoloEndorsements::route('/'),
         ];
     }
 }
diff --git a/app/Filament/Training/Resources/WaitingListResource.php b/app/Filament/Training/Resources/WaitingListResource.php
index eb41ae6f9b..61b69ed82c 100644
--- a/app/Filament/Training/Resources/WaitingListResource.php
+++ b/app/Filament/Training/Resources/WaitingListResource.php
@@ -138,10 +138,10 @@ public static function getRelations(): array
     public static function getPages(): array
     {
         return [
-            'index' => \App\Filament\Training\Resources\WaitingListResource\Pages\ListWaitingLists::route('/'),
-            'create' => \App\Filament\Training\Resources\WaitingListResource\Pages\CreateWaitingList::route('/create'),
-            'edit' => \App\Filament\Training\Resources\WaitingListResource\Pages\EditWaitingList::route('/{record}/edit'),
-            'view' => \App\Filament\Training\Resources\WaitingListResource\Pages\ViewWaitingList::route('/{record}'),
+            'index' => WaitingListResource\Pages\ListWaitingLists::route('/'),
+            'create' => WaitingListResource\Pages\CreateWaitingList::route('/create'),
+            'edit' => WaitingListResource\Pages\EditWaitingList::route('/{record}/edit'),
+            'view' => WaitingListResource\Pages\ViewWaitingList::route('/{record}'),
         ];
     }
 }
diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 42b49ace95..79fdc5b26b 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -6,15 +6,17 @@
 use Auth;
 use Carbon\Carbon;
 use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Auth\Access\Response as AuthResponse;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Auth\RedirectsUsers;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Cache;
 use Session;
 use View;
 
-class BaseController extends \Illuminate\Routing\Controller
+class BaseController extends Controller
 {
     use AuthorizesRequests {
         authorize as protected doAuthorize;
@@ -60,9 +62,9 @@ public function redirectTo()
      *
      * @param  mixed  $ability
      * @param  mixed|array  $arguments
-     * @return \Illuminate\Auth\Access\Response
+     * @return AuthResponse
      *
-     * @throws \Illuminate\Auth\Access\AuthorizationException
+     * @throws AuthorizationException
      */
     public function authorize($ability, $arguments = [])
     {
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index d9ce53284f..2c0f58497d 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -17,7 +17,7 @@ class Kernel extends HttpKernel
     protected $middleware = [
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \App\Http\Middleware\TrimStrings::class,
+        Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
     ];
 
@@ -29,16 +29,16 @@ class Kernel extends HttpKernel
     protected $middlewareGroups = [
         'web' => [
             // native
-            \App\Http\Middleware\EncryptCookies::class,
+            Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
             \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
+            Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
 
             // custom
-            \App\Http\Middleware\TrackInactivity::class,
+            Middleware\TrackInactivity::class,
         ],
         'api' => [
             'throttle:60,1',
@@ -67,17 +67,17 @@ class Kernel extends HttpKernel
      */
     protected $routeMiddleware = [
         // native
-        'auth' => \App\Http\Middleware\Authenticate::class,
+        'auth' => Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'guest' => Middleware\RedirectIfAuthenticated::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
 
         // custom
         'admin' => Middleware\CheckAdminPermissions::class,
         'user.must.read.notifications' => Middleware\UserMustReadNotifications::class,
-        'api.tracking' => \App\Http\Middleware\ApiTracking::class,
+        'api.tracking' => Middleware\ApiTracking::class,
         'denyifbanned' => Middleware\DenyIfBanned::class,
         'mandatorypasswords' => Middleware\MandatoryPasswords::class,
         'redirecttointended' => Middleware\RedirectToIntended::class,
@@ -95,8 +95,8 @@ class Kernel extends HttpKernel
         \Illuminate\Session\Middleware\StartSession::class,
         \Illuminate\View\Middleware\ShareErrorsFromSession::class,
         \Illuminate\Session\Middleware\AuthenticateSession::class,
-        \App\Http\Middleware\TrackInactivity::class,
-        \App\Http\Middleware\Authenticate::class,
+        Middleware\TrackInactivity::class,
+        Middleware\Authenticate::class,
         \Illuminate\Routing\Middleware\SubstituteBindings::class,
         \Illuminate\Auth\Middleware\Authorize::class,
     ];
diff --git a/app/Http/Middleware/AdminPanelFilamentAccessMiddleware.php b/app/Http/Middleware/AdminPanelFilamentAccessMiddleware.php
index 9d99cc3284..f116c12c08 100644
--- a/app/Http/Middleware/AdminPanelFilamentAccessMiddleware.php
+++ b/app/Http/Middleware/AdminPanelFilamentAccessMiddleware.php
@@ -3,7 +3,9 @@
 namespace App\Http\Middleware;
 
 use Closure;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Session;
 
 class AdminPanelFilamentAccessMiddleware
@@ -11,8 +13,8 @@ class AdminPanelFilamentAccessMiddleware
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
-     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     * @param  Closure(Request): (Response|RedirectResponse)  $next
+     * @return Response|RedirectResponse
      */
     public function handle(Request $request, Closure $next)
     {
diff --git a/app/Http/Requests/VisitTransfer/ApplicationStartRequest.php b/app/Http/Requests/VisitTransfer/ApplicationStartRequest.php
index e416e69e2d..89063d4649 100644
--- a/app/Http/Requests/VisitTransfer/ApplicationStartRequest.php
+++ b/app/Http/Requests/VisitTransfer/ApplicationStartRequest.php
@@ -22,8 +22,8 @@ public function rules()
             'terms_hours_minimum_relevant' => 'required',
             'terms_recent_transfer' => 'required',
             'terms_90_day' => 'required',
-            'terms_not_staff' => 'required_if:application_type,'.\App\Models\VisitTransfer\Application::TYPE_TRANSFER,
-            'application_type' => 'required|in:'.\App\Models\VisitTransfer\Application::TYPE_TRANSFER.','.\App\Models\VisitTransfer\Application::TYPE_VISIT,
+            'terms_not_staff' => 'required_if:application_type,'.Application::TYPE_TRANSFER,
+            'application_type' => 'required|in:'.Application::TYPE_TRANSFER.','.Application::TYPE_VISIT,
             'training_team' => 'required|in:pilot,atc',
         ];
     }
diff --git a/app/Libraries/TeamSpeak.php b/app/Libraries/TeamSpeak.php
index 1bd52c4c93..f7cde6cd2a 100644
--- a/app/Libraries/TeamSpeak.php
+++ b/app/Libraries/TeamSpeak.php
@@ -219,7 +219,7 @@ public static function checkMemberStanding(Client $client, Account $member)
      * Check a member has accepted any necessary notifications.
      *
      *
-     * @throws \App\Exceptions\TeamSpeak\ClientKickedFromServerException
+     * @throws ClientKickedFromServerException
      */
     public static function checkMemberMandatoryNotifications(Client $client, Account $member)
     {
@@ -251,7 +251,7 @@ public static function checkMemberMandatoryNotifications(Client $client, Account
      * Check the client's nickname is correct.
      *
      *
-     * @throws \App\Exceptions\TeamSpeak\ClientKickedFromServerException
+     * @throws ClientKickedFromServerException
      */
     public static function checkClientNickname(Client $client, Account $member)
     {
@@ -380,7 +380,7 @@ public static function checkClientChannelGroups(Client $client, Account $member)
      * Check the client's (allowed) idle time.
      *
      *
-     * @throws \App\Exceptions\TeamSpeak\ClientKickedFromServerException
+     * @throws ClientKickedFromServerException
      */
     public static function checkClientIdleTime(Client $client, Account $member)
     {
@@ -483,7 +483,7 @@ public static function banClient(Client $client, $reason, $duration)
      *
      * @param  string  $reason
      *
-     * @throws \App\Exceptions\TeamSpeak\ClientKickedFromServerException
+     * @throws ClientKickedFromServerException
      */
     public static function deactivateClient(Client $client, $reason)
     {
diff --git a/app/Models/Airport.php b/app/Models/Airport.php
index 60358deaf0..936721bebb 100644
--- a/app/Models/Airport.php
+++ b/app/Models/Airport.php
@@ -17,7 +17,7 @@
  * @property float|null $latitude
  * @property float|null $longitude
  * @property int|null $elevation
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
+ * @property-read \Illuminate\Database\Eloquent\Collection|Sys\Data\Change[] $dataChanges
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Airport whereElevation($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Airport whereId($value)
@@ -41,10 +41,10 @@
  * @property \Carbon\Carbon|null $updated_at
  * @property-read mixed $controllers
  * @property-read mixed $pilots
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Airport\Navaid[] $navaids
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Airport\Procedure[] $procedures
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Airport\Runway[] $runways
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Atc\Position[] $positions
+ * @property-read \Illuminate\Database\Eloquent\Collection|Navaid[] $navaids
+ * @property-read \Illuminate\Database\Eloquent\Collection|Procedure[] $procedures
+ * @property-read \Illuminate\Database\Eloquent\Collection|Runway[] $runways
+ * @property-read \Illuminate\Database\Eloquent\Collection|Position[] $positions
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Airport iCAO($icao)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Airport uK()
diff --git a/app/Models/Airport/Navaid.php b/app/Models/Airport/Navaid.php
index ffe478cbee..0bc80f4d3c 100644
--- a/app/Models/Airport/Navaid.php
+++ b/app/Models/Airport/Navaid.php
@@ -19,7 +19,7 @@
  * @property string|null $remarks
  * @property \Carbon\Carbon|null $created_at
  * @property \Carbon\Carbon|null $updated_at
- * @property-read \App\Models\Airport $airport
+ * @property-read Airport $airport
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Airport\Navaid whereAirportId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Airport\Navaid whereCreatedAt($value)
diff --git a/app/Models/Airport/Procedure.php b/app/Models/Airport/Procedure.php
index c10e103613..0e161229aa 100644
--- a/app/Models/Airport/Procedure.php
+++ b/app/Models/Airport/Procedure.php
@@ -19,9 +19,9 @@
  * @property string|null $remarks
  * @property \Carbon\Carbon|null $created_at
  * @property \Carbon\Carbon|null $updated_at
- * @property-read \App\Models\Airport $airport
+ * @property-read Airport $airport
  * @property-read mixed $procedure_type
- * @property-read \App\Models\Airport\Runway|null $runway
+ * @property-read Runway|null $runway
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Airport\Procedure whereAirportId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Airport\Procedure whereCreatedAt($value)
diff --git a/app/Models/Airport/Runway.php b/app/Models/Airport/Runway.php
index 23a3c6f95b..e3fa59f550 100644
--- a/app/Models/Airport/Runway.php
+++ b/app/Models/Airport/Runway.php
@@ -17,8 +17,8 @@
  * @property int $surface_type
  * @property \Carbon\Carbon|null $created_at
  * @property \Carbon\Carbon|null $updated_at
- * @property-read \App\Models\Airport $airport
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Airport\Procedure[] $procedures
+ * @property-read Airport $airport
+ * @property-read \Illuminate\Database\Eloquent\Collection|Procedure[] $procedures
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Airport\Runway whereAirportId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Airport\Runway whereCreatedAt($value)
diff --git a/app/Models/Contact.php b/app/Models/Contact.php
index d9070dd1f3..902d7b1f18 100644
--- a/app/Models/Contact.php
+++ b/app/Models/Contact.php
@@ -11,7 +11,7 @@
  * @property string $key
  * @property string $name
  * @property string $email
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
+ * @property-read \Illuminate\Database\Eloquent\Collection|Sys\Data\Change[] $dataChanges
  * @property-read \Illuminate\Notifications\DatabaseNotificationCollection|\Illuminate\Notifications\DatabaseNotification[] $notifications
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Contact whereEmail($value)
diff --git a/app/Models/Mship/Account.php b/app/Models/Mship/Account.php
index 15f24ca031..ca5743c5b7 100644
--- a/app/Models/Mship/Account.php
+++ b/app/Models/Mship/Account.php
@@ -76,17 +76,17 @@
  * @property \Illuminate\Support\Carbon|null $deleted_at
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Sys\Activity> $activityRecent
  * @property-read int|null $activity_recent_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Mship\Account\Ban> $bans
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Account\Ban> $bans
  * @property-read int|null $bans_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Mship\Account\Ban> $bansAsInstigator
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Account\Ban> $bansAsInstigator
  * @property-read int|null $bans_as_instigator_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \Laravel\Passport\Client> $clients
  * @property-read int|null $clients_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Sys\Data\Change> $dataChanges
  * @property-read int|null $data_changes_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Mship\Account\Endorsement> $endorsements
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Account\Endorsement> $endorsements
  * @property-read int|null $endorsements_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Mship\Feedback\Feedback> $feedback
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Feedback\Feedback> $feedback
  * @property-read int|null $feedback_count
  * @property-read mixed $active_qualifications
  * @property-read mixed $discord_name
@@ -148,21 +148,21 @@
  * @property-read int|null $o_auth_tokens_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Permission> $permissions
  * @property-read int|null $permissions_count
- * @property-read \App\Models\Training\WaitingList\WaitingListAccount $pivot
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Mship\Qualification> $qualifications
+ * @property-read WaitingListAccount $pivot
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Qualification> $qualifications
  * @property-read int|null $qualifications_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Sys\Notification> $readSystemNotifications
  * @property-read int|null $read_system_notifications_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Role> $roles
  * @property-read int|null $roles_count
  * @property-read Roster|null $roster
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Mship\Account\Email> $secondaryEmails
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, Account\Email> $secondaryEmails
  * @property-read int|null $secondary_emails_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Sso\Email> $ssoEmails
  * @property-read int|null $sso_emails_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Mship\State> $states
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, State> $states
  * @property-read int|null $states_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Mship\State> $statesHistory
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, State> $statesHistory
  * @property-read int|null $states_history_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\TeamSpeak\Registration> $teamspeakRegistrations
  * @property-read int|null $teamspeak_registrations_count
@@ -354,19 +354,19 @@ public static function findOrRetrieve($accountId)
 
     public function bansAsInstigator()
     {
-        return $this->hasMany(\App\Models\Mship\Account\Ban::class, 'banned_by')
+        return $this->hasMany(Account\Ban::class, 'banned_by')
             ->orderBy('created_at', 'DESC');
     }
 
     public function notes()
     {
-        return $this->hasMany(\App\Models\Mship\Account\Note::class, 'account_id')
+        return $this->hasMany(AccountNoteData::class, 'account_id')
             ->orderBy('created_at', 'DESC');
     }
 
     public function noteWriter()
     {
-        return $this->hasMany(\App\Models\Mship\Account\Note::class, 'writer_id');
+        return $this->hasMany(AccountNoteData::class, 'writer_id');
     }
 
     public function tokens()
@@ -381,7 +381,7 @@ public function activityRecent()
 
     public function feedback()
     {
-        return $this->hasMany(\App\Models\Mship\Feedback\Feedback::class);
+        return $this->hasMany(Feedback\Feedback::class);
     }
 
     public function addNote($noteType, $noteContent, $writer = null, $attachment = null)
diff --git a/app/Models/Mship/Account/Ban.php b/app/Models/Mship/Account/Ban.php
index 4be89f774f..2a8c413164 100644
--- a/app/Models/Mship/Account/Ban.php
+++ b/app/Models/Mship/Account/Ban.php
@@ -17,11 +17,11 @@
  * @property BanTypeEnum $type
  * @property int|null $reason_id
  * @property string $reason_extra
- * @property \Carbon\Carbon|null $period_start
- * @property \Carbon\Carbon|null $period_finish
- * @property \Carbon\Carbon|null $created_at
- * @property \Carbon\Carbon|null $updated_at
- * @property \Carbon\Carbon|null $repealed_at
+ * @property Carbon|null $period_start
+ * @property Carbon|null $period_finish
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
+ * @property Carbon|null $repealed_at
  * @property-read \App\Models\Mship\Account $account
  * @property-read \App\Models\Mship\Account|null $banner
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
@@ -34,7 +34,7 @@
  * @property-read mixed $period_amount_string
  * @property-read mixed $period_left
  * @property-read mixed $type_string
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Mship\Account\Note[] $notes
+ * @property-read \Illuminate\Database\Eloquent\Collection|Note[] $notes
  * @property-read \App\Models\Mship\Ban\Reason|null $reason
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Mship\Account\Ban isActive()
@@ -90,7 +90,7 @@ public static function scopeIsLocal($query)
 
     public static function scopeIsActive($query)
     {
-        return $query->isNotRepealed()->where(fn ($query) => $query->where('period_finish', '>=', \Carbon\Carbon::now())->orWhereNull('period_finish'));
+        return $query->isNotRepealed()->where(fn ($query) => $query->where('period_finish', '>=', Carbon::now())->orWhereNull('period_finish'));
     }
 
     public static function scopeIsInActive($query)
@@ -100,7 +100,7 @@ public static function scopeIsInActive($query)
 
     public static function scopeIsHistoric($query)
     {
-        return $query->isNotRepealed()->where('period_finish', '<', \Carbon\Carbon::now());
+        return $query->isNotRepealed()->where('period_finish', '<', Carbon::now());
     }
 
     public static function scopeIsRepealed($query)
@@ -130,12 +130,12 @@ public function reason()
 
     public function notes()
     {
-        return $this->morphMany(\App\Models\Mship\Account\Note::class, 'attachment');
+        return $this->morphMany(Note::class, 'attachment');
     }
 
     public function repeal()
     {
-        $this->repealed_at = \Carbon\Carbon::now();
+        $this->repealed_at = Carbon::now();
         $this->save();
         event(new BanUpdated($this));
     }
@@ -159,7 +159,7 @@ public function getIsActiveAttribute()
     {
         $period_start = $this->period_start;
         $period_finish = $this->period_finish;
-        $now = \Carbon\Carbon::now();
+        $now = Carbon::now();
 
         return ! $this->is_repealed && (! $period_finish || $now->between($period_start, $period_finish));
     }
diff --git a/app/Models/Mship/Account/Email.php b/app/Models/Mship/Account/Email.php
index 839f5d3f12..2a19a8d577 100644
--- a/app/Models/Mship/Account/Email.php
+++ b/app/Models/Mship/Account/Email.php
@@ -15,14 +15,14 @@
  * @property int $id
  * @property string $email
  * @property int $account_id
- * @property \Carbon\Carbon|null $verified_at
- * @property \Carbon\Carbon|null $created_at
- * @property \Carbon\Carbon|null $updated_at
+ * @property Carbon|null $verified_at
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
  * @property-read \App\Models\Mship\Account $account
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
  * @property-read mixed $is_verified
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sso\Email[] $ssoEmails
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Token[] $tokens
+ * @property-read \Illuminate\Database\Eloquent\Collection|SSOEmail[] $ssoEmails
+ * @property-read \Illuminate\Database\Eloquent\Collection|Token[] $tokens
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Mship\Account\Email emailMatches($email)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Mship\Account\Email verified()
@@ -66,12 +66,12 @@ public function account()
 
     public function tokens()
     {
-        return $this->morphMany(\App\Models\Sys\Token::class, 'related');
+        return $this->morphMany(Token::class, 'related');
     }
 
     public function ssoEmails()
     {
-        return $this->hasMany(\App\Models\Sso\Email::class, 'account_email_id');
+        return $this->hasMany(SSOEmail::class, 'account_email_id');
     }
 
     public function assignToSso($ssoAccount)
diff --git a/app/Models/Mship/Concerns/HasBans.php b/app/Models/Mship/Concerns/HasBans.php
index e0f9edc66a..0aa44bb4e5 100644
--- a/app/Models/Mship/Concerns/HasBans.php
+++ b/app/Models/Mship/Concerns/HasBans.php
@@ -27,7 +27,7 @@ public function scopeNotBanned(Builder $query)
 
     public function bans()
     {
-        return $this->hasMany(\App\Models\Mship\Account\Ban::class, 'account_id')->orderBy(
+        return $this->hasMany(Ban::class, 'account_id')->orderBy(
             'created_at',
             'DESC'
         );
@@ -100,7 +100,7 @@ public function getNetworkBanAttribute()
     public function addNetworkBan($reason = 'Network ban discovered.')
     {
         if ($this->is_network_banned === false) {
-            $ban = new \App\Models\Mship\Account\Ban;
+            $ban = new Ban;
             $ban->type = BanTypeEnum::Network;
             $ban->reason_extra = $reason;
             $ban->period_start = Carbon::now();
diff --git a/app/Models/Mship/Concerns/HasEmails.php b/app/Models/Mship/Concerns/HasEmails.php
index 66eb5dbf2f..6b69bbd9f7 100644
--- a/app/Models/Mship/Concerns/HasEmails.php
+++ b/app/Models/Mship/Concerns/HasEmails.php
@@ -16,7 +16,7 @@ trait HasEmails
      */
     public function secondaryEmails()
     {
-        return $this->hasMany(\App\Models\Mship\Account\Email::class, 'account_id');
+        return $this->hasMany(AccountEmail::class, 'account_id');
     }
 
     public function ssoEmails()
diff --git a/app/Models/Mship/Concerns/HasNotifications.php b/app/Models/Mship/Concerns/HasNotifications.php
index ceaaca52f8..d465cfda60 100644
--- a/app/Models/Mship/Concerns/HasNotifications.php
+++ b/app/Models/Mship/Concerns/HasNotifications.php
@@ -4,16 +4,17 @@
 
 use App\Models\Sys\Notification as SysNotification;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 trait HasNotifications
 {
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return BelongsToMany
      */
     public function readSystemNotifications()
     {
         return $this->belongsToMany(
-            \App\Models\Sys\Notification::class,
+            SysNotification::class,
             'sys_notification_read',
             'account_id',
             'notification_id'
diff --git a/app/Models/Mship/Concerns/HasStates.php b/app/Models/Mship/Concerns/HasStates.php
index 09f8ff8edb..08ea857a6a 100644
--- a/app/Models/Mship/Concerns/HasStates.php
+++ b/app/Models/Mship/Concerns/HasStates.php
@@ -7,6 +7,7 @@
 use App\Models\Mship\AccountState;
 use App\Models\Mship\State;
 use Carbon\Carbon;
+use Illuminate\Support\Collection;
 
 trait HasStates
 {
@@ -92,7 +93,7 @@ public function getPrimaryPermanentStateAttribute()
     /**
      * Get all temporary states.
      *
-     * @return \Illuminate\Support\Collection
+     * @return Collection
      */
     public function getTemporaryStatesAttribute()
     {
@@ -102,7 +103,7 @@ public function getTemporaryStatesAttribute()
     /**
      * Get all permanent states.
      *
-     * @return \Illuminate\Support\Collection
+     * @return Collection
      */
     public function getPermanentStatesAttribute()
     {
@@ -117,7 +118,7 @@ public function getPermanentStatesAttribute()
      * @param  string|null  $division  Member's division
      * @return mixed
      *
-     * @throws \App\Exceptions\Mship\InvalidStateException
+     * @throws InvalidStateException
      */
     public function addState(State $state, $region = null, $division = null)
     {
diff --git a/app/Models/Mship/Concerns/HasVisitTransferApplications.php b/app/Models/Mship/Concerns/HasVisitTransferApplications.php
index f8e48fea6e..6045b2036a 100644
--- a/app/Models/Mship/Concerns/HasVisitTransferApplications.php
+++ b/app/Models/Mship/Concerns/HasVisitTransferApplications.php
@@ -14,7 +14,7 @@ trait HasVisitTransferApplications
      */
     public function visitTransferApplications()
     {
-        return $this->hasMany(\App\Models\VisitTransfer\Application::class)->orderBy('created_at', 'DESC');
+        return $this->hasMany(Application::class)->orderBy('created_at', 'DESC');
     }
 
     public function visitApplications()
@@ -61,7 +61,7 @@ public function hasOpenVisitingTransferApplication()
         return $this->visitTransferApplications->contains(function ($application, $key) {
             return in_array(
                 $application->status,
-                \App\Models\VisitTransfer\Application::$APPLICATION_IS_CONSIDERED_OPEN
+                Application::$APPLICATION_IS_CONSIDERED_OPEN
             );
         });
     }
diff --git a/app/Models/Mship/Feedback/Answer.php b/app/Models/Mship/Feedback/Answer.php
index 121c2e0551..e2bd435ce9 100644
--- a/app/Models/Mship/Feedback/Answer.php
+++ b/app/Models/Mship/Feedback/Answer.php
@@ -12,8 +12,8 @@
  * @property int $question_id
  * @property string|null $response
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
- * @property-read \App\Models\Mship\Feedback\Feedback $feedback
- * @property-read \App\Models\Mship\Feedback\Question $question
+ * @property-read Feedback $feedback
+ * @property-read Question $question
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Mship\Feedback\Answer notPermanent()
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Mship\Feedback\Answer whereFeedbackId($value)
@@ -49,11 +49,11 @@ public function scopeNotPermanent($query)
 
     public function feedback()
     {
-        return $this->belongsTo(\App\Models\Mship\Feedback\Feedback::class);
+        return $this->belongsTo(Feedback::class);
     }
 
     public function question()
     {
-        return $this->belongsTo(\App\Models\Mship\Feedback\Question::class)->withTrashed();
+        return $this->belongsTo(Question::class)->withTrashed();
     }
 }
diff --git a/app/Models/Mship/Feedback/Feedback.php b/app/Models/Mship/Feedback/Feedback.php
index 74700979a4..2dd14e4e53 100644
--- a/app/Models/Mship/Feedback/Feedback.php
+++ b/app/Models/Mship/Feedback/Feedback.php
@@ -14,22 +14,22 @@
  * @property int $form_id
  * @property int $account_id
  * @property int $submitter_account_id
- * @property \Carbon\Carbon|null $actioned_at
+ * @property Carbon|null $actioned_at
  * @property string|null $actioned_comment
  * @property int|null $actioned_by_id
- * @property \Carbon\Carbon|null $sent_at
+ * @property Carbon|null $sent_at
  * @property string|null $sent_comment
  * @property int|null $sent_by_id
- * @property \Carbon\Carbon|null $created_at
- * @property \Carbon\Carbon|null $updated_at
- * @property \Carbon\Carbon|null $deleted_at
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
+ * @property Carbon|null $deleted_at
  * @property int|null $deleted_by
  * @property-read \App\Models\Mship\Account $account
  * @property-read \App\Models\Mship\Account $actioner
  * @property-read \App\Models\Mship\Account|null $deleter
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Mship\Feedback\Answer[] $answers
+ * @property-read \Illuminate\Database\Eloquent\Collection|Answer[] $answers
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
- * @property-read \App\Models\Mship\Feedback\Form $form
+ * @property-read Form $form
  * @property-read \Illuminate\Notifications\DatabaseNotificationCollection|\Illuminate\Notifications\DatabaseNotification[] $notifications
  * @property-read \App\Models\Mship\Account $submitter
  *
@@ -104,7 +104,7 @@ public function scopeSent($query)
 
     public function form()
     {
-        return $this->belongsTo(\App\Models\Mship\Feedback\Form::class);
+        return $this->belongsTo(Form::class);
     }
 
     public function questions()
@@ -114,12 +114,12 @@ public function questions()
 
     public function answers()
     {
-        return $this->hasMany(\App\Models\Mship\Feedback\Answer::class);
+        return $this->hasMany(Answer::class);
     }
 
     public function position()
     {
-        return $this->hasOne(\App\Models\Mship\Feedback\Answer::class)->whereHas('question', function ($query) {
+        return $this->hasOne(Answer::class)->whereHas('question', function ($query) {
             $query->where('slug', ['callsign3', 'sessionposition2']);
         });
     }
diff --git a/app/Models/Mship/Feedback/Form.php b/app/Models/Mship/Feedback/Form.php
index ea632832e0..b83db1e0d8 100644
--- a/app/Models/Mship/Feedback/Form.php
+++ b/app/Models/Mship/Feedback/Form.php
@@ -19,10 +19,10 @@
  * @property \Carbon\Carbon|null $created_at
  * @property \Carbon\Carbon|null $updated_at
  * @property \Carbon\Carbon|null $deleted_at
- * @property-read \App\Models\Contact|null $contact
+ * @property-read Contact|null $contact
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Mship\Feedback\Feedback[] $feedback
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Mship\Feedback\Question[] $questions
+ * @property-read \Illuminate\Database\Eloquent\Collection|Feedback[] $feedback
+ * @property-read \Illuminate\Database\Eloquent\Collection|Question[] $questions
  *
  * @method static bool|null forceDelete()
  * @method static \Illuminate\Database\Query\Builder|\App\Models\Mship\Feedback\Form onlyTrashed()
@@ -72,12 +72,12 @@ public function getRouteKeyName()
 
     public function questions()
     {
-        return $this->hasMany(\App\Models\Mship\Feedback\Question::class);
+        return $this->hasMany(Question::class);
     }
 
     public function feedback()
     {
-        return $this->hasMany(\App\Models\Mship\Feedback\Feedback::class);
+        return $this->hasMany(Feedback::class);
     }
 
     public function contact()
diff --git a/app/Models/Mship/Feedback/Question.php b/app/Models/Mship/Feedback/Question.php
index fc1711486c..b500eef39e 100644
--- a/app/Models/Mship/Feedback/Question.php
+++ b/app/Models/Mship/Feedback/Question.php
@@ -20,10 +20,10 @@
  * @property \Carbon\Carbon|null $created_at
  * @property \Carbon\Carbon|null $updated_at
  * @property string|null $deleted_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Mship\Feedback\Answer[] $answers
+ * @property-read \Illuminate\Database\Eloquent\Collection|Answer[] $answers
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
- * @property-read \App\Models\Mship\Feedback\Form $form
- * @property-read \App\Models\Mship\Feedback\Question\Type $type
+ * @property-read Form $form
+ * @property-read Question\Type $type
  *
  * @method static bool|null forceDelete()
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Mship\Feedback\Question notActioned()
@@ -81,17 +81,17 @@ public function scopeNotActioned($query)
 
     public function form()
     {
-        return $this->belongsTo(\App\Models\Mship\Feedback\Form::class);
+        return $this->belongsTo(Form::class);
     }
 
     public function answers()
     {
-        return $this->hasMany(\App\Models\Mship\Feedback\Answer::class);
+        return $this->hasMany(Answer::class);
     }
 
     public function type()
     {
-        return $this->belongsTo(\App\Models\Mship\Feedback\Question\Type::class);
+        return $this->belongsTo(Question\Type::class);
     }
 
     public function optionValues()
diff --git a/app/Models/Mship/Qualification.php b/app/Models/Mship/Qualification.php
index e587466f5b..cf08439b43 100644
--- a/app/Models/Mship/Qualification.php
+++ b/app/Models/Mship/Qualification.php
@@ -17,7 +17,7 @@
  * @property string $name_long
  * @property string $name_grp
  * @property int $vatsim
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Mship\Account[] $account
+ * @property-read \Illuminate\Database\Eloquent\Collection|Account[] $account
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
  * @property-read mixed $is_c1
  * @property-read mixed $is_c3
diff --git a/app/Models/Mship/State.php b/app/Models/Mship/State.php
index ef924a2d65..add9d658f4 100644
--- a/app/Models/Mship/State.php
+++ b/app/Models/Mship/State.php
@@ -15,7 +15,7 @@
  * @property int $priority
  * @property \Carbon\Carbon|null $created_at
  * @property \Carbon\Carbon|null $updated_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Mship\Account[] $account
+ * @property-read \Illuminate\Database\Eloquent\Collection|Account[] $account
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
  * @property-read mixed $is_division
  * @property-read mixed $is_permanent
diff --git a/app/Models/Sys/Activity.php b/app/Models/Sys/Activity.php
index 123eb3b7e2..59cb136eef 100644
--- a/app/Models/Sys/Activity.php
+++ b/app/Models/Sys/Activity.php
@@ -17,7 +17,7 @@
  * @property string $ip
  * @property \Carbon\Carbon|null $created_at
  * @property-read \App\Models\Mship\Account|null $actor
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
+ * @property-read \Illuminate\Database\Eloquent\Collection|Data\Change[] $dataChanges
  * @property-read mixed $extra_data
  * @property-read mixed $type
  * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $subject
diff --git a/app/Models/Sys/Data/Change.php b/app/Models/Sys/Data/Change.php
index a88155d9f3..c6b216816e 100644
--- a/app/Models/Sys/Data/Change.php
+++ b/app/Models/Sys/Data/Change.php
@@ -15,7 +15,7 @@
  * @property string|null $data_old
  * @property string|null $data_new
  * @property \Carbon\Carbon|null $created_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
+ * @property-read \Illuminate\Database\Eloquent\Collection|Change[] $dataChanges
  * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $model
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sys\Data\Change whereCreatedAt($value)
diff --git a/app/Models/Sys/Notification.php b/app/Models/Sys/Notification.php
index f5a334e556..3f66a16750 100644
--- a/app/Models/Sys/Notification.php
+++ b/app/Models/Sys/Notification.php
@@ -14,7 +14,7 @@
  * @property \Carbon\Carbon|null $created_at
  * @property \Carbon\Carbon|null $updated_at
  * @property \Carbon\Carbon|null $effective_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
+ * @property-read \Illuminate\Database\Eloquent\Collection|Data\Change[] $dataChanges
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Mship\Account[] $readBy
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Sys\Notification general()
diff --git a/app/Models/Sys/Token.php b/app/Models/Sys/Token.php
index 6aad78de3d..f2e59fbc47 100644
--- a/app/Models/Sys/Token.php
+++ b/app/Models/Sys/Token.php
@@ -18,7 +18,7 @@
  * @property \Carbon\Carbon|null $expires_at
  * @property \Carbon\Carbon|null $used_at
  * @property \Carbon\Carbon|null $deleted_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
+ * @property-read \Illuminate\Database\Eloquent\Collection|Data\Change[] $dataChanges
  * @property-read mixed $display_value
  * @property-read mixed $is_expired
  * @property-read mixed $is_used
diff --git a/app/Models/TeamSpeak/Channel.php b/app/Models/TeamSpeak/Channel.php
index 2139cb68cd..d32699459f 100644
--- a/app/Models/TeamSpeak/Channel.php
+++ b/app/Models/TeamSpeak/Channel.php
@@ -11,9 +11,9 @@
  * @property int|null $parent_id
  * @property string $name
  * @property bool $protected
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\TeamSpeak\Channel[] $children
+ * @property-read \Illuminate\Database\Eloquent\Collection|Channel[] $children
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
- * @property-read \App\Models\TeamSpeak\Channel|null $parent
+ * @property-read Channel|null $parent
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TeamSpeak\Channel whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TeamSpeak\Channel whereName($value)
diff --git a/app/Models/TeamSpeak/Confirmation.php b/app/Models/TeamSpeak/Confirmation.php
index 00c14780bf..6835bcd908 100644
--- a/app/Models/TeamSpeak/Confirmation.php
+++ b/app/Models/TeamSpeak/Confirmation.php
@@ -12,7 +12,7 @@
  * @property \Carbon\Carbon|null $created_at
  * @property \Carbon\Carbon|null $updated_at
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
- * @property-read \App\Models\TeamSpeak\Registration $registration
+ * @property-read Registration $registration
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TeamSpeak\Confirmation whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TeamSpeak\Confirmation wherePrivilegeKey($value)
diff --git a/app/Models/TeamSpeak/Group.php b/app/Models/TeamSpeak/Group.php
index 7f7de3a6a1..4e80b62a22 100644
--- a/app/Models/TeamSpeak/Group.php
+++ b/app/Models/TeamSpeak/Group.php
@@ -19,7 +19,7 @@
  * @property int|null $qualification_id
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
  * @property-read \App\Models\Mship\Permission|null $permission
- * @property-read \App\Models\Mship\Qualification|null $qualification
+ * @property-read Qualification|null $qualification
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TeamSpeak\Group whereDbid($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\TeamSpeak\Group whereDefault($value)
diff --git a/app/Models/TeamSpeak/Registration.php b/app/Models/TeamSpeak/Registration.php
index 8be4862a72..c44a661795 100644
--- a/app/Models/TeamSpeak/Registration.php
+++ b/app/Models/TeamSpeak/Registration.php
@@ -23,8 +23,8 @@
  * @property \Carbon\Carbon|null $created_at
  * @property \Carbon\Carbon|null $updated_at
  * @property string|null $deleted_at
- * @property-read \App\Models\Mship\Account $account
- * @property-read \App\Models\TeamSpeak\Confirmation $confirmation
+ * @property-read Account $account
+ * @property-read Confirmation $confirmation
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
  *
  * @method static bool|null forceDelete()
@@ -62,7 +62,7 @@ class Registration extends Model
 
     public function delete($tscon = null)
     {
-        if (Teamspeak::enabled()) {
+        if (TeamSpeak::enabled()) {
             if ($tscon == null) {
                 $tscon = TeamSpeak::run('VATSIM UK Registrations');
             }
diff --git a/app/Models/Training/WaitingList.php b/app/Models/Training/WaitingList.php
index fc9e040014..7665f4ffb4 100644
--- a/app/Models/Training/WaitingList.php
+++ b/app/Models/Training/WaitingList.php
@@ -123,7 +123,7 @@ protected static function boot()
     /**
      * A Waiting List can be managed by many Staff Members (Accounts).
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return BelongsToMany
      */
     public function staff()
     {
@@ -151,7 +151,7 @@ public function waitingListAccounts(): HasMany
     /**
      * One WaitingList can have many flags associated with it.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return HasMany
      */
     public function flags()
     {
diff --git a/app/Models/Training/WaitingList/WaitingListAccount.php b/app/Models/Training/WaitingList/WaitingListAccount.php
index 03cb5f48c9..c1052ead64 100644
--- a/app/Models/Training/WaitingList/WaitingListAccount.php
+++ b/app/Models/Training/WaitingList/WaitingListAccount.php
@@ -26,8 +26,8 @@
  * @property \Illuminate\Support\Carbon|null $deleted_at
  * @property array|null $flags_status_summary
  * @property-read Account|null $account
- * @property-read \App\Models\Training\WaitingList\WaitingListAccountFlag $pivot
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Training\WaitingList\WaitingListFlag> $flags
+ * @property-read WaitingListAccountFlag $pivot
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, WaitingListFlag> $flags
  * @property-read int|null $flags_count
  * @property-read mixed $atc_hour_check
  * @property-read mixed $position
@@ -51,7 +51,7 @@
  * @method static \Illuminate\Database\Eloquent\Builder|WaitingListAccount withoutTrashed()
  *
  * @property int|null $removed_by
- * @property \App\Models\Training\WaitingList\RemovalReason|null $removal_type
+ * @property RemovalReason|null $removal_type
  * @property string|null $removal_comment
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Sys\Data\Change> $dataChanges
  * @property-read int|null $data_changes_count
diff --git a/app/Models/VisitTransfer/Application.php b/app/Models/VisitTransfer/Application.php
index 1f25baf509..384c1e005e 100644
--- a/app/Models/VisitTransfer/Application.php
+++ b/app/Models/VisitTransfer/Application.php
@@ -51,14 +51,14 @@
  * @property string|null $statement
  * @property int $status
  * @property string|null $status_note
- * @property \Carbon\Carbon|null $expires_at
- * @property \Carbon\Carbon|null $submitted_at
- * @property \Carbon\Carbon|null $created_at
- * @property \Carbon\Carbon|null $updated_at
+ * @property Carbon|null $expires_at
+ * @property Carbon|null $submitted_at
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
  * @property string|null $deleted_at
- * @property-read \App\Models\Mship\Account $account
+ * @property-read Account $account
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
- * @property-read \App\Models\VisitTransfer\Facility|null $facility
+ * @property-read Facility|null $facility
  * @property-read mixed $facility_name
  * @property-read mixed $is_accepted
  * @property-read mixed $is_atc
@@ -81,7 +81,7 @@
  * @property-read mixed $requires_action
  * @property-read mixed $status_string
  * @property-read mixed $type_string
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Mship\Account\Note[] $notes
+ * @property-read \Illuminate\Database\Eloquent\Collection|Account\Note[] $notes
  *
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\VisitTransfer\Application closed()
  * @method static bool|null forceDelete()
@@ -226,7 +226,7 @@ class Application extends Model
 
     public function __construct(array $attributes = [])
     {
-        $attributes['expires_at'] = \Carbon\Carbon::now()->addHour();
+        $attributes['expires_at'] = Carbon::now()->addHour();
 
         parent::__construct($attributes);
     }
@@ -290,17 +290,17 @@ public static function scopeUnderReview($query)
     /** All Laravel relationships */
     public function account()
     {
-        return $this->belongsTo(\App\Models\Mship\Account::class, 'account_id', 'id');
+        return $this->belongsTo(Account::class, 'account_id', 'id');
     }
 
     public function facility()
     {
-        return $this->belongsTo(\App\Models\VisitTransfer\Facility::class);
+        return $this->belongsTo(Facility::class);
     }
 
     public function notes()
     {
-        return $this->morphMany(\App\Models\Mship\Account\Note::class, 'attachment');
+        return $this->morphMany(Account\Note::class, 'attachment');
     }
 
     /** All Laravel magic attributes **/
diff --git a/app/Models/VisitTransfer/Facility.php b/app/Models/VisitTransfer/Facility.php
index 1672e711a1..2b3882bac7 100644
--- a/app/Models/VisitTransfer/Facility.php
+++ b/app/Models/VisitTransfer/Facility.php
@@ -27,9 +27,9 @@
  * @property int $open
  * @property int $public
  * @property string|null $deleted_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\VisitTransfer\Application[] $applications
+ * @property-read \Illuminate\Database\Eloquent\Collection|Application[] $applications
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Sys\Data\Change[] $dataChanges
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\VisitTransfer\Facility\Email[] $emails
+ * @property-read \Illuminate\Database\Eloquent\Collection|Facility\Email[] $emails
  * @property-read string $public_id
  * @property-read \Illuminate\Notifications\DatabaseNotificationCollection|\Illuminate\Notifications\DatabaseNotification[] $notifications
  *
@@ -244,7 +244,7 @@ public function scopeHasTrainingSpace($query)
 
     public function applications()
     {
-        return $this->hasMany(\App\Models\VisitTransfer\Application::class);
+        return $this->hasMany(Application::class);
     }
 
     public function emails()
diff --git a/app/Notifications/ApplicationAccepted.php b/app/Notifications/ApplicationAccepted.php
index d75fafcfc7..5d1cf22487 100644
--- a/app/Notifications/ApplicationAccepted.php
+++ b/app/Notifications/ApplicationAccepted.php
@@ -40,7 +40,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/ApplicationReview.php b/app/Notifications/ApplicationReview.php
index d9906c7a7b..96db0085f5 100644
--- a/app/Notifications/ApplicationReview.php
+++ b/app/Notifications/ApplicationReview.php
@@ -40,7 +40,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/ApplicationStatusChanged.php b/app/Notifications/ApplicationStatusChanged.php
index 1fedfba8b2..e44afdac2d 100644
--- a/app/Notifications/ApplicationStatusChanged.php
+++ b/app/Notifications/ApplicationStatusChanged.php
@@ -40,7 +40,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/Mship/BanCreated.php b/app/Notifications/Mship/BanCreated.php
index 7906bc145b..747b09f68e 100644
--- a/app/Notifications/Mship/BanCreated.php
+++ b/app/Notifications/Mship/BanCreated.php
@@ -45,7 +45,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/Mship/BanModified.php b/app/Notifications/Mship/BanModified.php
index 0d9cd7c23f..6968669b9e 100644
--- a/app/Notifications/Mship/BanModified.php
+++ b/app/Notifications/Mship/BanModified.php
@@ -45,7 +45,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/Mship/BanRepealed.php b/app/Notifications/Mship/BanRepealed.php
index 93818f14af..ee69b003cf 100644
--- a/app/Notifications/Mship/BanRepealed.php
+++ b/app/Notifications/Mship/BanRepealed.php
@@ -45,7 +45,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/Mship/DiscordInvite.php b/app/Notifications/Mship/DiscordInvite.php
index 23a025ca60..d470640ac3 100644
--- a/app/Notifications/Mship/DiscordInvite.php
+++ b/app/Notifications/Mship/DiscordInvite.php
@@ -28,7 +28,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/Mship/FeedbackReceived.php b/app/Notifications/Mship/FeedbackReceived.php
index 265246468f..1e03b43821 100644
--- a/app/Notifications/Mship/FeedbackReceived.php
+++ b/app/Notifications/Mship/FeedbackReceived.php
@@ -41,7 +41,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/Mship/FeedbackSummary.php b/app/Notifications/Mship/FeedbackSummary.php
index 50417bcf5e..146ca2302f 100644
--- a/app/Notifications/Mship/FeedbackSummary.php
+++ b/app/Notifications/Mship/FeedbackSummary.php
@@ -45,7 +45,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/Mship/ForgottenPasswordLink.php b/app/Notifications/Mship/ForgottenPasswordLink.php
index 0731d4fcaf..d95073154d 100644
--- a/app/Notifications/Mship/ForgottenPasswordLink.php
+++ b/app/Notifications/Mship/ForgottenPasswordLink.php
@@ -40,7 +40,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/Mship/S1TrainingOpportunities.php b/app/Notifications/Mship/S1TrainingOpportunities.php
index 7f13977ee0..5f25f86a6c 100644
--- a/app/Notifications/Mship/S1TrainingOpportunities.php
+++ b/app/Notifications/Mship/S1TrainingOpportunities.php
@@ -36,7 +36,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/Mship/UserImpersonated.php b/app/Notifications/Mship/UserImpersonated.php
index 2741735a60..3d084a0401 100644
--- a/app/Notifications/Mship/UserImpersonated.php
+++ b/app/Notifications/Mship/UserImpersonated.php
@@ -54,7 +54,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/Mship/WelcomeMember.php b/app/Notifications/Mship/WelcomeMember.php
index 82a2d74f29..98260216c7 100644
--- a/app/Notifications/Mship/WelcomeMember.php
+++ b/app/Notifications/Mship/WelcomeMember.php
@@ -36,7 +36,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/Roster/RemovedFromRoster.php b/app/Notifications/Roster/RemovedFromRoster.php
index c9909a1ebf..5335aa1428 100644
--- a/app/Notifications/Roster/RemovedFromRoster.php
+++ b/app/Notifications/Roster/RemovedFromRoster.php
@@ -26,7 +26,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/Training/AvailabilityWarningCreated.php b/app/Notifications/Training/AvailabilityWarningCreated.php
index 147472128a..f2e8aca932 100644
--- a/app/Notifications/Training/AvailabilityWarningCreated.php
+++ b/app/Notifications/Training/AvailabilityWarningCreated.php
@@ -36,7 +36,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/Training/RemovedFromWaitingListFailedRetention.php b/app/Notifications/Training/RemovedFromWaitingListFailedRetention.php
index d31170b316..53c6ab2bb5 100644
--- a/app/Notifications/Training/RemovedFromWaitingListFailedRetention.php
+++ b/app/Notifications/Training/RemovedFromWaitingListFailedRetention.php
@@ -32,7 +32,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/Training/RemovedFromWaitingListInactiveAccount.php b/app/Notifications/Training/RemovedFromWaitingListInactiveAccount.php
index 8d27b56c01..e866d34598 100644
--- a/app/Notifications/Training/RemovedFromWaitingListInactiveAccount.php
+++ b/app/Notifications/Training/RemovedFromWaitingListInactiveAccount.php
@@ -36,7 +36,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/Training/RemovedFromWaitingListNonHomeMember.php b/app/Notifications/Training/RemovedFromWaitingListNonHomeMember.php
index 3caa7b3eae..288aa1fdbb 100644
--- a/app/Notifications/Training/RemovedFromWaitingListNonHomeMember.php
+++ b/app/Notifications/Training/RemovedFromWaitingListNonHomeMember.php
@@ -36,7 +36,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Notifications/Training/WaitingListRetentionCheckAccountNotification.php b/app/Notifications/Training/WaitingListRetentionCheckAccountNotification.php
index 562bc743a9..8ca47aa90c 100644
--- a/app/Notifications/Training/WaitingListRetentionCheckAccountNotification.php
+++ b/app/Notifications/Training/WaitingListRetentionCheckAccountNotification.php
@@ -37,7 +37,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {
diff --git a/app/Policies/AccountPolicy.php b/app/Policies/AccountPolicy.php
index bd68c807ac..abf5ecd11c 100644
--- a/app/Policies/AccountPolicy.php
+++ b/app/Policies/AccountPolicy.php
@@ -4,6 +4,7 @@
 
 use App\Models\Mship\Account;
 use Illuminate\Auth\Access\HandlesAuthorization;
+use Illuminate\Auth\Access\Response;
 
 class AccountPolicy
 {
@@ -12,8 +13,8 @@ class AccountPolicy
     /**
      * Determine whether the user can view any models.
      *
-     * @param  \App\Models\Mship\Account  $account
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @param  Account  $account
+     * @return Response|bool
      */
     public function viewAny(Account $actor)
     {
@@ -28,9 +29,9 @@ public function syncDiscord(Account $actor)
     /**
      * Determine whether the user can view the model.
      *
-     * @param  \App\Models\Mship\Account  $account
-     * @param  \App\Models\Mship\Account  $account
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @param  Account  $account
+     * @param  Account  $account
+     * @return Response|bool
      */
     public function view(Account $actor, Account $subject)
     {
@@ -40,9 +41,9 @@ public function view(Account $actor, Account $subject)
     /**
      * Determine whether the user can view sensitive information on the model.
      *
-     * @param  \App\Models\Mship\Account  $account
-     * @param  \App\Models\Mship\Account  $account
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @param  Account  $account
+     * @param  Account  $account
+     * @return Response|bool
      */
     public function viewSensitive(Account $actor, Account $subject)
     {
@@ -52,8 +53,8 @@ public function viewSensitive(Account $actor, Account $subject)
     /**
      * Determine whether the user can create models.
      *
-     * @param  \App\Models\Mship\Account  $account
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @param  Account  $account
+     * @return Response|bool
      */
     public function create(Account $actor)
     {
@@ -63,9 +64,9 @@ public function create(Account $actor)
     /**
      * Determine whether the user can update the model.
      *
-     * @param  \App\Models\Mship\Account  $account
-     * @param  \App\Models\Mship\Account  $account
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @param  Account  $account
+     * @param  Account  $account
+     * @return Response|bool
      */
     public function update(Account $actor, Account $subject)
     {
@@ -95,9 +96,9 @@ public function unlinkDiscordAccount(Account $actor, Account $subject)
     /**
      * Determine whether the user can delete the model.
      *
-     * @param  \App\Models\Mship\Account  $account
-     * @param  \App\Models\Mship\Account  $account
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @param  Account  $account
+     * @param  Account  $account
+     * @return Response|bool
      */
     public function delete(Account $actor, Account $subject)
     {
@@ -107,9 +108,9 @@ public function delete(Account $actor, Account $subject)
     /**
      * Determine whether the user can restore the model.
      *
-     * @param  \App\Models\Mship\Account  $account
-     * @param  \App\Models\Mship\Account  $account
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @param  Account  $account
+     * @param  Account  $account
+     * @return Response|bool
      */
     public function restore(Account $actor, Account $subject)
     {
@@ -119,9 +120,9 @@ public function restore(Account $actor, Account $subject)
     /**
      * Determine whether the user can permanently delete the model.
      *
-     * @param  \App\Models\Mship\Account  $account
-     * @param  \App\Models\Mship\Account  $account
-     * @return \Illuminate\Auth\Access\Response|bool
+     * @param  Account  $account
+     * @param  Account  $account
+     * @return Response|bool
      */
     public function forceDelete(Account $actor, Account $subject)
     {
diff --git a/app/helpers.php b/app/helpers.php
index 800279645e..d6b221276f 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -41,7 +41,7 @@ function str_has_numeric($string, $count = 1)
 
 function determine_mship_state_from_vatsim($region, $division)
 {
-    $states = \App\Models\Mship\State::orderBy('priority')->get();
+    $states = App\Models\Mship\State::orderBy('priority')->get();
 
     foreach ($states as $state) {
         $regionMatch = false;
@@ -73,7 +73,7 @@ function determine_mship_state_from_vatsim($region, $division)
         }
     }
 
-    return \App\Models\Mship\State::findByCode('UNKNOWN');
+    return App\Models\Mship\State::findByCode('UNKNOWN');
 }
 
 function format_name($name)
@@ -100,7 +100,7 @@ function is_date_string($suspectedDateString)
 function is_relative_date_string($suspectedRelativeDateString)
 {
     try {
-        \Carbon\Carbon::parse($suspectedRelativeDateString, 'UTC');
+        Carbon\Carbon::parse($suspectedRelativeDateString, 'UTC');
 
         return true;
     } catch (Exception $e) {
@@ -114,12 +114,12 @@ function human_diff_string(Carbon\Carbon $ts1, Carbon\Carbon $ts2, $absolute = f
         return 'unknown length';
     }
 
-    $min = \Carbon\Carbon::parse('0001-01-01 00:00:00');
-    $max = \Carbon\Carbon::parse('9999-12-31 23:59:59');
+    $min = Carbon\Carbon::parse('0001-01-01 00:00:00');
+    $max = Carbon\Carbon::parse('9999-12-31 23:59:59');
     if ($ts2 < $min || $ts2 > $max) {
-        throw new \Carbon\Exceptions\InvalidDateException('Date outside range', $ts2);
+        throw new Carbon\Exceptions\InvalidDateException('Date outside range', $ts2);
     } elseif ($ts1 < $min || $ts1 > $max) {
-        throw new \Carbon\Exceptions\InvalidDateException('Date outside range', $ts1);
+        throw new Carbon\Exceptions\InvalidDateException('Date outside range', $ts1);
     }
 
     $diff = $ts1->diff($ts2, $absolute);
@@ -214,6 +214,6 @@ function handleService(App\Services\BaseService $service)
 if (! function_exists('str_contains')) {
     function str_contains($haystack, $needle)
     {
-        return \Illuminate\Support\Str::contains($haystack, $needle);
+        return Illuminate\Support\Str::contains($haystack, $needle);
     }
 }
diff --git a/config/database.php b/config/database.php
index 11c323a5ce..6f1e633950 100644
--- a/config/database.php
+++ b/config/database.php
@@ -80,7 +80,7 @@
             'strict' => true,
             'engine' => null,
             'options' => [
-                \PDO::ATTR_EMULATE_PREPARES => true,
+                PDO::ATTR_EMULATE_PREPARES => true,
             ],
         ],
 
diff --git a/config/markdown.php b/config/markdown.php
index 25b945c842..b9016321b8 100644
--- a/config/markdown.php
+++ b/config/markdown.php
@@ -15,5 +15,5 @@
     ],
     'html_input' => 'strip',
     'max_nesting_level' => 100,
-    'renderer_class' => \App\Services\Markdown\CustomMarkdownRenderer::class,
+    'renderer_class' => App\Services\Markdown\CustomMarkdownRenderer::class,
 ];
diff --git a/database/factories/Airport/NavaidFactory.php b/database/factories/Airport/NavaidFactory.php
index bf203415e4..f7792d2bd0 100644
--- a/database/factories/Airport/NavaidFactory.php
+++ b/database/factories/Airport/NavaidFactory.php
@@ -2,10 +2,10 @@
 
 use Faker\Generator as Faker;
 
-$factory->define(\App\Models\Airport\Navaid::class, function (Faker $faker) {
+$factory->define(App\Models\Airport\Navaid::class, function (Faker $faker) {
     return [
         'airport_id' => function () {
-            return factory(\App\Models\Airport::class)->create()->id;
+            return factory(App\Models\Airport::class)->create()->id;
         },
         'type' => $faker->numberBetween(1, 6),
         'name' => $faker->optional(0.5)->passthrough('RWY'.$faker->numberBetween(1, 36)),
diff --git a/database/factories/Airport/ProcedureFactory.php b/database/factories/Airport/ProcedureFactory.php
index e95597fb48..13968243c5 100644
--- a/database/factories/Airport/ProcedureFactory.php
+++ b/database/factories/Airport/ProcedureFactory.php
@@ -2,15 +2,15 @@
 
 use Faker\Generator as Faker;
 
-$factory->define(\App\Models\Airport\Procedure::class, function (Faker $faker) {
-    $airport = factory(\App\Models\Airport::class)->create();
+$factory->define(App\Models\Airport\Procedure::class, function (Faker $faker) {
+    $airport = factory(App\Models\Airport::class)->create();
 
     return [
         'airport_id' => function () use ($airport) {
             return $airport->id;
         },
         'runway_id' => function () use ($airport) {
-            return factory(\App\Models\Airport\Runway::class)->create(['airport_id' => $airport->id])->id;
+            return factory(App\Models\Airport\Runway::class)->create(['airport_id' => $airport->id])->id;
         },
         'type' => $faker->randomElement([1, 2]),
         'ident' => strtoupper($faker->word).$faker->numberBetween(0, 100),
diff --git a/database/factories/Airport/RunwayFactory.php b/database/factories/Airport/RunwayFactory.php
index 1671c193ef..c63504109b 100644
--- a/database/factories/Airport/RunwayFactory.php
+++ b/database/factories/Airport/RunwayFactory.php
@@ -2,10 +2,10 @@
 
 use Faker\Generator as Faker;
 
-$factory->define(\App\Models\Airport\Runway::class, function (Faker $faker) {
+$factory->define(App\Models\Airport\Runway::class, function (Faker $faker) {
     return [
         'airport_id' => function () {
-            return factory(\App\Models\Airport::class)->create()->id;
+            return factory(App\Models\Airport::class)->create()->id;
         },
         'ident' => $faker->numberBetween(0, 3).$faker->numberBetween(0, 9).$faker->optional(0.5)->randomLetter,
         'heading' => $faker->numberBetween(0, 360),
diff --git a/database/factories/ContactFactory.php b/database/factories/ContactFactory.php
index 926257cc52..ca587c577a 100644
--- a/database/factories/ContactFactory.php
+++ b/database/factories/ContactFactory.php
@@ -2,7 +2,7 @@
 
 use Faker\Generator as Faker;
 
-$factory->define(\App\Models\Contact::class, function (Faker $faker) {
+$factory->define(App\Models\Contact::class, function (Faker $faker) {
     return [
         'key' => $faker->word,
         'name' => $faker->words(2),
diff --git a/database/factories/EndorsementFactory.php b/database/factories/EndorsementFactory.php
index 45cd73cf69..ca4b94985d 100644
--- a/database/factories/EndorsementFactory.php
+++ b/database/factories/EndorsementFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-$factory->define(\App\Models\Atc\PositionGroup::class, function ($faker) {
+$factory->define(App\Models\Atc\PositionGroup::class, function ($faker) {
     return [
         'name' => $faker->name,
     ];
 });
 
-$factory->define(\App\Models\Atc\PositionGroupCondition::class, function ($faker) {
+$factory->define(App\Models\Atc\PositionGroupCondition::class, function ($faker) {
     return [
         'position_group_id' => function () {
-            return factory(\App\Models\Atc\PositionGroup::class)->create()->id;
+            return factory(App\Models\Atc\PositionGroup::class)->create()->id;
         },
         'positions' => ['EGLL_%'],
         'required_hours' => $faker->numberBetween(1, 100),
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index 5ef46079bd..c3c228bd01 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-$factory->define(\Spatie\Permission\Models\Role::class, function (Faker\Generator $faker) {
+$factory->define(Spatie\Permission\Models\Role::class, function (Faker\Generator $faker) {
     return [
         'name' => $faker->word,
         'guard_name' => 'web',
@@ -8,14 +8,14 @@
     ];
 });
 
-$factory->define(\Spatie\Permission\Models\Permission::class, function (Faker\Generator $faker) {
+$factory->define(Spatie\Permission\Models\Permission::class, function (Faker\Generator $faker) {
     return [
         'name' => $faker->word,
         'guard_name' => 'web',
     ];
 });
 
-$factory->define(\App\Models\Mship\Permission::class, function (Faker\Generator $faker) {
+$factory->define(App\Models\Mship\Permission::class, function (Faker\Generator $faker) {
     return [
         'name' => $faker->regexify('([A-Z0-9._ ]{1,10}\/){2}testpermission'),
         'display_name' => $faker->text($maxNbChars = 30),
diff --git a/database/factories/Mship/EmailFactory.php b/database/factories/Mship/EmailFactory.php
index 492d5dfb6c..1cf9037f6f 100644
--- a/database/factories/Mship/EmailFactory.php
+++ b/database/factories/Mship/EmailFactory.php
@@ -6,7 +6,7 @@
     return [
         'id' => $faker->numberBetween(1, 100000),
         'account_id' => function () {
-            return \App\Models\Mship\Account::factory()->create()->id;
+            return App\Models\Mship\Account::factory()->create()->id;
         },
         'email' => $faker->email,
         'verified_at' => $faker->dateTime(),
@@ -15,13 +15,13 @@
     ];
 });
 
-$factory->state(\App\Models\Mship\Account\Email::class, 'unverified', function (Faker $faker) {
+$factory->state(App\Models\Mship\Account\Email::class, 'unverified', function (Faker $faker) {
     return [
         'verified_at' => null,
     ];
 });
 
-$factory->state(\App\Models\Mship\Account\Email::class, 'verified', function () {
+$factory->state(App\Models\Mship\Account\Email::class, 'verified', function () {
     return [
         'verified_at' => now(),
     ];
diff --git a/database/factories/Mship/TeamspeakFactory.php b/database/factories/Mship/TeamspeakFactory.php
index 65b37c1347..a3f058db0e 100644
--- a/database/factories/Mship/TeamspeakFactory.php
+++ b/database/factories/Mship/TeamspeakFactory.php
@@ -7,7 +7,7 @@
     ];
 });
 
-$factory->define(\App\Models\TeamSpeak\ServerGroup::class, function (Faker\Generator $faker) {
+$factory->define(App\Models\TeamSpeak\ServerGroup::class, function (Faker\Generator $faker) {
     return [
         'dbid' => $faker->numberBetween(1, 65535),
         'name' => $faker->text($maxNbChars = 30),
@@ -15,7 +15,7 @@
     ];
 });
 
-$factory->define(\App\Models\TeamSpeak\ChannelGroup::class, function (Faker\Generator $faker) {
+$factory->define(App\Models\TeamSpeak\ChannelGroup::class, function (Faker\Generator $faker) {
     return [
         'dbid' => $faker->numberBetween(1, 65535),
         'name' => $faker->text($maxNbChars = 30),
@@ -23,16 +23,16 @@
     ];
 });
 
-$factory->define(\App\Models\TeamSpeak\Registration::class, function (Faker\Generator $faker) {
+$factory->define(App\Models\TeamSpeak\Registration::class, function (Faker\Generator $faker) {
     return [
         'account_id' => function () {
-            return \App\Models\Mship\Account::factory()->create();
+            return App\Models\Mship\Account::factory()->create();
         },
         'registration_ip' => $faker->ipv4,
         'last_ip' => $faker->ipv4,
         'last_login' => $faker->dateTime,
         'last_os' => $faker->randomElement(['Windows', 'OSX', 'Linux', 'iOS', 'Android']),
-        'created_at' => \Carbon\Carbon::now(),
-        'updated_at' => \Carbon\Carbon::now(),
+        'created_at' => Carbon\Carbon::now(),
+        'updated_at' => Carbon\Carbon::now(),
     ];
 });
diff --git a/database/factories/NetworkDataFactory.php b/database/factories/NetworkDataFactory.php
index 07373b0a29..b3ee8cb251 100644
--- a/database/factories/NetworkDataFactory.php
+++ b/database/factories/NetworkDataFactory.php
@@ -4,12 +4,12 @@
 use Carbon\Carbon;
 use Faker\Generator as Faker;
 
-$factory->define(\App\Models\NetworkData\Atc::class, function (Faker $faker) {
+$factory->define(App\Models\NetworkData\Atc::class, function (Faker $faker) {
     $facility = $faker->randomElement([[4, 'TWR'], [3, 'GND'], [2, 'DEL'], [5, 'APP']]);
 
     return [
         'account_id' => function () {
-            return \App\Models\Mship\Account::factory()->create()->id;
+            return App\Models\Mship\Account::factory()->create()->id;
         },
         'callsign' => $faker->randomElement(['EGLL', 'EGKK', 'EGCC', 'EGBB']).'_'.$faker->randomElement(['N', 'S', 'F', '']).'_'.$facility[1],
         'frequency' => $faker->randomFloat(3, 118, 134),
@@ -20,12 +20,12 @@
         },
     ];
 });
-$factory->state(\App\Models\NetworkData\Atc::class, 'offline', function (Faker $faker) {
+$factory->state(App\Models\NetworkData\Atc::class, 'offline', function (Faker $faker) {
     $start = $faker->dateTimeBetween('6 hours ago');
     $end = $faker->dateTimeBetween($start);
 
     return array_merge(
-        factory(\App\Models\NetworkData\Atc::class)->raw(),
+        factory(App\Models\NetworkData\Atc::class)->raw(),
         [
             'connected_at' => $start,
             'disconnected_at' => $faker->dateTimeBetween($start),
diff --git a/database/factories/NotificationFactory.php b/database/factories/NotificationFactory.php
index 9de7ee9712..3925cbc6a0 100644
--- a/database/factories/NotificationFactory.php
+++ b/database/factories/NotificationFactory.php
@@ -2,13 +2,13 @@
 
 use Faker\Generator as Faker;
 
-$factory->define(\App\Models\Sys\Notification::class, function (Faker $faker) {
+$factory->define(App\Models\Sys\Notification::class, function (Faker $faker) {
     return [
         'title' => $faker->word,
         'content' => $faker->text,
-        'status' => \App\Models\Sys\Notification::STATUS_GENERAL,
-        'created_at' => \Carbon\Carbon::now()->subMinute(),
-        'updated_at' => \Carbon\Carbon::now()->subMinute(),
-        'effective_at' => \Carbon\Carbon::now()->subMinute(),
+        'status' => App\Models\Sys\Notification::STATUS_GENERAL,
+        'created_at' => Carbon\Carbon::now()->subMinute(),
+        'updated_at' => Carbon\Carbon::now()->subMinute(),
+        'effective_at' => Carbon\Carbon::now()->subMinute(),
     ];
 });
diff --git a/database/factories/SSO/OauthFactory.php b/database/factories/SSO/OauthFactory.php
index 3125a178c8..0eb0183c1f 100644
--- a/database/factories/SSO/OauthFactory.php
+++ b/database/factories/SSO/OauthFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-$factory->define(\Laravel\Passport\Client::class, function ($faker) {
+$factory->define(Laravel\Passport\Client::class, function ($faker) {
     return [
         'name' => $faker->sentence(2),
         'secret' => $faker->sha256,
@@ -8,20 +8,20 @@
         'personal_access_client' => true,
         'password_client' => true,
         'revoked' => false,
-        'created_at' => \Carbon\Carbon::now(),
-        'updated_at' => \Carbon\Carbon::now(),
+        'created_at' => Carbon\Carbon::now(),
+        'updated_at' => Carbon\Carbon::now(),
     ];
 });
 
-$factory->define(\App\Models\Sso\Email::class, function ($faker) {
+$factory->define(App\Models\Sso\Email::class, function ($faker) {
     return [
         'account_email_id' => function () {
-            return factory(\App\Models\Mship\Account\Email::class)->create()->id;
+            return factory(App\Models\Mship\Account\Email::class)->create()->id;
         },
         'sso_account_id' => function () {
-            return factory(\Laravel\Passport\Client::class)->create()->id;
+            return factory(Laravel\Passport\Client::class)->create()->id;
         },
-        'created_at' => \Carbon\Carbon::now(),
-        'updated_at' => \Carbon\Carbon::now(),
+        'created_at' => Carbon\Carbon::now(),
+        'updated_at' => Carbon\Carbon::now(),
     ];
 });
diff --git a/database/factories/SystemFactory.php b/database/factories/SystemFactory.php
index 2b48fbba7d..59c8e0b2f8 100644
--- a/database/factories/SystemFactory.php
+++ b/database/factories/SystemFactory.php
@@ -4,8 +4,8 @@
     return [
         'title' => $faker->text(75),
         'content' => $faker->paragraph,
-        'status' => \App\Models\Sys\Notification::STATUS_GENERAL,
-        'effective_at' => \Carbon\Carbon::now(),
+        'status' => App\Models\Sys\Notification::STATUS_GENERAL,
+        'effective_at' => Carbon\Carbon::now(),
     ];
 });
 
@@ -13,8 +13,8 @@
     $raw = $factory->raw(App\Models\Sys\Notification::class);
 
     return array_merge($raw, [
-        'status' => \App\Models\Sys\Notification::STATUS_MUST_ACKNOWLEDGE,
-        'effective_at' => \Carbon\Carbon::now(),
+        'status' => App\Models\Sys\Notification::STATUS_MUST_ACKNOWLEDGE,
+        'effective_at' => Carbon\Carbon::now(),
     ]);
 });
 
@@ -22,7 +22,7 @@
     $raw = $factory->raw(App\Models\Sys\Notification::class);
 
     return array_merge($raw, [
-        'status' => \App\Models\Sys\Notification::STATUS_IMPORTANT,
-        'effective_at' => \Carbon\Carbon::now(),
+        'status' => App\Models\Sys\Notification::STATUS_IMPORTANT,
+        'effective_at' => Carbon\Carbon::now(),
     ]);
 });
diff --git a/pint.json b/pint.json
new file mode 100644
index 0000000000..4297c228fb
--- /dev/null
+++ b/pint.json
@@ -0,0 +1,6 @@
+{
+    "preset": "laravel",
+    "rules": {
+        "fully_qualified_strict_types": true
+    }
+}
diff --git a/tests/Feature/MetarTest.php b/tests/Feature/MetarTest.php
index 935e947eda..dbcedde44e 100644
--- a/tests/Feature/MetarTest.php
+++ b/tests/Feature/MetarTest.php
@@ -2,12 +2,12 @@
 
 use Illuminate\Support\Facades\Http;
 
-class MetarTest extends \Tests\TestCase
+class MetarTest extends Tests\TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        \Illuminate\Support\Facades\Cache::flush();
+        Illuminate\Support\Facades\Cache::flush();
     }
 
     public function test_it_returns_metar()
diff --git a/tests/Feature/Roster/ShowTest.php b/tests/Feature/Roster/ShowTest.php
index 7dadf22f1a..a1fb1d2951 100644
--- a/tests/Feature/Roster/ShowTest.php
+++ b/tests/Feature/Roster/ShowTest.php
@@ -17,7 +17,7 @@ public function test_notification_shown_when_position_not_found_in_search()
     {
         $account = Account::factory()->create();
         $qualification = Qualification::code('S2')->first();
-        $account->addState(\App\Models\Mship\State::findByCode('DIVISION'));
+        $account->addState(State::findByCode('DIVISION'));
         $account->addQualification($qualification);
 
         Roster::create([
diff --git a/tests/Feature/SnowTest.php b/tests/Feature/SnowTest.php
index c43f40222c..83a491a494 100644
--- a/tests/Feature/SnowTest.php
+++ b/tests/Feature/SnowTest.php
@@ -2,11 +2,11 @@
 
 use Carbon\Carbon;
 
-class SnowTest extends \Tests\TestCase
+class SnowTest extends Tests\TestCase
 {
     public function test_snow_during_period()
     {
-        \Carbon\Carbon::setTestNow(new Carbon('1st December 2019'));
+        Carbon::setTestNow(new Carbon('1st December 2019'));
 
         $home = $this->get(route('site.home'))
             ->assertOk()
@@ -14,7 +14,7 @@ public function test_snow_during_period()
 
         $this->assertTrue((bool) preg_match('/snow-.*\.js/', $home));
 
-        \Carbon\Carbon::setTestNow(new Carbon('5th January 2019'));
+        Carbon::setTestNow(new Carbon('5th January 2019'));
 
         $main = $this->get(route('site.join'))
             ->assertOk()
@@ -25,7 +25,7 @@ public function test_snow_during_period()
 
     public function test_no_snow_outside_period()
     {
-        \Carbon\Carbon::setTestNow(new Carbon('10th January 2020'));
+        Carbon::setTestNow(new Carbon('10th January 2020'));
 
         $main = $this->get(route('site.home'))
             ->assertOk()
diff --git a/tests/Feature/TrainingPanel/WaitingLists/WaitingListCapacityAdminTest.php b/tests/Feature/TrainingPanel/WaitingLists/WaitingListCapacityAdminTest.php
index a6119747d5..b66f3a2578 100644
--- a/tests/Feature/TrainingPanel/WaitingLists/WaitingListCapacityAdminTest.php
+++ b/tests/Feature/TrainingPanel/WaitingLists/WaitingListCapacityAdminTest.php
@@ -211,8 +211,8 @@ public function it_allows_removing_users_from_capacity_limited_list()
         $this->assertTrue($waitingList->isAtCapacity());
 
         // Remove one user
-        $removal = new \App\Models\Training\WaitingList\Removal(
-            \App\Models\Training\WaitingList\RemovalReason::TrainingPlace,
+        $removal = new WaitingList\Removal(
+            WaitingList\RemovalReason::TrainingPlace,
             $this->privacc->id
         );
         $waitingList->removeFromWaitingList($account1, $removal);
diff --git a/tests/Unit/Training/WaitingList/WaitingListCapacityTest.php b/tests/Unit/Training/WaitingList/WaitingListCapacityTest.php
index 2d7e7523b6..a7ae4a5908 100644
--- a/tests/Unit/Training/WaitingList/WaitingListCapacityTest.php
+++ b/tests/Unit/Training/WaitingList/WaitingListCapacityTest.php
@@ -134,8 +134,8 @@ public function it_can_add_users_after_removing_someone_from_capacity_limited_li
         $this->assertTrue($this->waitingList->isAtCapacity());
 
         // Remove one user
-        $removal = new \App\Models\Training\WaitingList\Removal(
-            \App\Models\Training\WaitingList\RemovalReason::TrainingPlace,
+        $removal = new WaitingList\Removal(
+            WaitingList\RemovalReason::TrainingPlace,
             $this->privacc->id
         );
         $this->waitingList->removeFromWaitingList($account1, $removal);
diff --git a/tests/Unit/UKCPLibraryTest.php b/tests/Unit/UKCPLibraryTest.php
index e8503796d9..50d1f3b833 100644
--- a/tests/Unit/UKCPLibraryTest.php
+++ b/tests/Unit/UKCPLibraryTest.php
@@ -34,7 +34,7 @@ public function it_can_delete_tokens()
 
         $this->mock(Client::class, function (MockInterface $mock) {
             $mock->shouldReceive('delete')
-                ->andReturn(new \GuzzleHttp\Psr7\Response(200, [], true));
+                ->andReturn(new Response(200, [], true));
         })->makePartial();
 
         $ukcp = resolve(UKCP::class);
@@ -55,7 +55,7 @@ public function test_it_caches_sorted_stand_status()
             $mock->shouldReceive('get')
                 ->with('https://ukcp.vatsim.uk/api/stand/status?airfield=EGLL', ['timeout' => 8])
                 ->andReturn(
-                    new \GuzzleHttp\Psr7\Response(200, [], json_encode([
+                    new Response(200, [], json_encode([
                         'refresh_at' => $expiry,
                         'stands' => [
                             [
diff --git a/tests/Unit/VisitTransfer/ApplicationTest.php b/tests/Unit/VisitTransfer/ApplicationTest.php
index 879d62e905..3ea1af5918 100644
--- a/tests/Unit/VisitTransfer/ApplicationTest.php
+++ b/tests/Unit/VisitTransfer/ApplicationTest.php
@@ -242,7 +242,7 @@ public function it_sends_acceptance_email_to_training_team()
 
         $this->user->addState(\App\Models\Mship\State::findByCode('INTERNATIONAL'));
 
-        $facility = \App\Models\VisitTransfer\Facility::factory()->visit('atc')->create();
+        $facility = Facility::factory()->visit('atc')->create();
 
         $application = $this->user->fresh()->createVisitingTransferApplication([
             'type' => Application::TYPE_VISIT,
@@ -342,7 +342,7 @@ public function it_reports_statistics_correctly()
     public function completing_a_pilot_application_removes_visiting_state_if_no_atc_applications_exist()
     {
         $visiting = \App\Models\Mship\State::findByCode('VISITING');
-        $pilotFacility = \App\Models\VisitTransfer\Facility::factory()->visit('pilot')->create();
+        $pilotFacility = Facility::factory()->visit('pilot')->create();
 
         $application = Application::factory()->visit('pilot')->create([
             'account_id' => $this->user->id,
@@ -359,8 +359,8 @@ public function completing_a_pilot_application_removes_visiting_state_if_no_atc_
     public function completing_a_pilot_application_does_not_remove_visiting_state_if_an_atc_application_exists()
     {
         $visiting = \App\Models\Mship\State::findByCode('VISITING');
-        $pilotFacility = \App\Models\VisitTransfer\Facility::factory()->visit('pilot')->create();
-        $atcFacility = \App\Models\VisitTransfer\Facility::factory()->visit('atc')->create();
+        $pilotFacility = Facility::factory()->visit('pilot')->create();
+        $atcFacility = Facility::factory()->visit('atc')->create();
 
         $atcApplication = Application::factory()->visit('atc')->create([
             'account_id' => $this->user->id,