diff --git a/src/blackgui/views/atcstationview.cpp b/src/blackgui/views/atcstationview.cpp
index 9e81d5dd7..d7f8f9b99 100644
--- a/src/blackgui/views/atcstationview.cpp
+++ b/src/blackgui/views/atcstationview.cpp
@@ -27,7 +27,7 @@ namespace BlackGui
 {
     namespace Views
     {
-        CAtcStationView::CAtcStationView(QWidget *parent) : CViewBase(parent)
+        CAtcStationView::CAtcStationView(QWidget *parent) : CViewWithCallsignObjects(parent)
         {
             this->standardInit(new CAtcStationListModel(CAtcStationListModel::StationsOnline, this));
             this->m_menus |= (MenuClear | MenuRefresh);
diff --git a/src/blackgui/views/atcstationview.h b/src/blackgui/views/atcstationview.h
index c20e9fa49..1b7805412 100644
--- a/src/blackgui/views/atcstationview.h
+++ b/src/blackgui/views/atcstationview.h
@@ -13,8 +13,8 @@
 #define BLACKGUI_ATCSTATIONVIEW_H
 
 #include "blackgui/blackguiexport.h"
+#include "blackgui/views/viewcallsignobjects.h"
 #include "blackgui/models/atcstationlistmodel.h"
-#include "blackgui/views/viewbase.h"
 #include "blackmisc/aviation/atcstation.h"
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/comsystem.h"
@@ -33,7 +33,7 @@ namespace BlackGui
     namespace Views
     {
         //! ATC stations view
-        class BLACKGUI_EXPORT CAtcStationView : public CViewBase<BlackGui::Models::CAtcStationListModel, BlackMisc::Aviation::CAtcStationList, BlackMisc::Aviation::CAtcStation>
+        class BLACKGUI_EXPORT CAtcStationView : public CViewWithCallsignObjects<BlackGui::Models::CAtcStationListModel, BlackMisc::Aviation::CAtcStationList, BlackMisc::Aviation::CAtcStation>
         {
             Q_OBJECT
 
diff --git a/src/blackgui/views/simulatedaircraftview.cpp b/src/blackgui/views/simulatedaircraftview.cpp
index a067fd249..0e038b900 100644
--- a/src/blackgui/views/simulatedaircraftview.cpp
+++ b/src/blackgui/views/simulatedaircraftview.cpp
@@ -26,7 +26,7 @@ namespace BlackGui
 {
     namespace Views
     {
-        CSimulatedAircraftView::CSimulatedAircraftView(QWidget *parent) : CViewBase(parent)
+        CSimulatedAircraftView::CSimulatedAircraftView(QWidget *parent) : CViewWithCallsignObjects(parent)
         {
             this->standardInit(new CSimulatedAircraftListModel(this));
             this->m_menus |= MenuRefresh;
diff --git a/src/blackgui/views/simulatedaircraftview.h b/src/blackgui/views/simulatedaircraftview.h
index aa45f3a89..3f263b789 100644
--- a/src/blackgui/views/simulatedaircraftview.h
+++ b/src/blackgui/views/simulatedaircraftview.h
@@ -13,8 +13,8 @@
 #define BLACKGUI_VIEWS_SIMULATEDAIRCRAFTVIEW_H
 
 #include "blackgui/blackguiexport.h"
+#include "blackgui/views/viewcallsignobjects.h"
 #include "blackgui/models/simulatedaircraftlistmodel.h"
-#include "blackgui/views/viewbase.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
 
 #include <QObject>
@@ -34,7 +34,7 @@ namespace BlackGui
     namespace Views
     {
         //! Aircraft view
-        class BLACKGUI_EXPORT CSimulatedAircraftView : public CViewBase<Models::CSimulatedAircraftListModel, BlackMisc::Simulation::CSimulatedAircraftList, BlackMisc::Simulation::CSimulatedAircraft>
+        class BLACKGUI_EXPORT CSimulatedAircraftView : public CViewWithCallsignObjects<Models::CSimulatedAircraftListModel, BlackMisc::Simulation::CSimulatedAircraftList, BlackMisc::Simulation::CSimulatedAircraft>
         {
             Q_OBJECT