diff --git a/src/blackcore/data/authenticateduser.h b/src/blackcore/data/authenticateduser.h
index 281097573..b333dab30 100644
--- a/src/blackcore/data/authenticateduser.h
+++ b/src/blackcore/data/authenticateduser.h
@@ -22,7 +22,7 @@ namespace BlackCore
     {
         //! Trait for for global cached DB user.
         //! This user has authenticated with the swift DB.
-        struct AuthenticatedDbUser : public BlackMisc::CDataTrait<BlackMisc::Network::CAuthenticatedUser>
+        struct TAuthenticatedDbUser : public BlackMisc::TDataTrait<BlackMisc::Network::CAuthenticatedUser>
         {
             //! Key in data cache
             static const char *key() { return "dbuser"; }
diff --git a/src/blackcore/data/dbcaches.h b/src/blackcore/data/dbcaches.h
index d2eb186ea..d81384120 100644
--- a/src/blackcore/data/dbcaches.h
+++ b/src/blackcore/data/dbcaches.h
@@ -29,7 +29,7 @@ namespace BlackCore
     namespace Data
     {
         //! Trait for DB model cache
-        struct DbModelCache : public BlackMisc::CDataTrait<BlackMisc::Simulation::CAircraftModelList>
+        struct TDbModelCache : public BlackMisc::TDataTrait<BlackMisc::Simulation::CAircraftModelList>
         {
             //! Defer loading
             static constexpr bool isDeferred() { return true; }
@@ -39,7 +39,7 @@ namespace BlackCore
         };
 
         //! Trait for DB distributor cache
-        struct DbDistributorCache : public BlackMisc::CDataTrait<BlackMisc::Simulation::CDistributorList>
+        struct TDbDistributorCache : public BlackMisc::TDataTrait<BlackMisc::Simulation::CDistributorList>
         {
             //! Defer loading (no currently small)
             static constexpr bool isDeferred() { return false; }
@@ -49,7 +49,7 @@ namespace BlackCore
         };
 
         //! Trait for DB liveries
-        struct DbLiveryCache : public BlackMisc::CDataTrait<BlackMisc::Aviation::CLiveryList>
+        struct TDbLiveryCache : public BlackMisc::TDataTrait<BlackMisc::Aviation::CLiveryList>
         {
             //! Defer loading
             static constexpr bool isDeferred() { return true; }
@@ -59,7 +59,7 @@ namespace BlackCore
         };
 
         //! Trait for DB airline ICAO codes
-        struct DbAirlineIcaoCache : public BlackMisc::CDataTrait<BlackMisc::Aviation::CAirlineIcaoCodeList>
+        struct TDbAirlineIcaoCache : public BlackMisc::TDataTrait<BlackMisc::Aviation::CAirlineIcaoCodeList>
         {
             //! Defer loading
             static constexpr bool isDeferred() { return true; }
@@ -70,7 +70,7 @@ namespace BlackCore
 
 
         //! Trait for DB aircraft ICAO codes
-        struct DbAircraftIcaoCache : public BlackMisc::CDataTrait<BlackMisc::Aviation::CAircraftIcaoCodeList>
+        struct TDbAircraftIcaoCache : public BlackMisc::TDataTrait<BlackMisc::Aviation::CAircraftIcaoCodeList>
         {
             //! Defer loading
             static constexpr bool isDeferred() { return true; }
@@ -80,7 +80,7 @@ namespace BlackCore
         };
 
         //! Trait for DB countries
-        struct DbCountryCache : public BlackMisc::CDataTrait<BlackMisc::CCountryList>
+        struct TDbCountryCache : public BlackMisc::TDataTrait<BlackMisc::CCountryList>
         {
             //! Defer loading (no currently small)
             static constexpr bool isDeferred() { return false; }
@@ -90,7 +90,7 @@ namespace BlackCore
         };
 
         //! Trait for ICAO reader base URL
-        struct DbIcaoReaderBaseUrl : public BlackMisc::CDataTrait<BlackMisc::Network::CUrl>
+        struct TDbIcaoReaderBaseUrl : public BlackMisc::TDataTrait<BlackMisc::Network::CUrl>
         {
             //! First load is synchronous
             static constexpr bool isPinned() { return true; }
@@ -100,7 +100,7 @@ namespace BlackCore
         };
 
         //! Trait for ICAO reader base URL
-        struct DbModelReaderBaseUrl : public BlackMisc::CDataTrait<BlackMisc::Network::CUrl>
+        struct TDbModelReaderBaseUrl : public BlackMisc::TDataTrait<BlackMisc::Network::CUrl>
         {
             //! First load is synchronous
             static constexpr bool isPinned() { return true; }
diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h
index 1b6d18864..f4041770b 100644
--- a/src/blackcore/data/globalsetup.h
+++ b/src/blackcore/data/globalsetup.h
@@ -203,7 +203,7 @@ namespace BlackCore
         };
 
         //! Trait for global setup data
-        struct GlobalSetup : public BlackMisc::CDataTrait<CGlobalSetup>
+        struct TGlobalSetup : public BlackMisc::TDataTrait<CGlobalSetup>
         {
             //! Key in data cache
             static const char *key() { return "bootstrap"; }
diff --git a/src/blackcore/data/updateinfo.h b/src/blackcore/data/updateinfo.h
index 70c84a064..e6dbdd32a 100644
--- a/src/blackcore/data/updateinfo.h
+++ b/src/blackcore/data/updateinfo.h
@@ -122,7 +122,7 @@ namespace BlackCore
         };
 
         //! Trait for global setup data
-        struct UpdateInfo : public BlackMisc::CDataTrait<CUpdateInfo>
+        struct TUpdateInfo : public BlackMisc::TDataTrait<CUpdateInfo>
         {
             //! Key in data cache
             static const char *key() { return "version"; }
diff --git a/src/blackcore/data/vatsimsetup.h b/src/blackcore/data/vatsimsetup.h
index deaf16078..016f67f9e 100644
--- a/src/blackcore/data/vatsimsetup.h
+++ b/src/blackcore/data/vatsimsetup.h
@@ -119,7 +119,7 @@ namespace BlackCore
         };
 
         //! Trait for global setup data
-        struct VatsimSetup : public BlackMisc::CDataTrait<CVatsimSetup>
+        struct TVatsimSetup : public BlackMisc::TDataTrait<CVatsimSetup>
         {
             //! Key in data cache
             static const char *key() { return "vatsimsetup"; }
@@ -129,7 +129,7 @@ namespace BlackCore
         };
 
         //! Trait for currently used VATSIM server and user
-        struct VatsimCurrentServer : public BlackMisc::CDataTrait<BlackMisc::Network::CServer>
+        struct TVatsimCurrentServer : public BlackMisc::TDataTrait<BlackMisc::Network::CServer>
         {
             //! Key in data cache
             static const char *key() { return "vatsimserver"; }
diff --git a/src/blackcore/db/databaseauthentication.h b/src/blackcore/db/databaseauthentication.h
index 40e127dbe..48e7d36e3 100644
--- a/src/blackcore/db/databaseauthentication.h
+++ b/src/blackcore/db/databaseauthentication.h
@@ -61,7 +61,7 @@ namespace BlackCore
             void ps_userChanged();
 
         private:
-            BlackMisc::CData<BlackCore::Data::AuthenticatedDbUser> m_swiftDbUser {this, &CDatabaseAuthenticationService::ps_userChanged};
+            BlackMisc::CData<BlackCore::Data::TAuthenticatedDbUser> m_swiftDbUser {this, &CDatabaseAuthenticationService::ps_userChanged};
             bool m_shutdown = false;
         };
     } // ns
diff --git a/src/blackcore/db/icaodatareader.h b/src/blackcore/db/icaodatareader.h
index 78a243420..260ac4a3e 100644
--- a/src/blackcore/db/icaodatareader.h
+++ b/src/blackcore/db/icaodatareader.h
@@ -143,12 +143,12 @@ namespace BlackCore
             void ps_baseUrlCacheChanged();
 
         private:
-            BlackMisc::CData<BlackCore::Data::DbAircraftIcaoCache> m_aircraftIcaoCache {this, &CIcaoDataReader::ps_aircraftIcaoCacheChanged };
-            BlackMisc::CData<BlackCore::Data::DbAirlineIcaoCache>  m_airlineIcaoCache  {this, &CIcaoDataReader::ps_airlineIcaoCacheChanged };
-            BlackMisc::CData<BlackCore::Data::DbCountryCache>      m_countryCache      {this, &CIcaoDataReader::ps_countryCacheChanged };
+            BlackMisc::CData<BlackCore::Data::TDbAircraftIcaoCache> m_aircraftIcaoCache {this, &CIcaoDataReader::ps_aircraftIcaoCacheChanged };
+            BlackMisc::CData<BlackCore::Data::TDbAirlineIcaoCache>  m_airlineIcaoCache  {this, &CIcaoDataReader::ps_airlineIcaoCacheChanged };
+            BlackMisc::CData<BlackCore::Data::TDbCountryCache>      m_countryCache      {this, &CIcaoDataReader::ps_countryCacheChanged };
 
             //! Reader URL (we read from where?) used to detect changes of location
-            BlackMisc::CData<BlackCore::Data::DbIcaoReaderBaseUrl> m_readerUrlCache {this, &CIcaoDataReader::ps_baseUrlCacheChanged };
+            BlackMisc::CData<BlackCore::Data::TDbIcaoReaderBaseUrl> m_readerUrlCache {this, &CIcaoDataReader::ps_baseUrlCacheChanged };
 
             //! Update reader URL
             void updateReaderUrl(const BlackMisc::Network::CUrl &url);
diff --git a/src/blackcore/db/modeldatareader.h b/src/blackcore/db/modeldatareader.h
index 451e53325..6dd34da92 100644
--- a/src/blackcore/db/modeldatareader.h
+++ b/src/blackcore/db/modeldatareader.h
@@ -149,12 +149,12 @@ namespace BlackCore
             void ps_baseUrlCacheChanged();
 
         private:
-            BlackMisc::CData<BlackCore::Data::DbLiveryCache>      m_liveryCache {this, &CModelDataReader::ps_liveryCacheChanged };
-            BlackMisc::CData<BlackCore::Data::DbModelCache>       m_modelCache  {this, &CModelDataReader::ps_modelCacheChanged };
-            BlackMisc::CData<BlackCore::Data::DbDistributorCache> m_distributorCache {this, &CModelDataReader::ps_distributorCacheChanged };
+            BlackMisc::CData<BlackCore::Data::TDbLiveryCache>      m_liveryCache {this, &CModelDataReader::ps_liveryCacheChanged };
+            BlackMisc::CData<BlackCore::Data::TDbModelCache>       m_modelCache  {this, &CModelDataReader::ps_modelCacheChanged };
+            BlackMisc::CData<BlackCore::Data::TDbDistributorCache> m_distributorCache {this, &CModelDataReader::ps_distributorCacheChanged };
 
             //! Reader URL (we read from where?) used to detect changes of location
-            BlackMisc::CData<BlackCore::Data::DbModelReaderBaseUrl> m_readerUrlCache {this, &CModelDataReader::ps_baseUrlCacheChanged };
+            BlackMisc::CData<BlackCore::Data::TDbModelReaderBaseUrl> m_readerUrlCache {this, &CModelDataReader::ps_baseUrlCacheChanged };
 
             //! Update reader URL
             void updateReaderUrl(const BlackMisc::Network::CUrl &url);
diff --git a/src/blackcore/setupreader.h b/src/blackcore/setupreader.h
index 575a21f67..8f9e2871d 100644
--- a/src/blackcore/setupreader.h
+++ b/src/blackcore/setupreader.h
@@ -41,8 +41,8 @@ namespace BlackCore
     //! \note This class is no(!) BlackCore::CThreadedReader as it will be loaded once during startup
     //!       and reading setup data is fast.
     //!
-    //! \sa BlackCore::Data::GlobalSetup
-    //! \sa BlackCore::Data::UpdateInfo
+    //! \sa BlackCore::Data::TGlobalSetup
+    //! \sa BlackCore::Data::TUpdateInfo
     class BLACKCORE_EXPORT CSetupReader : public QObject
     {
         Q_OBJECT
@@ -126,8 +126,8 @@ namespace BlackCore
         BlackMisc::Network::CFailoverUrlList m_updateInfoUrls; //!< location of info files
         QCommandLineOption m_cmdBootstrapUrl;                  //!< bootstrap URL
         QCommandLineOption m_cmdBootstrapMode;                 //!< bootstrap mode
-        BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this, &CSetupReader::ps_setupChanged};  //!< data cache setup
-        BlackMisc::CData<BlackCore::Data::UpdateInfo>  m_updateInfo {this};                             //!< data cache update info
+        BlackMisc::CData<BlackCore::Data::TGlobalSetup> m_setup {this, &CSetupReader::ps_setupChanged};  //!< data cache setup
+        BlackMisc::CData<BlackCore::Data::TUpdateInfo>  m_updateInfo {this};                             //!< data cache update info
 
         //! Read by local individual file and update cache from that
         bool readLocalBootstrapFile(QString &fileName);
diff --git a/src/blackcore/vatsim/vatsimdatafilereader.h b/src/blackcore/vatsim/vatsimdatafilereader.h
index ab7eaf0b1..da4fba5bd 100644
--- a/src/blackcore/vatsim/vatsimdatafilereader.h
+++ b/src/blackcore/vatsim/vatsimdatafilereader.h
@@ -141,7 +141,7 @@ namespace BlackCore
         private:
             BlackMisc::Aviation::CAtcStationList           m_atcStations;
             BlackMisc::Simulation::CSimulatedAircraftList  m_aircraft;
-            BlackMisc::CData<BlackCore::Data::VatsimSetup> m_lastGoodSetup { this };
+            BlackMisc::CData<BlackCore::Data::TVatsimSetup> m_lastGoodSetup { this };
             BlackMisc::CSettingReadOnly<BlackCore::Vatsim::TVatsimDataFile>     m_settings { this };
             QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Network::CVoiceCapabilities> m_voiceCapabilities;
 
diff --git a/src/blackcore/vatsim/vatsimstatusfilereader.h b/src/blackcore/vatsim/vatsimstatusfilereader.h
index 69d3ba79f..80d026831 100644
--- a/src/blackcore/vatsim/vatsimstatusfilereader.h
+++ b/src/blackcore/vatsim/vatsimstatusfilereader.h
@@ -70,7 +70,7 @@ namespace BlackCore
             void ps_read();
 
         private:
-            BlackMisc::CData<BlackCore::Data::VatsimSetup> m_lastGoodSetup { this };
+            BlackMisc::CData<BlackCore::Data::TVatsimSetup> m_lastGoodSetup { this };
         };
     } // ns
 } // ns
