diff --git a/app/Notifications/Messages/PirepPrefiled.php b/app/Notifications/Messages/PirepPrefiled.php
index c150ce92..83f98c54 100644
--- a/app/Notifications/Messages/PirepPrefiled.php
+++ b/app/Notifications/Messages/PirepPrefiled.php
@@ -48,9 +48,9 @@ class PirepPrefiled extends Notification implements ShouldQueue
             return null;
         }
 
-        $title = 'Flight '.$pirep->airline->code.$pirep->ident.' Prefiled';
+        $title = 'Flight '.$pirep->ident.' Prefiled';
         $fields = [
-            'Flight'                => $pirep->airline->code.$pirep->ident,
+            'Flight'                => $pirep->ident,
             'Departure Airport'     => $pirep->dpt_airport_id,
             'Arrival Airport'       => $pirep->arr_airport_id,
             'Equipment'             => $pirep->aircraft->ident,
diff --git a/app/Notifications/Messages/PirepStatusChanged.php b/app/Notifications/Messages/PirepStatusChanged.php
index 7a858e8c..31697c63 100644
--- a/app/Notifications/Messages/PirepStatusChanged.php
+++ b/app/Notifications/Messages/PirepStatusChanged.php
@@ -77,10 +77,10 @@ class PirepStatusChanged extends Notification implements ShouldQueue
             return null;
         }
 
-        $title = 'Flight '.$pirep->airline->code.$pirep->ident.' '.self::$verbs[$pirep->status];
+        $title = 'Flight '.$pirep->ident.' '.self::$verbs[$pirep->status];
 
         $fields = [
-            'Flight'            => $pirep->airline->code.$pirep->ident,
+            'Flight'            => $pirep->ident,
             'Departure Airport' => $pirep->dpt_airport_id,
             'Arrival Airport'   => $pirep->arr_airport_id,
             'Equipment'         => $pirep->aircraft->ident,
diff --git a/app/Notifications/Messages/PirepSubmitted.php b/app/Notifications/Messages/PirepSubmitted.php
index 2a7f942c..9ce8e626 100644
--- a/app/Notifications/Messages/PirepSubmitted.php
+++ b/app/Notifications/Messages/PirepSubmitted.php
@@ -55,9 +55,9 @@ class PirepSubmitted extends Notification implements ShouldQueue
             return null;
         }
 
-        $title = 'Flight '.$pirep->airline->code.$pirep->ident.' Filed';
+        $title = 'Flight '.$pirep->ident.' Filed';
         $fields = [
-            'Flight'                => $pirep->airline->code.$pirep->ident,
+            'Flight'                => $pirep->ident,
             'Departure Airport'     => $pirep->dpt_airport_id,
             'Arrival Airport'       => $pirep->arr_airport_id,
             'Equipment'             => $pirep->aircraft->ident,
diff --git a/resources/views/layouts/default/widgets/live_map.blade.php b/resources/views/layouts/default/widgets/live_map.blade.php
index 06a1d1dc..278ce96f 100644
--- a/resources/views/layouts/default/widgets/live_map.blade.php
+++ b/resources/views/layouts/default/widgets/live_map.blade.php
@@ -90,7 +90,7 @@ and being mindful of the rivets bindings
       </thead>
       <tbody>
       <tr rv-each-pirep="pireps">
-        <td><a href="#top_anchor" rv-on-click="controller.focusMarker">{ pirep.airline.icao }{ pirep.ident}</a></td>
+        <td><a href="#top_anchor" rv-on-click="controller.focusMarker">{ pirep.ident }</a></td>
         {{-- Show the full airport name on hover --}}
         <td><span rv-title="pirep.dpt_airport.name">{ pirep.dpt_airport.icao }</span></td>
         <td><span rv-title="pirep.arr_airport.name">{ pirep.arr_airport.icao }</span></td>