diff --git a/src/xswiftbus/dbusobject.cpp b/src/xswiftbus/dbusobject.cpp
index ff3ec30b0..b86a42c8a 100644
--- a/src/xswiftbus/dbusobject.cpp
+++ b/src/xswiftbus/dbusobject.cpp
@@ -9,11 +9,11 @@
 #include "dbusobject.h"
 #include <cassert>
 
-XSwiftBus::ISettingsProvider *XSwiftBus::CDBusObject::s_settingsProvider = nullptr;
+XSwiftBus::CSettingsProvider *XSwiftBus::CDBusObject::s_settingsProvider = nullptr;
 
 namespace XSwiftBus
 {
-    CDBusObject::CDBusObject(ISettingsProvider *settingsProvider)
+    CDBusObject::CDBusObject(CSettingsProvider *settingsProvider)
     {
         if (!CDBusObject::s_settingsProvider)
         {
diff --git a/src/xswiftbus/dbusobject.h b/src/xswiftbus/dbusobject.h
index b9a2bc23b..2ed30cd02 100644
--- a/src/xswiftbus/dbusobject.h
+++ b/src/xswiftbus/dbusobject.h
@@ -22,7 +22,7 @@ namespace XSwiftBus
     {
     public:
         //! Constructor
-        CDBusObject(ISettingsProvider *settingsProvider);
+        CDBusObject(CSettingsProvider *settingsProvider);
 
         //! Destructor
         virtual ~CDBusObject();
@@ -86,7 +86,7 @@ namespace XSwiftBus
         //! Set the settings
         bool setSettings(const CSettings &s);
 
-        static ISettingsProvider *s_settingsProvider; //!< get the settings from here, still protected for the static functions
+        static CSettingsProvider *s_settingsProvider; //!< get the settings from here, still protected for the static functions
 
     private:
         static void dbusObjectPathUnregisterFunction(DBusConnection *connection, void *data);
diff --git a/src/xswiftbus/plugin.h b/src/xswiftbus/plugin.h
index ab1efb5ef..c7a56a66a 100644
--- a/src/xswiftbus/plugin.h
+++ b/src/xswiftbus/plugin.h
@@ -41,7 +41,7 @@ namespace XSwiftBus
     /*!
      * Main plugin class
      */
-    class CPlugin : public ISettingsProvider
+    class CPlugin : public CSettingsProvider
     {
     public:
         //! Constructor
diff --git a/src/xswiftbus/service.cpp b/src/xswiftbus/service.cpp
index 5e32fb5ae..8894a570f 100644
--- a/src/xswiftbus/service.cpp
+++ b/src/xswiftbus/service.cpp
@@ -22,7 +22,7 @@ using namespace BlackMisc::Simulation::XPlane::QtFreeUtils;
 
 namespace XSwiftBus
 {
-    CService::CService(ISettingsProvider *settingsProvider) : CDBusObject(settingsProvider)
+    CService::CService(CSettingsProvider *settingsProvider) : CDBusObject(settingsProvider)
     {
         updateAirportsInRange();
     }
diff --git a/src/xswiftbus/service.h b/src/xswiftbus/service.h
index 531e3f93f..89acf8ca3 100644
--- a/src/xswiftbus/service.h
+++ b/src/xswiftbus/service.h
@@ -37,7 +37,7 @@ namespace XSwiftBus
     {
     public:
         //! Constructor
-        CService(ISettingsProvider *settingsProvider);
+        CService(CSettingsProvider *settingsProvider);
 
         //! Destructor
         virtual ~CService() override = default;
diff --git a/src/xswiftbus/settings.cpp b/src/xswiftbus/settings.cpp
index f9655e23b..543ae0f2c 100644
--- a/src/xswiftbus/settings.cpp
+++ b/src/xswiftbus/settings.cpp
@@ -27,13 +27,13 @@ namespace XSwiftBus
         // void
     }
 
-    CSettings ISettingsProvider::getSettings() const
+    CSettings CSettingsProvider::getSettings() const
     {
         std::lock_guard<std::mutex> l(m_settingsMutex);
         return m_pluginSettings;
     }
 
-    void ISettingsProvider::setSettings(const CSettings &settings)
+    void CSettingsProvider::setSettings(const CSettings &settings)
     {
         std::lock_guard<std::mutex> l(m_settingsMutex);
         m_pluginSettings = settings;
diff --git a/src/xswiftbus/settings.h b/src/xswiftbus/settings.h
index e6bef3d99..ec841d7f7 100644
--- a/src/xswiftbus/settings.h
+++ b/src/xswiftbus/settings.h
@@ -32,7 +32,7 @@ namespace XSwiftBus
     };
 
     //! Something owning the settings
-    class ISettingsProvider
+    class CSettingsProvider
     {
     public:
         //! By value
diff --git a/src/xswiftbus/traffic.cpp b/src/xswiftbus/traffic.cpp
index 54a5d4017..a8c16eef8 100644
--- a/src/xswiftbus/traffic.cpp
+++ b/src/xswiftbus/traffic.cpp
@@ -50,7 +50,7 @@ namespace XSwiftBus
     }
 
     // *INDENT-OFF*
-    CTraffic::CTraffic(ISettingsProvider *settingsProvider) :
+    CTraffic::CTraffic(CSettingsProvider *settingsProvider) :
         CDBusObject(settingsProvider),
         m_followPlaneViewNextCommand("org/swift-project/xswiftbus/follow_next_plane", "Changes plane view to follow next plane in sequence", [this] { followNextPlane(); }),
         m_followPlaneViewPreviousCommand("org/swift-project/xswiftbus/follow_previous_plane", "Changes plane view to follow previous plane in sequence", [this] { followPreviousPlane(); })
@@ -945,7 +945,7 @@ namespace XSwiftBus
                 return 0;
             }
 
-            traffic->m_deltaCameraPosition.headingDeg = normalizeToZero360DegD(360.0 * static_cast<double>(x) / static_cast<double>(w)); // range 0-360
+            traffic->m_deltaCameraPosition.headingDeg = normalizeToZero360Deg(360.0 * static_cast<double>(x) / static_cast<double>(w)); // range 0-360
             double usedCameraPitchDeg                 = 60.0  - (60.0   * 2.0 *        static_cast<double>(y) / static_cast<double>(h)); // range +-
 
             // make sure we can use it with tan in range +-90 degrees and the result of tan not getting too high
@@ -1022,8 +1022,8 @@ namespace XSwiftBus
         cameraPosition->z = static_cast<float>(lz + traffic->m_deltaCameraPosition.dz);
         // cameraPosition->pitch   = static_cast<float>(traffic->m_deltaCameraPosition.pitch);
         // cameraPosition->heading = static_cast<float>(traffic->m_deltaCameraPosition.heading);
-        cameraPosition->pitch   = CTraffic::normalizeToPlusMinus180DegF(static_cast<float>(traffic->m_deltaCameraPosition.pitchDeg));
-        cameraPosition->heading = CTraffic::normalizeToPlusMinus180DegF(static_cast<float>(traffic->m_deltaCameraPosition.headingDeg));
+        cameraPosition->pitch   = CTraffic::normalizeToPlusMinus180Deg(static_cast<float>(traffic->m_deltaCameraPosition.pitchDeg));
+        cameraPosition->heading = CTraffic::normalizeToPlusMinus180Deg(static_cast<float>(traffic->m_deltaCameraPosition.headingDeg));
         cameraPosition->roll = 0.0;
         cameraPosition->zoom = 1.0;
 
@@ -1119,13 +1119,13 @@ namespace XSwiftBus
         return true;
     }
 
-    float CTraffic::normalizeToPlusMinus180DegF(float v)
+    float CTraffic::normalizeToPlusMinus180Deg(float v)
     {
         if (std::isnan(v)) { return 0.0f; }
-        return static_cast<float>(normalizeToPlusMinus180DegD(static_cast<double>(v)));
+        return static_cast<float>(normalizeToPlusMinus180Deg(static_cast<double>(v)));
     }
 
-    double CTraffic::normalizeToPlusMinus180DegD(double v)
+    double CTraffic::normalizeToPlusMinus180Deg(double v)
     {
         if (std::isnan(v)) { return 0.0; }
         const double n = normalizeValue(v, -180.0, 180.0);
@@ -1134,14 +1134,14 @@ namespace XSwiftBus
         return n;
     }
 
-    float CTraffic::normalizeToZero360DegF(float v)
+    float CTraffic::normalizeToZero360Deg(float v)
     {
         if (std::isnan(v)) { return 0.0f; }
-        return static_cast<float>(normalizeToZero360DegD(static_cast<double>(v)));
+        return static_cast<float>(normalizeToZero360Deg(static_cast<double>(v)));
 
     }
 
-    double CTraffic::normalizeToZero360DegD(double v)
+    double CTraffic::normalizeToZero360Deg(double v)
     {
         if (std::isnan(v)) { return 0.0; }
         const double n = normalizeValue(v, 0, 360.0);
diff --git a/src/xswiftbus/traffic.h b/src/xswiftbus/traffic.h
index 5404b9652..83661688d 100644
--- a/src/xswiftbus/traffic.h
+++ b/src/xswiftbus/traffic.h
@@ -37,7 +37,7 @@ namespace XSwiftBus
     {
     public:
         //! Constructor
-        CTraffic(ISettingsProvider *settingsProvider);
+        CTraffic(CSettingsProvider *settingsProvider);
 
         //! Destructor
         virtual ~CTraffic() override;
@@ -197,10 +197,10 @@ namespace XSwiftBus
         //! @}
 
         //! Normalize to (-180, 180] or [0, 360) degrees @{
-        static float  normalizeToPlusMinus180DegF(float v);
-        static double normalizeToPlusMinus180DegD(double v);
-        static float  normalizeToZero360DegF(float v);
-        static double normalizeToZero360DegD(double v);
+        static float  normalizeToPlusMinus180Deg(float v);
+        static double normalizeToPlusMinus180Deg(double v);
+        static float  normalizeToZero360Deg(float v);
+        static double normalizeToZero360Deg(double v);
         //! @}
 
         //! Check the position if values are valid @{
diff --git a/src/xswiftbus/weather.cpp b/src/xswiftbus/weather.cpp
index 5873e9a2c..e131d026e 100644
--- a/src/xswiftbus/weather.cpp
+++ b/src/xswiftbus/weather.cpp
@@ -13,7 +13,7 @@
 
 namespace XSwiftBus
 {
-    CWeather::CWeather(ISettingsProvider *settingsProvider) : CDBusObject(settingsProvider)
+    CWeather::CWeather(CSettingsProvider *settingsProvider) : CDBusObject(settingsProvider)
     {
         // void
     }
diff --git a/src/xswiftbus/weather.h b/src/xswiftbus/weather.h
index 61119ae9a..6a28aa8a6 100644
--- a/src/xswiftbus/weather.h
+++ b/src/xswiftbus/weather.h
@@ -31,7 +31,7 @@ namespace XSwiftBus
     {
     public:
         //! Constructor
-        CWeather(ISettingsProvider *settingsProvider);
+        CWeather(CSettingsProvider *settingsProvider);
 
         //! DBus interface name
         static const std::string &InterfaceName()