diff --git a/src/blackgui/models/aircraftpartslistmodel.cpp b/src/blackgui/models/aircraftpartslistmodel.cpp
index 093071567..d973d470f 100644
--- a/src/blackgui/models/aircraftpartslistmodel.cpp
+++ b/src/blackgui/models/aircraftpartslistmodel.cpp
@@ -24,7 +24,7 @@ namespace BlackGui
     namespace Models
     {
         CAircraftPartsListModel::CAircraftPartsListModel(QObject *parent) :
-            CListModelTimestampObjects<CAircraftParts, CAircraftPartsList, true>("ViewAircraftPartsList", parent)
+            CListModelTimestampWithOffsetObjects<CAircraftParts, CAircraftPartsList, true>("ViewAircraftPartsList", parent)
         {
             this->addTimestampOffsetColumns();
 
diff --git a/src/blackgui/models/aircraftpartslistmodel.h b/src/blackgui/models/aircraftpartslistmodel.h
index e0efd27dd..e92b56679 100644
--- a/src/blackgui/models/aircraftpartslistmodel.h
+++ b/src/blackgui/models/aircraftpartslistmodel.h
@@ -26,7 +26,7 @@ namespace BlackGui
     namespace Models
     {
         //! Client list model
-        class BLACKGUI_EXPORT CAircraftPartsListModel : public CListModelTimestampObjects<BlackMisc::Aviation::CAircraftParts, BlackMisc::Aviation::CAircraftPartsList, true>
+        class BLACKGUI_EXPORT CAircraftPartsListModel : public CListModelTimestampWithOffsetObjects<BlackMisc::Aviation::CAircraftParts, BlackMisc::Aviation::CAircraftPartsList, true>
         {
         public:
             //! Constructor
diff --git a/src/blackgui/models/aircraftsituationlistmodel.cpp b/src/blackgui/models/aircraftsituationlistmodel.cpp
index 82002ee5a..9d5c53de4 100644
--- a/src/blackgui/models/aircraftsituationlistmodel.cpp
+++ b/src/blackgui/models/aircraftsituationlistmodel.cpp
@@ -26,7 +26,7 @@ namespace BlackGui
     namespace Models
     {
         CAircraftSituationListModel::CAircraftSituationListModel(QObject *parent) :
-            CListModelTimestampObjects<CAircraftSituation, CAircraftSituationList, true>("ViewAircraftPartsList", parent)
+            CListModelTimestampWithOffsetObjects<CAircraftSituation, CAircraftSituationList, true>("ViewAircraftPartsList", parent)
         {
             this->addTimestampOffsetColumns();
 
diff --git a/src/blackgui/models/aircraftsituationlistmodel.h b/src/blackgui/models/aircraftsituationlistmodel.h
index 6ec9bbe67..52d3b7eeb 100644
--- a/src/blackgui/models/aircraftsituationlistmodel.h
+++ b/src/blackgui/models/aircraftsituationlistmodel.h
@@ -26,7 +26,7 @@ namespace BlackGui
     namespace Models
     {
         //! Client list model
-        class BLACKGUI_EXPORT CAircraftSituationListModel : public CListModelTimestampObjects<BlackMisc::Aviation::CAircraftSituation, BlackMisc::Aviation::CAircraftSituationList, true>
+        class BLACKGUI_EXPORT CAircraftSituationListModel : public CListModelTimestampWithOffsetObjects<BlackMisc::Aviation::CAircraftSituation, BlackMisc::Aviation::CAircraftSituationList, true>
         {
         public:
             //! Constructor
diff --git a/src/blackgui/views/aircraftpartsview.cpp b/src/blackgui/views/aircraftpartsview.cpp
index fb940be9c..bd40a49e7 100644
--- a/src/blackgui/views/aircraftpartsview.cpp
+++ b/src/blackgui/views/aircraftpartsview.cpp
@@ -16,7 +16,7 @@ namespace BlackGui
     namespace Views
     {
         CAircraftPartsView::CAircraftPartsView(QWidget *parent) :
-            CViewWithTimestampObjects(parent)
+            CViewWithTimestampWithOffsetObjects(parent)
         {
             this->standardInit(new CAircraftPartsListModel(this));
             this->setMenu(MenuDefault);
diff --git a/src/blackgui/views/aircraftpartsview.h b/src/blackgui/views/aircraftpartsview.h
index f2b120eb9..404cade83 100644
--- a/src/blackgui/views/aircraftpartsview.h
+++ b/src/blackgui/views/aircraftpartsview.h
@@ -24,7 +24,7 @@ namespace BlackGui
     namespace Views
     {
         //! Aircraft parts
-        class BLACKGUI_EXPORT CAircraftPartsView : public CViewWithTimestampObjects<Models::CAircraftPartsListModel, BlackMisc::Aviation::CAircraftPartsList, BlackMisc::Aviation::CAircraftParts>
+        class BLACKGUI_EXPORT CAircraftPartsView : public CViewWithTimestampWithOffsetObjects<Models::CAircraftPartsListModel, BlackMisc::Aviation::CAircraftPartsList, BlackMisc::Aviation::CAircraftParts>
         {
         public:
             //! Constructor
diff --git a/src/blackgui/views/aircraftsituationview.cpp b/src/blackgui/views/aircraftsituationview.cpp
index d5497338d..a933959f0 100644
--- a/src/blackgui/views/aircraftsituationview.cpp
+++ b/src/blackgui/views/aircraftsituationview.cpp
@@ -16,7 +16,7 @@ namespace BlackGui
     namespace Views
     {
         CAircraftSituationView::CAircraftSituationView(QWidget *parent) :
-            CViewWithTimestampObjects(parent)
+            CViewWithTimestampWithOffsetObjects(parent)
         {
             this->standardInit(new CAircraftSituationListModel(this));
             this->setMenu(MenuDefault);
diff --git a/src/blackgui/views/aircraftsituationview.h b/src/blackgui/views/aircraftsituationview.h
index 214677454..e364005ae 100644
--- a/src/blackgui/views/aircraftsituationview.h
+++ b/src/blackgui/views/aircraftsituationview.h
@@ -24,7 +24,7 @@ namespace BlackGui
     namespace Views
     {
         //! Aircraft situations view
-        class BLACKGUI_EXPORT CAircraftSituationView : public CViewWithTimestampObjects<Models::CAircraftSituationListModel, BlackMisc::Aviation::CAircraftSituationList, BlackMisc::Aviation::CAircraftSituation>
+        class BLACKGUI_EXPORT CAircraftSituationView : public CViewWithTimestampWithOffsetObjects<Models::CAircraftSituationListModel, BlackMisc::Aviation::CAircraftSituationList, BlackMisc::Aviation::CAircraftSituation>
         {
         public:
             //! Constructor
diff --git a/src/blackgui/views/viewtimestampobjects.cpp b/src/blackgui/views/viewtimestampobjects.cpp
index cd781ac42..f5331339f 100644
--- a/src/blackgui/views/viewtimestampobjects.cpp
+++ b/src/blackgui/views/viewtimestampobjects.cpp
@@ -22,20 +22,20 @@ namespace BlackGui
     namespace Views
     {
         template<class ModelClass, class ContainerType, class ObjectType>
-        void CViewWithTimestampObjects<ModelClass, ContainerType, ObjectType>::push_frontKeepLatestAdjustedFirst(const ObjectType &object, int max)
+        void CViewWithTimestampWithOffsetObjects<ModelClass, ContainerType, ObjectType>::push_frontKeepLatestAdjustedFirst(const ObjectType &object, int max)
         {
             this->derivedModel()->push_frontKeepLatestAdjustedFirst(object, max);
         }
 
         template <class ModelClass, class ContainerType, class ObjectType>
-        CViewWithTimestampObjects<ModelClass, ContainerType, ObjectType>::CViewWithTimestampObjects(QWidget *parent) :
+        CViewWithTimestampWithOffsetObjects<ModelClass, ContainerType, ObjectType>::CViewWithTimestampWithOffsetObjects(QWidget *parent) :
             CViewBase<ModelClass, ContainerType, ObjectType>(parent)
         {
             // void
         }
 
-        template class CViewWithTimestampObjects<BlackGui::Models::CAircraftPartsListModel, BlackMisc::Aviation::CAircraftPartsList, BlackMisc::Aviation::CAircraftParts>;
-        template class CViewWithTimestampObjects<BlackGui::Models::CAircraftSituationListModel, BlackMisc::Aviation::CAircraftSituationList, BlackMisc::Aviation::CAircraftSituation>;
+        template class CViewWithTimestampWithOffsetObjects<BlackGui::Models::CAircraftPartsListModel, BlackMisc::Aviation::CAircraftPartsList, BlackMisc::Aviation::CAircraftParts>;
+        template class CViewWithTimestampWithOffsetObjects<BlackGui::Models::CAircraftSituationListModel, BlackMisc::Aviation::CAircraftSituationList, BlackMisc::Aviation::CAircraftSituation>;
 
     } // namespace
 } // namespace
diff --git a/src/blackgui/views/viewtimestampobjects.h b/src/blackgui/views/viewtimestampobjects.h
index 9bfe20857..6d6164fb1 100644
--- a/src/blackgui/views/viewtimestampobjects.h
+++ b/src/blackgui/views/viewtimestampobjects.h
@@ -22,8 +22,8 @@ namespace BlackGui
     namespace Menus { class CMenuActions; }
     namespace Views
     {
-        //! Base class for views with DB objects
-        template <class ModelClass, class ContainerType, class ObjectType> class CViewWithTimestampObjects :
+        //! Base class for views timestamp offset objects
+        template <class ModelClass, class ContainerType, class ObjectType> class CViewWithTimestampWithOffsetObjects :
             public CViewBase<ModelClass, ContainerType, ObjectType>
         {
         public:
@@ -32,7 +32,7 @@ namespace BlackGui
 
         protected:
             //! Constructor
-            explicit CViewWithTimestampObjects(QWidget *parent = nullptr);
+            explicit CViewWithTimestampWithOffsetObjects(QWidget *parent = nullptr);
         };
     } // namespace
 } // namespace