diff --git a/src/blackgui/components/dbdebugdatabasesetup.h b/src/blackgui/components/dbdebugdatabasesetup.h
index c058e60f8..72df09295 100644
--- a/src/blackgui/components/dbdebugdatabasesetup.h
+++ b/src/blackgui/components/dbdebugdatabasesetup.h
@@ -49,7 +49,7 @@ namespace BlackGui
 
         private:
             QScopedPointer<Ui::CDbDebugDatabaseSetup> ui;
-            BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this};   //!< data cache
+            BlackMisc::CData<BlackCore::Data::TGlobalSetup> m_setup {this};   //!< data cache
         };
     } // ns
 } // ns
diff --git a/src/blackgui/components/dbmappingcomponent.h b/src/blackgui/components/dbmappingcomponent.h
index 2da4c549a..1299da4a1 100644
--- a/src/blackgui/components/dbmappingcomponent.h
+++ b/src/blackgui/components/dbmappingcomponent.h
@@ -284,7 +284,7 @@ namespace BlackGui
             QScopedPointer<CDbAutoStashingComponent>               m_autoStashDialog;    //!< dialog auto stashing
             QScopedPointer<CDbModelMappingModifyComponent>         m_modelModifyDialog;  //!< dialog when modifying models
             BlackMisc::Simulation::FsCommon::CVPilotRulesReader    m_vPilotReader;       //!< read vPilot rules
