diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h
index 95bbf6556..f7b595a45 100644
--- a/src/plugins/simulator/xplane/simulatorxplane.h
+++ b/src/plugins/simulator/xplane/simulatorxplane.h
@@ -221,7 +221,7 @@ namespace BlackSimPlugin
         private:
             QDBusConnection m_conn { "default" };
             QDBusServiceWatcher *m_watcher { nullptr };
-            BlackMisc::CSetting<XBusServer> m_xbusServerSetting { this, &CSimulatorXPlaneListener::ps_xbusServerSettingChanged };
+            BlackMisc::CSetting<TXBusServer> m_xbusServerSetting { this, &CSimulatorXPlaneListener::ps_xbusServerSettingChanged };
         };
 
         //! Factory for creating CSimulatorXPlane instance
diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h
index 985bf996c..be394181a 100644
--- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h
+++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h
@@ -29,12 +29,12 @@ namespace BlackSimPlugin
         /*!
          * Setting for XBus.
          */
-        struct XBusServer : public BlackMisc::CSettingTrait<QString>
+        struct TXBusServer : public BlackMisc::TSettingTrait<QString>
         {
-            //! \copydoc BlackMisc::CSettingTrait::key
+            //! \copydoc BlackMisc::TSettingTrait::key
             static const char *key() { return "xbus/server"; }
 
-            //! \copydoc BlackMisc::CSettingTrait::defaultValue
+            //! \copydoc BlackMisc::TSettingTrait::defaultValue
             static QString defaultValue() { return QStringLiteral("session"); }
         };
 
diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
index 3c40a0afb..748ed7bc0 100644
--- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
+++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
@@ -51,7 +51,7 @@ namespace BlackSimPlugin
 
         private:
             QScopedPointer<Ui::CSimulatorXPlaneConfigWindow> ui;
-            BlackMisc::CSetting<XBusServer> m_xbusServerSetting { this };
+            BlackMisc::CSetting<TXBusServer> m_xbusServerSetting { this };
         };
     }
 }