diff --git a/gen/aircraft.py b/gen/aircraft.py
index 788b969d..c9b46436 100644
--- a/gen/aircraft.py
+++ b/gen/aircraft.py
@@ -1039,14 +1039,14 @@ class AircraftConflictGenerator:
         try:
             if flight.start_type == "In Flight":
                 group = self._generate_inflight(
-                    name=namegen.next_unit_name(country, cp.id, flight.unit_type),
+                    name=namegen.next_aircraft_name(country, cp.id, flight),
                     side=country,
                     flight=flight,
                     origin=cp)
             elif isinstance(cp, NavalControlPoint):
                 group_name = cp.get_carrier_group_name()
                 group = self._generate_at_group(
-                    name=namegen.next_unit_name(country, cp.id, flight.unit_type),
+                    name=namegen.next_aircraft_name(country, cp.id, flight),
                     side=country,
                     unit_type=flight.unit_type,
                     count=flight.count,
@@ -1057,8 +1057,8 @@ class AircraftConflictGenerator:
                     raise RuntimeError(
                         f"Attempted to spawn at airfield for non-airfield {cp}")
                 group = self._generate_at_airport(
-                    name=namegen.next_unit_name(country, cp.id,
-                                                flight.unit_type),
+                    name=namegen.next_aircraft_name(country, cp.id,
+                                                flight),
                     side=country,
                     unit_type=flight.unit_type,
                     count=flight.count,
@@ -1070,7 +1070,7 @@ class AircraftConflictGenerator:
             logging.warning("No room on runway or parking slots. Starting from the air.")
             flight.start_type = "In Flight"
             group = self._generate_inflight(
-                name=namegen.next_unit_name(country, cp.id, flight.unit_type),
+                name=namegen.next_aircraft_name(country, cp.id, flight),
                 side=country,
                 flight=flight,
                 origin=cp)
diff --git a/gen/naming.py b/gen/naming.py
index 812acad4..2928b17d 100644
--- a/gen/naming.py
+++ b/gen/naming.py
@@ -1,4 +1,5 @@
 from game import db
+from gen.flights.flight import Flight
 import random
 
 ALPHA_MILITARY = ["Alpha","Bravo","Charlie","Delta","Echo","Foxtrot",
@@ -51,6 +52,11 @@ class NameGenerator:
         self.number = 0
         self.infantry_number = 0
 
+    def next_aircraft_name(self, country: int, parent_base_id: int, flight: Flight):
+        self.number += 1
+        name_str = "{} {}".format(flight.package.target.name, flight.flight_type)
+        return "{}|{}|{}|{}|{}|".format(name_str, country.id, self.number, parent_base_id, db.unit_type_name(flight.unit_type))
+
     def next_unit_name(self, country, parent_base_id, unit_type):
         self.number += 1
         return "unit|{}|{}|{}|{}|".format(country.id, self.number, parent_base_id, db.unit_type_name(unit_type))