diff --git a/src/blackgui/models/atcstationlistmodel.cpp b/src/blackgui/models/atcstationlistmodel.cpp
index 078c83261..a203594ef 100644
--- a/src/blackgui/models/atcstationlistmodel.cpp
+++ b/src/blackgui/models/atcstationlistmodel.cpp
@@ -41,7 +41,7 @@ namespace BlackGui
     namespace Models
     {
         CAtcStationListModel::CAtcStationListModel(AtcStationMode stationMode, QObject *parent) :
-            CListModelBase("ModelAtcList", parent)
+            CListModelCallsignObjects("ModelAtcList", parent)
         {
             this->setStationMode(stationMode);
 
diff --git a/src/blackgui/models/atcstationlistmodel.h b/src/blackgui/models/atcstationlistmodel.h
index 5e5021584..3e8212960 100644
--- a/src/blackgui/models/atcstationlistmodel.h
+++ b/src/blackgui/models/atcstationlistmodel.h
@@ -13,7 +13,7 @@
 #define BLACKGUI_MODELS_ATCLISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodelbase.h"
+#include "blackgui/models/listmodelcallsignobjects.h"
 #include "blackmisc/aviation/atcstation.h"
 #include "blackmisc/aviation/atcstationlist.h"
 
@@ -26,7 +26,7 @@ namespace BlackGui
     namespace Models
     {
         //! ATC list model
-        class BLACKGUI_EXPORT CAtcStationListModel : public CListModelBase<BlackMisc::Aviation::CAtcStation, BlackMisc::Aviation::CAtcStationList, true>
+        class BLACKGUI_EXPORT CAtcStationListModel : public CListModelCallsignObjects<BlackMisc::Aviation::CAtcStation, BlackMisc::Aviation::CAtcStationList, true>
         {
         public:
             //! What kind of stations
diff --git a/src/blackgui/models/simulatedaircraftlistmodel.cpp b/src/blackgui/models/simulatedaircraftlistmodel.cpp
index 04f33fbad..66678ebd8 100644
--- a/src/blackgui/models/simulatedaircraftlistmodel.cpp
+++ b/src/blackgui/models/simulatedaircraftlistmodel.cpp
@@ -32,7 +32,7 @@ namespace BlackGui
 {
     namespace Models
     {
-        CSimulatedAircraftListModel::CSimulatedAircraftListModel(QObject *parent) : CListModelBase("ModelSimulatedAircraftList", parent)
+        CSimulatedAircraftListModel::CSimulatedAircraftListModel(QObject *parent) : CListModelCallsignObjects("ModelSimulatedAircraftList", parent)
         {
             this->setAircraftMode(NetworkMode);
 
diff --git a/src/blackgui/models/simulatedaircraftlistmodel.h b/src/blackgui/models/simulatedaircraftlistmodel.h
index 759005122..20a251565 100644
--- a/src/blackgui/models/simulatedaircraftlistmodel.h
+++ b/src/blackgui/models/simulatedaircraftlistmodel.h
@@ -13,7 +13,7 @@
 #define BLACKGUI_MODELS_SIMULATEDAIRCRAFTLISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackgui/models/listmodelbase.h"
+#include "blackgui/models/listmodelcallsignobjects.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
 
 class QObject;
@@ -25,7 +25,7 @@ namespace BlackGui
     {
         //! Aircraft list model
         class BLACKGUI_EXPORT CSimulatedAircraftListModel :
-            public CListModelBase<BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::Simulation::CSimulatedAircraftList, true>
+            public CListModelCallsignObjects<BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::Simulation::CSimulatedAircraftList, true>
         {
         public:
             //! Model modes