-            BlackMisc::CData<BlackCore::Data::AuthenticatedDbUser> m_swiftDbUser {this, &CDbMappingComponent::ps_userChanged};
+            BlackMisc::CData<BlackCore::Data::TAuthenticatedDbUser> m_swiftDbUser {this, &CDbMappingComponent::ps_userChanged};
             BlackMisc::CDigestSignal                               m_dsStashedModelsChanged { this, &CDbMappingComponent::ps_digestStashedModelsChanged, &CDbMappingComponent::ps_onStashedModelsChangedDigest, 750, 25 };
             const bool vPilotSupport   = true;   //!< vPilot support
             bool m_vPilot1stInit       = true;   //!< vPilot extensions initaliazed?
diff --git a/src/blackgui/components/logincomponent.h b/src/blackgui/components/logincomponent.h
index 0fc0c1436..0f460b73c 100644
--- a/src/blackgui/components/logincomponent.h
+++ b/src/blackgui/components/logincomponent.h
@@ -167,7 +167,7 @@ namespace BlackGui
             QTimer *m_logoffCountdownTimer { nullptr };
             BlackMisc::CSettingReadOnly<BlackCore::Vatsim::TTrafficServers> m_otherTrafficNetworkServers { this, &CLoginComponent::ps_reloadSettings };
             BlackMisc::CSetting<BlackGui::Settings::TOwnAircraftModel> m_currentAircraftModel { this };
