diff --git a/src/blackcore/context_application.h b/src/blackcore/context_application.h
index f6372d08b..bfe987690 100644
--- a/src/blackcore/context_application.h
+++ b/src/blackcore/context_application.h
@@ -24,10 +24,10 @@
 //! @{
 
 //! DBus interface for context
-#define BLACKCORE_CONTEXTAPPLICATION_INTERFACENAME "org.swift.pilotclient.BlackCore.ContextApplication"
+#define BLACKCORE_CONTEXTAPPLICATION_INTERFACENAME "org.swift-project.blackcore.contextapplication"
 
 //! DBus object path for context
-#define BLACKCORE_CONTEXTAPPLICATION_OBJECTPATH "/Application"
+#define BLACKCORE_CONTEXTAPPLICATION_OBJECTPATH "/application"
 
 //! @}
 
diff --git a/src/blackcore/context_audio.h b/src/blackcore/context_audio.h
index ef772f691..c0ad0afa5 100644
--- a/src/blackcore/context_audio.h
+++ b/src/blackcore/context_audio.h
@@ -26,10 +26,10 @@
 //! @{
 
 //! DBus interface for context
-#define BLACKCORE_CONTEXTAUDIO_INTERFACENAME "org.swift.pilotclient.BlackCore.ContextAudio"
+#define BLACKCORE_CONTEXTAUDIO_INTERFACENAME "org.swift-project.blackcore.contextaudio"
 
 //! DBus object path for context
-#define BLACKCORE_CONTEXTAUDIO_OBJECTPATH "/Audio"
+#define BLACKCORE_CONTEXTAUDIO_OBJECTPATH "/audio"
 
 //! @}
 
diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h
index 41f408f25..89bfb199a 100644
--- a/src/blackcore/context_network.h
+++ b/src/blackcore/context_network.h
@@ -27,10 +27,10 @@
 //! @{
 
 //! DBus interface for context
-#define BLACKCORE_CONTEXTNETWORK_INTERFACENAME "org.swift.pilotclient.BlackCore.ContextNetwork"
+#define BLACKCORE_CONTEXTNETWORK_INTERFACENAME "org.swift-project.blackcore.contextnetwork"
 
 //! DBus object path for context
-#define BLACKCORE_CONTEXTNETWORK_OBJECTPATH "/Network"
+#define BLACKCORE_CONTEXTNETWORK_OBJECTPATH "/network"
 
 //! @}
 
diff --git a/src/blackcore/context_ownaircraft.h b/src/blackcore/context_ownaircraft.h
index 90ef24ab7..05e039018 100644
--- a/src/blackcore/context_ownaircraft.h
+++ b/src/blackcore/context_ownaircraft.h
@@ -22,10 +22,10 @@
 //! @{
 
 //! DBus interface for context
-#define BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME "org.swift.pilotclient.BlackCore.ContextOwnAircraft"
+#define BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME "org.swift-project.blackcore.contextownaircraft"
 
 //! DBus object path for context
-#define BLACKCORE_CONTEXTOWNAIRCRAFT_OBJECTPATH "/OwnAircraft"
+#define BLACKCORE_CONTEXTOWNAIRCRAFT_OBJECTPATH "/ownaircraft"
 
 //! @}
 
diff --git a/src/blackcore/context_settings.h b/src/blackcore/context_settings.h
index 45f018bb5..ded136b32 100644
--- a/src/blackcore/context_settings.h
+++ b/src/blackcore/context_settings.h
@@ -26,10 +26,10 @@
 //! @{
 
 //! DBus interface for context
-#define BLACKCORE_CONTEXTSETTINGS_INTERFACENAME "org.swift.pilotclient.BlackCore.ContextSettings"
+#define BLACKCORE_CONTEXTSETTINGS_INTERFACENAME "org.swift-project.blackcore.contextsettings"
 
 //! DBus object path for context
-#define BLACKCORE_CONTEXTSETTINGS_OBJECTPATH "/Settings"
+#define BLACKCORE_CONTEXTSETTINGS_OBJECTPATH "/settings"
 
 //! @}
 
