diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp
index a28e993bc..b3aab013f 100644
--- a/src/plugins/simulator/xplane/simulatorxplane.cpp
+++ b/src/plugins/simulator/xplane/simulatorxplane.cpp
@@ -1063,7 +1063,7 @@ namespace BlackSimPlugin
             if (!m_serviceProxy) { return false; }
             CXSwiftBusSettings s = m_xSwiftBusServerSettings.get();
             s.setCurrentUtcTime();
-            m_serviceProxy->setSettings(s.toXSwiftBusJsonStringQt());
+            m_serviceProxy->setSettingsJson(s.toXSwiftBusJsonStringQt());
             CLogMessage(this).info(u"Send settings: %1") << s.toQString(true);
             return true;
         }
@@ -1076,7 +1076,7 @@ namespace BlackSimPlugin
             if (!this->isConnected()) { return s; }
             if (!m_serviceProxy)      { return s; }
 
-            const QString json = m_serviceProxy->getSettings();
+            const QString json = m_serviceProxy->getSettingsJson();
             s.parseXSwiftBusStringQt(json);
             ok = true;
             return s;
diff --git a/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp b/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp
index 091bb237c..8c23918dc 100644
--- a/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp
+++ b/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp
@@ -506,19 +506,19 @@ namespace BlackSimPlugin
             m_dbusInterface->callDBusAsync(QLatin1String("getSpeedBrakeRatio"), setterCallback(o_speedBrakeRatio));
         }
 
-        QString CXSwiftBusServiceProxy::getSettings() const
+        QString CXSwiftBusServiceProxy::getSettingsJson() const
         {
-            return m_dbusInterface->callDBusRet<QString>(QLatin1String("getSettings"));
+            return m_dbusInterface->callDBusRet<QString>(QLatin1String("getSettingsJson"));
         }
 
-        void CXSwiftBusServiceProxy::getSettingsAsync(QString *o_jsonSettings)
+        void CXSwiftBusServiceProxy::getSettingsJsonAsync(QString *o_jsonSettings)
         {
-            m_dbusInterface->callDBusAsync(QLatin1String("getSettings"), setterCallback(o_jsonSettings));
+            m_dbusInterface->callDBusAsync(QLatin1String("getSettingsJson"), setterCallback(o_jsonSettings));
         }
 
-        void CXSwiftBusServiceProxy::setSettings(const QString &json)
+        void CXSwiftBusServiceProxy::setSettingsJson(const QString &json)
         {
-            m_dbusInterface->callDBus(QLatin1String("setSettings"), json);
+            m_dbusInterface->callDBus(QLatin1String("setSettingsJson"), json);
         }
     } // ns
 } // ns
diff --git a/src/plugins/simulator/xplane/xswiftbusserviceproxy.h b/src/plugins/simulator/xplane/xswiftbusserviceproxy.h
index ffdac39bd..5a03ef8c8 100644
--- a/src/plugins/simulator/xplane/xswiftbusserviceproxy.h
+++ b/src/plugins/simulator/xplane/xswiftbusserviceproxy.h
@@ -389,12 +389,12 @@ namespace BlackSimPlugin
 
             //! \copydoc XSwiftBus::CService::getSettings
             //! @{
-            QString getSettings() const;
-            void getSettingsAsync(QString *o_jsonSettings);
+            QString getSettingsJson() const;
+            void getSettingsJsonAsync(QString *o_jsonSettings);
             //! @}
 
             //! \copydoc XSwiftBus::CService::setSettings
-            void setSettings(const QString &json);
+            void setSettingsJson(const QString &json);
         };
     } // ns
 } // ns
diff --git a/src/xswiftbus/service.cpp b/src/xswiftbus/service.cpp
index 231027a25..5e32fb5ae 100644
--- a/src/xswiftbus/service.cpp
+++ b/src/xswiftbus/service.cpp
@@ -157,15 +157,15 @@ namespace XSwiftBus
         return path;
     }
 
-    std::string CService::getSettings() const
+    std::string CService::getSettingsJson() const
     {
-        return s_settingsProvider->getSettings().toXSwiftBusJsonString();
+        return this->getSettings().toXSwiftBusJsonString();
     }
 
-    void CService::setSettings(const std::string &jsonString)
+    void CService::setSettingsJson(const std::string &jsonString)
     {
         const  CSettings s(jsonString);
-        s_settingsProvider->setSettings(s);
+        this->setSettings(s);
         INFO_LOG("Received settings " + s.convertToString());
     }
 
@@ -666,14 +666,14 @@ namespace XSwiftBus
                     toggleMessageBoxVisibility();
                 });
             }
-            else if (message.getMethodName() == "getSettings")
+            else if (message.getMethodName() == "getSettingsJson")
             {
                 queueDBusCall([ = ]()
                 {
-                    sendDBusReply(sender, serial, getSettings());
+                    sendDBusReply(sender, serial, getSettingsJson());
                 });
             }
-            else if (message.getMethodName() == "setSettings")
+            else if (message.getMethodName() == "setSettingsJson")
             {
                 maybeSendEmptyDBusReply(wantsReply, sender, serial);
                 std::string json;
@@ -681,7 +681,7 @@ namespace XSwiftBus
                 message.getArgument(json);
                 queueDBusCall([ = ]()
                 {
-                    setSettings(json);
+                    setSettingsJson(json);
                 });
             }
             else
diff --git a/src/xswiftbus/service.h b/src/xswiftbus/service.h
index a4bc1f8b8..531e3f93f 100644
--- a/src/xswiftbus/service.h
+++ b/src/xswiftbus/service.h
@@ -235,10 +235,10 @@ namespace XSwiftBus
         void setDisappearMessageWindow(bool enabled) { m_disappearMessageWindow = enabled; }
 
         //! Get settings in JSON format
-        std::string getSettings() const;
+        std::string getSettingsJson() const;
 
         //! Set settings
-        void setSettings(const std::string &jsonString);
+        void setSettingsJson(const std::string &jsonString);
 
         //! Perform generic processing
         int process();