-            BlackMisc::CData<BlackCore::Data::VatsimCurrentServer> m_currentVatsimServer { this };
+            BlackMisc::CData<BlackCore::Data::TVatsimCurrentServer> m_currentVatsimServer { this };
         };
     } // namespace
 } // namespace
diff --git a/src/blackgui/components/simulatorselector.h b/src/blackgui/components/simulatorselector.h
index bfb752b0f..5287622df 100644
--- a/src/blackgui/components/simulatorselector.h
+++ b/src/blackgui/components/simulatorselector.h
@@ -89,7 +89,7 @@ namespace BlackGui
             QScopedPointer<Ui::CSimulatorSelector> ui;
             Mode m_mode = CheckBoxes;
             bool m_noSelectionMeansAll = false; //!< for filters, no selection means all
-            BlackMisc::CDataReadOnly<BlackMisc::Simulation::Data::ModelSetLastSelection> m_currentSimulator { this }; //!< current simulator
+            BlackMisc::CDataReadOnly<BlackMisc::Simulation::Data::TModelSetLastSelection> m_currentSimulator { this }; //!< current simulator
         };
     } // ns
 } // ns
diff --git a/src/blackgui/editors/form.h b/src/blackgui/editors/form.h
index 26a62f6fa..b5292c654 100644
--- a/src/blackgui/editors/form.h
+++ b/src/blackgui/editors/form.h
@@ -58,7 +58,7 @@ namespace BlackGui
 
         protected:
             bool m_readOnly = false; //!< read only
