diff --git a/src/blackmisc/aviation/flightplan.cpp b/src/blackmisc/aviation/flightplan.cpp
index 87b25adcc..5bead61b7 100644
--- a/src/blackmisc/aviation/flightplan.cpp
+++ b/src/blackmisc/aviation/flightplan.cpp
@@ -157,7 +157,7 @@ namespace BlackMisc
         {
             const QStringList parts = CFlightPlan::splitEquipmentCode(equipmentIcao);
             m_aircraftIcao = CAircraftIcaoCode::isValidDesignator(parts[1]) ? parts[1] : "";
-            m_equipmentPrefix = parts[0];
+            m_prefix = parts[0];
             m_equipmentSuffix = parts[2];
         }
 
@@ -180,9 +180,9 @@ namespace BlackMisc
             return UNKNOWN;
         }
 
-        QString CFlightPlan::getPrefixIcaoSuffix() const
+        QString CFlightPlan::getCombinedPrefixIcaoSuffix() const
         {
-            return CFlightPlan::concatPrefixIcaoSuffix(m_equipmentPrefix, m_aircraftIcao.getDesignator(), m_equipmentSuffix);
+            return CFlightPlan::concatPrefixIcaoSuffix(m_prefix, m_aircraftIcao.getDesignator(), m_equipmentSuffix);
         }
 
         CVariant CFlightPlan::propertyByIndex(const CPropertyIndex &index) const
diff --git a/src/blackmisc/aviation/flightplan.h b/src/blackmisc/aviation/flightplan.h
index e7fea6928..de820b2b9 100644
--- a/src/blackmisc/aviation/flightplan.h
+++ b/src/blackmisc/aviation/flightplan.h
@@ -307,10 +307,10 @@ namespace BlackMisc
             const CFlightPlanRemarks &getFlightPlanRemarks() const { return m_remarks; }
 
             //! Get ICAO aircraft equipment prefix H/B737/F "H"
-            const QString &getEquipmentPrefix() const { return m_equipmentPrefix; }
+            const QString &getPrefix() const { return m_prefix; }
 
             //! Set ICAO aircraft equipment prefix H/B737/F "H"
-            void setEquipmentPrefix(const QString &prefix) { m_equipmentPrefix = prefix; }
+            void setPrefix(const QString &prefix) { m_prefix = prefix; }
 
             //! Get ICAO aircraft equipment suffix H/B737/F "F"
             const QString &getEquipmentSuffix() const { return m_equipmentSuffix; }
@@ -328,7 +328,7 @@ namespace BlackMisc
             bool hasAircraftIcao() const { return m_aircraftIcao.hasDesignator(); }
 
             //! Full string like "H/B737/F"
-            QString getPrefixIcaoSuffix() const;
+            QString getCombinedPrefixIcaoSuffix() const;
 
             //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const CPropertyIndex &index) const;
@@ -380,10 +380,10 @@ namespace BlackMisc
             static const QStringList &prefixCodes();
 
         private:
-            CCallsign m_callsign; //!< aircraft callsign
+            CCallsign m_callsign;             //!< aircraft callsign
             CAircraftIcaoCode m_aircraftIcao; //!< Aircraft ICAO code
-            QString m_equipmentPrefix; //!< e.g. "T/A320/F" -> the "T"
-            QString m_equipmentSuffix; //!< e.g. "T/A320/F" -> the "F"
+            QString m_prefix;                 //!< e.g. "T/A320/F" -> the "T"
+            QString m_equipmentSuffix;        //!< e.g. "T/A320/F" -> the "F"
             CAirportIcaoCode m_originAirportIcao;
             CAirportIcaoCode m_destinationAirportIcao;
             CAirportIcaoCode m_alternateAirportIcao;
@@ -401,7 +401,7 @@ namespace BlackMisc
                 CFlightPlan,
                 // callsign will be current flight
                 BLACK_METAMEMBER(aircraftIcao),
-                BLACK_METAMEMBER(equipmentPrefix),
+                BLACK_METAMEMBER(prefix),
                 BLACK_METAMEMBER(equipmentSuffix),
                 BLACK_METAMEMBER(originAirportIcao),
                 BLACK_METAMEMBER(destinationAirportIcao),