diff --git a/src/blackcore/context_simulator.h b/src/blackcore/context_simulator.h
index 9acf577e4..2993d02b0 100644
--- a/src/blackcore/context_simulator.h
+++ b/src/blackcore/context_simulator.h
@@ -16,10 +16,10 @@
 //! @{
 
 //! DBus interface for context
-#define BLACKCORE_CONTEXTSIMULATOR_INTERFACENAME "org.swift.pilotclient.BlackCore.ContextSimulator"
+#define BLACKCORE_CONTEXTSIMULATOR_INTERFACENAME "org.swift-project.blackcore.contextsimulator"
 
 //! DBus object path for context
-#define BLACKCORE_CONTEXTSIMULATOR_OBJECTPATH "/Simulator"
+#define BLACKCORE_CONTEXTSIMULATOR_OBJECTPATH "/simulator"
 
 //! @}
 
diff --git a/src/blackcore/dbus_server.h b/src/blackcore/dbus_server.h
index 509c3f258..442593c07 100644
--- a/src/blackcore/dbus_server.h
+++ b/src/blackcore/dbus_server.h
@@ -21,7 +21,7 @@
 #include <QMap>
 
 //! Service name of DBus service
-#define BLACKCORE_RUNTIME_SERVICENAME "org.swift.pilotclient"
+#define BLACKCORE_RUNTIME_SERVICENAME "org.swift-project"
 
 namespace BlackCore
 {
diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h
index f32533f43..4f94535c7 100644
--- a/src/blackcore/simulator.h
+++ b/src/blackcore/simulator.h
@@ -357,6 +357,6 @@ namespace BlackCore
 
 } // namespace
 
-Q_DECLARE_INTERFACE(BlackCore::ISimulatorFactory, "org.swift.pilotclient.BlackCore.SimulatorInterface")
+Q_DECLARE_INTERFACE(BlackCore::ISimulatorFactory, "org.swift-project.blackcore.simulatorinterface")
 
 #endif // guard