-            BlackMisc::CData<BlackCore::Data::AuthenticatedDbUser> m_swiftDbUser {this, &CForm::ps_userChanged}; //!< authenticated user
+            BlackMisc::CData<BlackCore::Data::TAuthenticatedDbUser> m_swiftDbUser {this, &CForm::ps_userChanged}; //!< authenticated user
 
         protected slots:
             //! User has been changed
diff --git a/src/blackmisc/datacache.h b/src/blackmisc/datacache.h
index a08b2fb66..d83beacd8 100644
--- a/src/blackmisc/datacache.h
+++ b/src/blackmisc/datacache.h
@@ -280,7 +280,7 @@ namespace BlackMisc
 
     /*!
      * Class template for accessing a specific value in the CDataCache.
-     * \tparam Trait A subclass of BlackMisc::CDataTrait that identifies the value's key and other metadata.
+     * \tparam Trait A subclass of BlackMisc::TDataTrait that identifies the value's key and other metadata.
      */
     template <typename Trait>
     class CData : public BlackMisc::CCached<typename Trait::type>
@@ -363,7 +363,7 @@ namespace BlackMisc
 
     /*!
      * Class template for read-only access to a specific value in the CDataCache.
-     * \tparam Trait A subclass of BlackMisc::CDataTrait that identifies the value's key and other metadata.
+     * \tparam Trait A subclass of BlackMisc::TDataTrait that identifies the value's key and other metadata.
      */
     template <typename Trait>
     class CDataReadOnly : public BlackMisc::CData<Trait>
