diff --git a/src/blackgui/components/aircraftcomponent.cpp b/src/blackgui/components/aircraftcomponent.cpp
index 67a3ee5f7..d22c6ba01 100644
--- a/src/blackgui/components/aircraftcomponent.cpp
+++ b/src/blackgui/components/aircraftcomponent.cpp
@@ -47,7 +47,7 @@ namespace BlackGui
             this->tabBar()->setUsesScrollButtons(true);
             ui->tvp_AirportsInRange->setResizeMode(CAirportView::ResizingOnce);
 
-            ui->tvp_AircraftInRange->setAircraftMode(CSimulatedAircraftListModel::InfoMode);
+            ui->tvp_AircraftInRange->setAircraftMode(CSimulatedAircraftListModel::NetworkMode);
             ui->tvp_AircraftInRange->configureMenu(true, false, false);
 
             connect(ui->tvp_AircraftInRange, &CSimulatedAircraftView::modelDataChanged, this, &CAircraftComponent::ps_onRowCountChanged);
diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp
index 4602faa3e..0416a3beb 100644
--- a/src/blackgui/components/mappingcomponent.cpp
+++ b/src/blackgui/components/mappingcomponent.cpp
@@ -68,7 +68,7 @@ namespace BlackGui
             ui->tvp_AircraftModels->addFilterDialog();
             ui->tvp_AircraftModels->menuRemoveItems(CViewBaseNonTemplate::MenuBackend);
 
-            ui->tvp_RenderedAircraft->setAircraftMode(CSimulatedAircraftListModel::ModelMode);
+            ui->tvp_RenderedAircraft->setAircraftMode(CSimulatedAircraftListModel::RenderedMode);
             ui->tvp_RenderedAircraft->setResizeMode(CAircraftModelView::ResizingOnce);
 
             connect(ui->tvp_AircraftModels, &CAircraftModelView::requestUpdate, this, &CMappingComponent::ps_onModelsUpdateRequested);
diff --git a/src/blackgui/models/simulatedaircraftlistmodel.cpp b/src/blackgui/models/simulatedaircraftlistmodel.cpp
index 03756edbf..c9c55eaba 100644
--- a/src/blackgui/models/simulatedaircraftlistmodel.cpp
+++ b/src/blackgui/models/simulatedaircraftlistmodel.cpp
@@ -34,7 +34,7 @@ namespace BlackGui
     {
         CSimulatedAircraftListModel::CSimulatedAircraftListModel(QObject *parent) : CListModelBase("ModelSimulatedAircraftList", parent)
         {
-            this->setAircraftMode(InfoMode);
+            this->setAircraftMode(NetworkMode);
 
             // force strings for translation in resource files
             (void)QT_TRANSLATE_NOOP("ModelSimulatedAircraftList", "callsign");
@@ -58,18 +58,18 @@ namespace BlackGui
             switch (mode)
             {
             case NotSet:
-            case InfoMode:
+            case NetworkMode:
                 {
                     this->m_columns.addColumn(CColumn::standardValueObject("cs.", "callsign", CSimulatedAircraft::IndexCallsign, CCallsign::IndexCallsignString));
                     this->m_columns.addColumn(CColumn::standardString("realname", "pilot's real name", { CSimulatedAircraft::IndexPilot, CUser::IndexRealName }));
                     this->m_columns.addColumn(CColumn("dist.", "distance", CSimulatedAircraft::IndexRelativeDistance, new CAirspaceDistanceFormatter()));
                     this->m_columns.addColumn(CColumn("altitude", { CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexAltitude }, new CAltitudeFormatter()));
                     this->m_columns.addColumn(CColumn("gs.", { CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexGroundspeed }, new CAircraftSpeedFormatter()));
-                    this->m_columns.addColumn(CColumn::standardString("icao", "icao and livery info", { CSimulatedAircraft::IndexCombinedIcaoLiveryString}));
+                    this->m_columns.addColumn(CColumn::standardString("icao", "icao and livery info", { CSimulatedAircraft::IndexCombinedIcaoLiveryStringNetworkModel}));
 
                     // icon column for airline
-                    CColumn col("airline", { CSimulatedAircraft::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexIcon });
-                    col.setSortPropertyIndex({ CSimulatedAircraft::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineDesignator});
+                    CColumn col("airline", { CSimulatedAircraft::IndexNetworkModel, CAircraftModel::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexIcon });
+                    col.setSortPropertyIndex({ CSimulatedAircraft::IndexNetworkModel, CAircraftModel::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineDesignator});
                     this->m_columns.addColumn(col);
 
                     this->m_columns.addColumn(CColumn("frequency", { CSimulatedAircraft::IndexCom1System, CComSystem::IndexActiveFrequency }, new CComFrequencyFormatter()));
@@ -83,7 +83,7 @@ namespace BlackGui
                 }
                 break;
 
-            case ModelMode:
+            case RenderedMode:
                 {
                     this->m_columns.addColumn(CColumn("e.", "enabled", CSimulatedAircraft::IndexEnabled, new CBoolIconFormatter("enabled", "disabled"), true));
                     this->m_columns.addColumn(CColumn("r.", "rendered", CSimulatedAircraft::IndexRendered, new CBoolIconFormatter("rendered", "skipped"), true));
diff --git a/src/blackgui/models/simulatedaircraftlistmodel.h b/src/blackgui/models/simulatedaircraftlistmodel.h
index e84d0d0c1..7e998d9fe 100644
--- a/src/blackgui/models/simulatedaircraftlistmodel.h
+++ b/src/blackgui/models/simulatedaircraftlistmodel.h
@@ -33,8 +33,8 @@ namespace BlackGui
             //! Model modes
             enum AircraftMode
             {
-                InfoMode,  //!< like aircraft in range
-                ModelMode, //!< focusing on used model
+                NetworkMode,  //!< like aircraft in range
+                RenderedMode, //!< focusing on used model
                 NotSet
             };