diff --git a/src/blackmisc/simulation/simulatorplugininfo.cpp b/src/blackmisc/simulation/simulatorplugininfo.cpp
index 139aebba9..4a3fc0c38 100644
--- a/src/blackmisc/simulation/simulatorplugininfo.cpp
+++ b/src/blackmisc/simulation/simulatorplugininfo.cpp
@@ -20,7 +20,7 @@ namespace BlackMisc
         void CSimulatorPluginInfo::convertFromJson(const QJsonObject &json)
         {
             if (json.contains("IID")) { // comes from the plugin
-                if (json["IID"].toString() != QStringLiteral("org.swift.pilotclient.BlackCore.SimulatorInterface"))
+                if (json["IID"].toString() != QStringLiteral("org.swift-project.blackcore.simulatorinterface"))
                 {
                     return;
                 }
diff --git a/src/blackmisc/simulation/simulatorplugininfo.h b/src/blackmisc/simulation/simulatorplugininfo.h
index cc43a5335..feb2ff62a 100644
--- a/src/blackmisc/simulation/simulatorplugininfo.h
+++ b/src/blackmisc/simulation/simulatorplugininfo.h
@@ -48,7 +48,7 @@ namespace BlackMisc
 
             //! Check if the provided plugin metadata is valid.
             //! Simulator plugin (driver) has to meet the following requirements:
-            //!  * implements org.swift.pilotclient.BlackCore.SimulatorInterface;
+            //!  * implements org.swift-project.blackcore.simulatorinterface;
             //!  * provides plugin name;
             //!  * specifies simulator it handles.
             //! Unspecified sim is considered as invalid.
diff --git a/src/plugins/simulator/fs9/simulator_fs9.h b/src/plugins/simulator/fs9/simulator_fs9.h
index 7a4acbbf6..c2f3eaeb5 100644
--- a/src/plugins/simulator/fs9/simulator_fs9.h
+++ b/src/plugins/simulator/fs9/simulator_fs9.h
@@ -139,7 +139,7 @@ namespace BlackSimPlugin
         class CSimulatorFs9Factory : public QObject, public BlackCore::ISimulatorFactory
         {
             Q_OBJECT
-            Q_PLUGIN_METADATA(IID "org.swift.pilotclient.BlackCore.SimulatorInterface" FILE "simulator_fs9.json")
+            Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulator_fs9.json")
             Q_INTERFACES(BlackCore::ISimulatorFactory)
 
         public:
diff --git a/src/plugins/simulator/fsx/simulator_fsxfactory.h b/src/plugins/simulator/fsx/simulator_fsxfactory.h
index 6152aced9..a424e5265 100644
--- a/src/plugins/simulator/fsx/simulator_fsxfactory.h
+++ b/src/plugins/simulator/fsx/simulator_fsxfactory.h
@@ -27,7 +27,7 @@ namespace BlackSimPlugin
         class CSimulatorFsxFactory : public QObject, public BlackCore::ISimulatorFactory
         {
             Q_OBJECT
-            Q_PLUGIN_METADATA(IID "org.swift.pilotclient.BlackCore.SimulatorInterface" FILE "simulator_fsx.json")
+            Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulator_fsx.json")
             Q_INTERFACES(BlackCore::ISimulatorFactory)
 
         public:
diff --git a/src/plugins/simulator/xplane/simulator_xplane.cpp b/src/plugins/simulator/xplane/simulator_xplane.cpp
index cd4a489d6..4a3416bf9 100644
--- a/src/plugins/simulator/xplane/simulator_xplane.cpp
+++ b/src/plugins/simulator/xplane/simulator_xplane.cpp
@@ -28,7 +28,7 @@ namespace
 {
     inline QString xbusServiceName()
     {
-        return QStringLiteral("org.swift.xbus");
+        return QStringLiteral("org.swift-project.xbus");
     }
 }
 
diff --git a/src/plugins/simulator/xplane/simulator_xplane.h b/src/plugins/simulator/xplane/simulator_xplane.h
index a28590209..0921ac156 100644
--- a/src/plugins/simulator/xplane/simulator_xplane.h
+++ b/src/plugins/simulator/xplane/simulator_xplane.h
@@ -201,7 +201,7 @@ namespace BlackSimPlugin
         class CSimulatorXPlaneFactory : public QObject, public BlackCore::ISimulatorFactory
         {
             Q_OBJECT
-            Q_PLUGIN_METADATA(IID "org.swift.pilotclient.BlackCore.SimulatorInterface" FILE "simulator_xplane.json")
+            Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulator_xplane.json")
             Q_INTERFACES(BlackCore::ISimulatorFactory)
 
         public:
diff --git a/src/plugins/simulator/xplane/xbus_service_proxy.cpp b/src/plugins/simulator/xplane/xbus_service_proxy.cpp
index b264fcf01..2db961363 100644
--- a/src/plugins/simulator/xplane/xbus_service_proxy.cpp
+++ b/src/plugins/simulator/xplane/xbus_service_proxy.cpp
@@ -7,7 +7,7 @@
 #include "blackcore/dbus_server.h"
 #include <QMetaMethod>
 
-#define XBUS_SERVICE_SERVICENAME "org.swift.xbus"
+#define XBUS_SERVICE_SERVICENAME "org.swift-project.xbus"
 
 namespace BlackSimPlugin
 {
diff --git a/src/plugins/simulator/xplane/xbus_service_proxy.h b/src/plugins/simulator/xplane/xbus_service_proxy.h
index 992b8f179..66a43606d 100644
--- a/src/plugins/simulator/xplane/xbus_service_proxy.h
+++ b/src/plugins/simulator/xplane/xbus_service_proxy.h
@@ -13,7 +13,7 @@
 #include <functional>
 
 //! \cond PRIVATE
-#define XBUS_SERVICE_INTERFACENAME "org.swift.xbus.service"
+#define XBUS_SERVICE_INTERFACENAME "org.swift-project.xbus.service"
 #define XBUS_SERVICE_OBJECTPATH "/xbus"
 //! \endcond
 
diff --git a/src/plugins/simulator/xplane/xbus_traffic_proxy.cpp b/src/plugins/simulator/xplane/xbus_traffic_proxy.cpp
index 56b1b1b66..cb7c27d83 100644
--- a/src/plugins/simulator/xplane/xbus_traffic_proxy.cpp
+++ b/src/plugins/simulator/xplane/xbus_traffic_proxy.cpp
@@ -7,7 +7,7 @@
 #include "blackcore/dbus_server.h"
 #include <QMetaMethod>
 
-#define XBUS_SERVICENAME "org.swift.xbus"
+#define XBUS_SERVICENAME "org.swift-project.xbus"
 
 namespace BlackSimPlugin
 {
@@ -97,4 +97,4 @@ namespace BlackSimPlugin
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/plugins/simulator/xplane/xbus_traffic_proxy.h b/src/plugins/simulator/xplane/xbus_traffic_proxy.h
index 25034f77b..20c1ca10b 100644
--- a/src/plugins/simulator/xplane/xbus_traffic_proxy.h
+++ b/src/plugins/simulator/xplane/xbus_traffic_proxy.h
@@ -11,7 +11,7 @@
 #include "blackmisc/genericdbusinterface.h"
 
 //! \cond PRIVATE
-#define XBUS_TRAFFIC_INTERFACENAME "org.swift.xbus.traffic"
+#define XBUS_TRAFFIC_INTERFACENAME "org.swift-project.xbus.traffic"
 #define XBUS_TRAFFIC_OBJECTPATH "/xbus/traffic"
 //! \endcond
 
diff --git a/src/xbus/main.cpp b/src/xbus/main.cpp
index ac1059415..12a85bf79 100644
--- a/src/xbus/main.cpp
+++ b/src/xbus/main.cpp
@@ -22,7 +22,7 @@ XBus::CPlugin *g_plugin;
 PLUGIN_API int XPluginStart(char *o_name, char *o_sig, char *o_desc)
 {
     std::strcpy(o_name, "X-Bus");
-    std::strcpy(o_sig, "org.swift.XBus");
+    std::strcpy(o_sig, "org.swift-project.xbus");
     std::strcpy(o_desc, "Allows pilot client to connect to X-Plane via D-Bus");
 
     XBus::CTraffic::initLegacyData();
diff --git a/src/xbus/plugin.cpp b/src/xbus/plugin.cpp
index bc9710c7a..31ba04d5b 100644
--- a/src/xbus/plugin.cpp
+++ b/src/xbus/plugin.cpp
@@ -9,7 +9,7 @@
 
 namespace {
     inline QString xbusServiceName() {
-        return QStringLiteral("org.swift.xbus");
+        return QStringLiteral("org.swift-project.xbus");
     }
 }
 
diff --git a/src/xbus/service.h b/src/xbus/service.h
index 84bf99cce..9a7ba8385 100644
--- a/src/xbus/service.h
+++ b/src/xbus/service.h
@@ -21,7 +21,7 @@
 class QTimer;
 
 //! \cond PRIVATE
-#define XBUS_SERVICE_INTERFACENAME "org.swift.xbus.service"
+#define XBUS_SERVICE_INTERFACENAME "org.swift-project.xbus.service"
 #define XBUS_SERVICE_OBJECTPATH "/xbus"
 //! \endcond
 
diff --git a/src/xbus/traffic.h b/src/xbus/traffic.h
index 9459b112d..b22cb3495 100644
--- a/src/xbus/traffic.h
+++ b/src/xbus/traffic.h
@@ -14,7 +14,7 @@
 #include "XPMPMultiplayer.h"
 
 //! \cond PRIVATE
-#define XBUS_TRAFFIC_INTERFACENAME "org.swift.xbus.traffic"
+#define XBUS_TRAFFIC_INTERFACENAME "org.swift-project.xbus.traffic"
 #define XBUS_TRAFFIC_OBJECTPATH "/xbus/traffic"
 //! \endcond