@@ -385,7 +385,7 @@ namespace BlackMisc
      * Base class for traits to be used as template argument to BlackMisc::CData.
      */
     template <typename T>
-    struct CDataTrait
+    struct TDataTrait
     {
         //! Data type of the value.
         using type = T;
@@ -417,13 +417,13 @@ namespace BlackMisc
         static constexpr bool isDeferred() { return false; }
 
         //! Deleted default constructor.
-        CDataTrait() = delete;
+        TDataTrait() = delete;
 
         //! Deleted copy constructor.
-        CDataTrait(const CDataTrait &) = delete;
+        TDataTrait(const TDataTrait &) = delete;
 
         //! Deleted copy assignment operator.
-        CDataTrait &operator =(const CDataTrait &) = delete;
+        TDataTrait &operator =(const TDataTrait &) = delete;
     };
 }
 
diff --git a/src/blackmisc/simulation/data/modelcaches.h b/src/blackmisc/simulation/data/modelcaches.h
index 681082424..ce3355848 100644
--- a/src/blackmisc/simulation/data/modelcaches.h
+++ b/src/blackmisc/simulation/data/modelcaches.h
@@ -28,7 +28,7 @@ namespace BlackMisc
         namespace Data
         {
             //! Trait for model cache
-            struct ModelCache : public BlackMisc::CDataTrait<BlackMisc::Simulation::CAircraftModelList>
+            struct TModelCache : public BlackMisc::TDataTrait<BlackMisc::Simulation::CAircraftModelList>
             {
                 //! Defer loading
                 static constexpr bool isDeferred() { return true; }
@@ -38,35 +38,35 @@ namespace BlackMisc
             //! @{
 
             //! XPlane
-            struct ModelCacheXP : public ModelCache
+            struct TModelCacheXP : public TModelCache
             {
                 //! Key in data cache
                 static const char *key() { return "modelcachexp"; }
             };
 
             //! FSX
-            struct ModelCacheFsx : public ModelCache
+            struct TModelCacheFsx : public TModelCache
             {
                 //! Key in data cache
                 static const char *key() { return "modelcachefsx"; }
             };
 
             //! FS9
-            struct ModelCacheFs9 : public ModelCache
+            struct TModelCacheFs9 : public TModelCache
             {
                 //! Key in data cache
                 static const char *key() { return "modelcachefs9"; }
             };
 
             //! P3D
-            struct ModelCacheP3D : public ModelCache
+            struct TModelCacheP3D : public TModelCache
             {
                 //! Key in data cache
                 static const char *key() { return "modelcachep3d"; }
             };
 
             //! Last selection
-            struct ModelCacheLastSelection : public BlackMisc::CDataTrait<BlackMisc::Simulation::CSimulatorInfo>
+            struct TModelCacheLastSelection : public BlackMisc::TDataTrait<BlackMisc::Simulation::CSimulatorInfo>
             {
                 //! Default value
                 static const BlackMisc::Simulation::CSimulatorInfo &defaultValue()
@@ -87,35 +87,35 @@ namespace BlackMisc
             //! @{
 
             //! XPlane
-            struct ModelSetCacheXP : public ModelCache
+            struct TModelSetCacheXP : public TModelCache
             {
                 //! Key in data cache
                 static const char *key() { return "modelsetxp"; }
             };
 
             //! FSX
-            struct ModelSetCacheFsx : public ModelCache
+            struct TModelSetCacheFsx : public TModelCache
             {
                 //! Key in data cache
                 static const char *key() { return "modelsetfsx"; }
             };
 
             //! FS9
-            struct ModelSetCacheFs9 : public ModelCache
+            struct TModelSetCacheFs9 : public TModelCache
             {
                 //! Key in data cache
                 static const char *key() { return "modelsetfs9"; }
             };
 
             //! P3D
-            struct ModelSetCacheP3D : public ModelCache
+            struct TModelSetCacheP3D : public TModelCache
             {
                 //! Key in data cache
                 static const char *key() { return "modelsetp3d"; }
             };
 
             //! Last selection
-            struct ModelSetLastSelection : public BlackMisc::CDataTrait<BlackMisc::Simulation::CSimulatorInfo>
+            struct TModelSetLastSelection : public BlackMisc::TDataTrait<BlackMisc::Simulation::CSimulatorInfo>
             {
                 //! Default value
                 static const BlackMisc::Simulation::CSimulatorInfo &defaultValue()
@@ -133,7 +133,7 @@ namespace BlackMisc
             //! @}
 
             //! Trait for vPilot derived models
-            struct VPilotAircraftModels : public ModelCache
+            struct TVPilotAircraftModels : public TModelCache
             {
                 //! Key in data cache
                 static const char *key() { return "vpilot/models"; }
@@ -234,11 +234,11 @@ namespace BlackMisc
                 //! @}
 
             private:
-                BlackMisc::CData<BlackMisc::Simulation::Data::ModelCacheFsx> m_modelCacheFsx {this, &CModelCaches::changedFsx }; //!< FSX cache
-                BlackMisc::CData<BlackMisc::Simulation::Data::ModelCacheFs9> m_modelCacheFs9 {this, &CModelCaches::changedFs9 }; //!< FS9 cache
-                BlackMisc::CData<BlackMisc::Simulation::Data::ModelCacheP3D> m_modelCacheP3D {this, &CModelCaches::changedP3D }; //!< P3D cache
-                BlackMisc::CData<BlackMisc::Simulation::Data::ModelCacheXP>  m_modelCacheXP  {this, &CModelCaches::changedXP };  //!< XP cache
-                BlackMisc::CData<BlackMisc::Simulation::Data::ModelCacheLastSelection> m_currentSimulator { this };              //!< current simulator
+                BlackMisc::CData<BlackMisc::Simulation::Data::TModelCacheFsx> m_modelCacheFsx {this, &CModelCaches::changedFsx }; //!< FSX cache
+                BlackMisc::CData<BlackMisc::Simulation::Data::TModelCacheFs9> m_modelCacheFs9 {this, &CModelCaches::changedFs9 }; //!< FS9 cache
+                BlackMisc::CData<BlackMisc::Simulation::Data::TModelCacheP3D> m_modelCacheP3D {this, &CModelCaches::changedP3D }; //!< P3D cache
+                BlackMisc::CData<BlackMisc::Simulation::Data::TModelCacheXP>  m_modelCacheXP  {this, &CModelCaches::changedXP };  //!< XP cache
+                BlackMisc::CData<BlackMisc::Simulation::Data::TModelCacheLastSelection> m_currentSimulator { this };              //!< current simulator
 
                 //! Non virtaul version (used in ctor)
                 void syncronizeCacheImpl(const BlackMisc::Simulation::CSimulatorInfo &simulator);
@@ -265,11 +265,11 @@ namespace BlackMisc
                 //! @}
 
             private:
-                BlackMisc::CData<BlackMisc::Simulation::Data::ModelSetCacheFsx> m_modelCacheFsx {this, &CModelSetCaches::changedFsx };  //!< FSX cache
-                BlackMisc::CData<BlackMisc::Simulation::Data::ModelSetCacheFs9> m_modelCacheFs9 {this, &CModelSetCaches::changedFs9};   //!< FS9 cache
-                BlackMisc::CData<BlackMisc::Simulation::Data::ModelSetCacheP3D> m_modelCacheP3D {this, &CModelSetCaches::changedP3D };  //!< P3D cache
-                BlackMisc::CData<BlackMisc::Simulation::Data::ModelSetCacheXP>  m_modelCacheXP  {this, &CModelSetCaches::changedXP };   //!< XP cache
-                BlackMisc::CData<BlackMisc::Simulation::Data::ModelSetLastSelection> m_currentSimulator { this };                       //!< current simulator
+                BlackMisc::CData<BlackMisc::Simulation::Data::TModelSetCacheFsx> m_modelCacheFsx {this, &CModelSetCaches::changedFsx };  //!< FSX cache
+                BlackMisc::CData<BlackMisc::Simulation::Data::TModelSetCacheFs9> m_modelCacheFs9 {this, &CModelSetCaches::changedFs9};   //!< FS9 cache
+                BlackMisc::CData<BlackMisc::Simulation::Data::TModelSetCacheP3D> m_modelCacheP3D {this, &CModelSetCaches::changedP3D };  //!< P3D cache
+                BlackMisc::CData<BlackMisc::Simulation::Data::TModelSetCacheXP>  m_modelCacheXP  {this, &CModelSetCaches::changedXP };   //!< XP cache
+                BlackMisc::CData<BlackMisc::Simulation::Data::TModelSetLastSelection> m_currentSimulator { this };                       //!< current simulator
 
                 //! Non virtaul version (used in ctor)
                 void syncronizeCacheImpl(const BlackMisc::Simulation::CSimulatorInfo &simulator);
diff --git a/src/blackmisc/simulation/fscommon/vpilotrulesreader.h b/src/blackmisc/simulation/fscommon/vpilotrulesreader.h
index 793df75f2..25424cfeb 100644
--- a/src/blackmisc/simulation/fscommon/vpilotrulesreader.h
+++ b/src/blackmisc/simulation/fscommon/vpilotrulesreader.h
@@ -118,7 +118,7 @@ namespace BlackMisc
                 CVPilotModelRuleSet m_rules;         //!< rules list
                 bool m_asyncLoadInProgress = false;  //!< Asynchronous load in progress
                 bool m_shutdown            = false;  //!< Shutdown
-                BlackMisc::CData<BlackMisc::Simulation::Data::VPilotAircraftModels> m_cachedVPilotModels { this, &CVPilotRulesReader::ps_onVPilotCacheChanged }; //!< cache for latest vPilot rules
+                BlackMisc::CData<BlackMisc::Simulation::Data::TVPilotAircraftModels> m_cachedVPilotModels { this, &CVPilotRulesReader::ps_onVPilotCacheChanged }; //!< cache for latest vPilot rules
                 mutable QReadWriteLock m_lockData;
 
                 //! Read single file and do parsing
diff --git a/src/swiftdata/swiftdata.h b/src/swiftdata/swiftdata.h
index fd76473ad..af8f472fe 100644
--- a/src/swiftdata/swiftdata.h
+++ b/src/swiftdata/swiftdata.h
@@ -75,7 +75,7 @@ private:
 
     QScopedPointer<Ui::CSwiftData> ui;
     BlackGui::CManagedStatusBar    m_statusBar;
-    BlackMisc::CData<BlackCore::Data::UpdateInfo>  m_updateInfo { this };  //!< download / version data
+    BlackMisc::CData<BlackCore::Data::TUpdateInfo> m_updateInfo { this };  //!< download / version data
 };
 
 #endif // guard
diff --git a/src/swiftlauncher/swiftlauncher.h b/src/swiftlauncher/swiftlauncher.h
index d9a2ab13d..9a85073f8 100644
--- a/src/swiftlauncher/swiftlauncher.h
+++ b/src/swiftlauncher/swiftlauncher.h
@@ -77,7 +77,7 @@ private slots:
 
 private:
     QScopedPointer<Ui::CSwiftLauncher>             ui;
-    BlackMisc::CData<BlackCore::Data::UpdateInfo>  m_updateInfo { this, &CSwiftLauncher::ps_changedUpdateInfoCache }; //!< version cache
+    BlackMisc::CData<BlackCore::Data::TUpdateInfo>  m_updateInfo { this, &CSwiftLauncher::ps_changedUpdateInfoCache }; //!< version cache
     BlackMisc::CSetting<BlackCore::Application::TDBusServerAddress> m_dbusServerAddress { this };      //!< DBus address
     QString         m_executable;
     QStringList     m_executableArgs;