diff --git a/src/controller/python/chip/ble/LinuxImpl.cpp b/src/controller/python/chip/ble/LinuxImpl.cpp
index 4e03d41e14949c..09aa0056f084f9 100644
--- a/src/controller/python/chip/ble/LinuxImpl.cpp
+++ b/src/controller/python/chip/ble/LinuxImpl.cpp
@@ -27,7 +27,7 @@
 #include <platform/Linux/bluez/AdapterIterator.h>
 #include <platform/Linux/bluez/BluezObjectManager.h>
 #include <platform/Linux/bluez/ChipDeviceScanner.h>
-#include <platform/Linux/dbus/bluez/DbusBluez.h>
+#include <platform/Linux/dbus/bluez/DBusBluez.h>
 #include <platform/PlatformManager.h>
 #include <system/SystemClock.h>
 #include <system/SystemLayer.h>
diff --git a/src/platform/Linux/ConnectivityManagerImpl.cpp b/src/platform/Linux/ConnectivityManagerImpl.cpp
index 0ba16f90d874a9..050eab734bdceb 100644
--- a/src/platform/Linux/ConnectivityManagerImpl.cpp
+++ b/src/platform/Linux/ConnectivityManagerImpl.cpp
@@ -84,13 +84,13 @@ namespace chip {
 #if CHIP_DEVICE_CONFIG_ENABLE_WPA
 
 template <>
-struct GAutoPtrDeleter<WpaFiW1Wpa_supplicant1BSS>
+struct GAutoPtrDeleter<WpaSupplicant1BSS>
 {
     using deleter = GObjectDeleter;
 };
 
 template <>
-struct GAutoPtrDeleter<WpaFiW1Wpa_supplicant1Network>
+struct GAutoPtrDeleter<WpaSupplicant1Network>
 {
     using deleter = GObjectDeleter;
 };
@@ -234,7 +234,7 @@ bool ConnectivityManagerImpl::_IsWiFiStationConnected()
         return false;
     }
 
-    state = wpa_fi_w1_wpa_supplicant1_interface_get_state(mWpaSupplicant.iface);
+    state = wpa_supplicant_1_interface_get_state(mWpaSupplicant.iface);
     if (g_strcmp0(state, "completed") == 0)
     {
         mConnectivityFlag.Set(ConnectivityFlags::kHaveIPv4InternetConnectivity)
@@ -263,7 +263,7 @@ bool ConnectivityManagerImpl::_IsWiFiStationProvisioned()
         return false;
     }
 
-    bss = wpa_fi_w1_wpa_supplicant1_interface_get_current_bss(mWpaSupplicant.iface);
+    bss = wpa_supplicant_1_interface_get_current_bss(mWpaSupplicant.iface);
     if (g_str_match_string("BSSs", bss, true))
     {
         ret = true;
@@ -285,7 +285,7 @@ void ConnectivityManagerImpl::_ClearWiFiStationProvision()
     if (mWiFiStationMode != kWiFiStationMode_ApplicationControlled)
     {
         GAutoPtr<GError> err;
-        wpa_fi_w1_wpa_supplicant1_interface_call_remove_all_networks_sync(mWpaSupplicant.iface, nullptr, &err.GetReceiver());
+        wpa_supplicant_1_interface_call_remove_all_networks_sync(mWpaSupplicant.iface, nullptr, &err.GetReceiver());
 
         if (err != nullptr)
         {
@@ -394,7 +394,7 @@ void ConnectivityManagerImpl::UpdateNetworkStatus()
         MakeOptional(GetDisconnectReason()));
 }
 
-void ConnectivityManagerImpl::_OnWpaPropertiesChanged(WpaFiW1Wpa_supplicant1Interface * proxy, GVariant * changedProperties)
+void ConnectivityManagerImpl::_OnWpaPropertiesChanged(WpaSupplicant1Interface * proxy, GVariant * changedProperties)
 {
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
 
@@ -422,7 +422,7 @@ void ConnectivityManagerImpl::_OnWpaPropertiesChanged(WpaFiW1Wpa_supplicant1Inte
                 }
                 else if (g_strcmp0(value_str.get(), "\'disconnected\'") == 0)
                 {
-                    gint reason = wpa_fi_w1_wpa_supplicant1_interface_get_disconnect_reason(mWpaSupplicant.iface);
+                    gint reason = wpa_supplicant_1_interface_get_disconnect_reason(mWpaSupplicant.iface);
 
                     if (delegate)
                     {
@@ -444,13 +444,13 @@ void ConnectivityManagerImpl::_OnWpaPropertiesChanged(WpaFiW1Wpa_supplicant1Inte
                         case WLAN_REASON_DISASSOC_LOW_ACK:
                         case WLAN_REASON_BSS_TRANSITION_DISASSOC:
                             associationFailureCause = static_cast<uint8_t>(AssociationFailureCauseEnum::kAssociationFailed);
-                            status = wpa_fi_w1_wpa_supplicant1_interface_get_assoc_status_code(mWpaSupplicant.iface);
+                            status                  = wpa_supplicant_1_interface_get_assoc_status_code(mWpaSupplicant.iface);
                             break;
                         case WLAN_REASON_PREV_AUTH_NOT_VALID:
                         case WLAN_REASON_DEAUTH_LEAVING:
                         case WLAN_REASON_IEEE_802_1X_AUTH_FAILED:
                             associationFailureCause = static_cast<uint8_t>(AssociationFailureCauseEnum::kAuthenticationFailed);
-                            status = wpa_fi_w1_wpa_supplicant1_interface_get_auth_status_code(mWpaSupplicant.iface);
+                            status                  = wpa_supplicant_1_interface_get_auth_status_code(mWpaSupplicant.iface);
                             break;
                         default:
                             break;
@@ -515,7 +515,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceProxyReady(GObject * sourceObject,
 
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
 
-    WpaFiW1Wpa_supplicant1Interface * iface = wpa_fi_w1_wpa_supplicant1_interface_proxy_new_for_bus_finish(res, &err.GetReceiver());
+    WpaSupplicant1Interface * iface = wpa_supplicant_1_interface_proxy_new_for_bus_finish(res, &err.GetReceiver());
 
     if (mWpaSupplicant.iface)
     {
@@ -529,14 +529,13 @@ void ConnectivityManagerImpl::_OnWpaInterfaceProxyReady(GObject * sourceObject,
         mWpaSupplicant.state = GDBusWpaSupplicant::WpaState::INTERFACE_CONNECTED;
         ChipLogProgress(DeviceLayer, "wpa_supplicant: connected to wpa_supplicant interface proxy");
 
-        g_signal_connect(
-            mWpaSupplicant.iface, "properties-changed",
-            G_CALLBACK(+[](WpaFiW1Wpa_supplicant1Interface * proxy, GVariant * properties, ConnectivityManagerImpl * self) {
-                return self->_OnWpaPropertiesChanged(proxy, properties);
-            }),
-            this);
+        g_signal_connect(mWpaSupplicant.iface, "properties-changed",
+                         G_CALLBACK(+[](WpaSupplicant1Interface * proxy, GVariant * properties, ConnectivityManagerImpl * self) {
+                             return self->_OnWpaPropertiesChanged(proxy, properties);
+                         }),
+                         this);
         g_signal_connect(mWpaSupplicant.iface, "scan-done",
-                         G_CALLBACK(+[](WpaFiW1Wpa_supplicant1Interface * proxy, gboolean success, ConnectivityManagerImpl * self) {
+                         G_CALLBACK(+[](WpaSupplicant1Interface * proxy, gboolean success, ConnectivityManagerImpl * self) {
                              return self->_OnWpaInterfaceScanDone(proxy, success);
                          }),
                          this);
@@ -569,7 +568,7 @@ void ConnectivityManagerImpl::_OnWpaBssProxyReady(GObject * sourceObject, GAsync
 
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
 
-    WpaFiW1Wpa_supplicant1BSS * bss = wpa_fi_w1_wpa_supplicant1_bss_proxy_new_for_bus_finish(res, &err.GetReceiver());
+    WpaSupplicant1BSS * bss = wpa_supplicant_1_bss_proxy_new_for_bus_finish(res, &err.GetReceiver());
 
     if (mWpaSupplicant.bss)
     {
@@ -599,14 +598,14 @@ void ConnectivityManagerImpl::_OnWpaInterfaceReady(GObject * sourceObject, GAsyn
 
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
 
-    gboolean result = wpa_fi_w1_wpa_supplicant1_call_get_interface_finish(mWpaSupplicant.proxy, &mWpaSupplicant.interfacePath, res,
-                                                                          &err.GetReceiver());
+    gboolean result =
+        wpa_supplicant_1_call_get_interface_finish(mWpaSupplicant.proxy, &mWpaSupplicant.interfacePath, res, &err.GetReceiver());
     if (result)
     {
         mWpaSupplicant.state = GDBusWpaSupplicant::WpaState::GOT_INTERFACE_PATH;
         ChipLogProgress(DeviceLayer, "wpa_supplicant: WiFi interface: %s", mWpaSupplicant.interfacePath);
 
-        wpa_fi_w1_wpa_supplicant1_interface_proxy_new_for_bus(
+        wpa_supplicant_1_interface_proxy_new_for_bus(
             G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, kWpaSupplicantServiceName, mWpaSupplicant.interfacePath, nullptr,
             reinterpret_cast<GAsyncReadyCallback>(
                 +[](GObject * sourceObject_, GAsyncResult * res_, ConnectivityManagerImpl * self) {
@@ -614,7 +613,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceReady(GObject * sourceObject, GAsyn
                 }),
             this);
 
-        wpa_fi_w1_wpa_supplicant1_bss_proxy_new_for_bus(
+        wpa_supplicant_1_bss_proxy_new_for_bus(
             G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, kWpaSupplicantServiceName, mWpaSupplicant.interfacePath, nullptr,
             reinterpret_cast<GAsyncReadyCallback>(
                 +[](GObject * sourceObject_, GAsyncResult * res_, ConnectivityManagerImpl * self) {
@@ -637,8 +636,8 @@ void ConnectivityManagerImpl::_OnWpaInterfaceReady(GObject * sourceObject, GAsyn
         g_variant_builder_add(&builder, "{sv}", "Ifname", g_variant_new_string(CHIP_DEVICE_CONFIG_WIFI_STATION_IF_NAME));
         args = g_variant_builder_end(&builder);
 
-        result = wpa_fi_w1_wpa_supplicant1_call_create_interface_sync(mWpaSupplicant.proxy, args, &mWpaSupplicant.interfacePath,
-                                                                      nullptr, &error.GetReceiver());
+        result = wpa_supplicant_1_call_create_interface_sync(mWpaSupplicant.proxy, args, &mWpaSupplicant.interfacePath, nullptr,
+                                                             &error.GetReceiver());
 
         if (result)
         {
@@ -647,7 +646,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceReady(GObject * sourceObject, GAsyn
 
             Platform::CopyString(sWiFiIfName, CHIP_DEVICE_CONFIG_WIFI_STATION_IF_NAME);
 
-            wpa_fi_w1_wpa_supplicant1_interface_proxy_new_for_bus(
+            wpa_supplicant_1_interface_proxy_new_for_bus(
                 G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, kWpaSupplicantServiceName, mWpaSupplicant.interfacePath, nullptr,
                 reinterpret_cast<GAsyncReadyCallback>(
                     +[](GObject * sourceObject_, GAsyncResult * res_, ConnectivityManagerImpl * self) {
@@ -655,7 +654,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceReady(GObject * sourceObject, GAsyn
                     }),
                 this);
 
-            wpa_fi_w1_wpa_supplicant1_bss_proxy_new_for_bus(
+            wpa_supplicant_1_bss_proxy_new_for_bus(
                 G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, kWpaSupplicantServiceName, mWpaSupplicant.interfacePath, nullptr,
                 reinterpret_cast<GAsyncReadyCallback>(
                     +[](GObject * sourceObject_, GAsyncResult * res_, ConnectivityManagerImpl * self) {
@@ -679,7 +678,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceReady(GObject * sourceObject, GAsyn
     }
 }
 
-void ConnectivityManagerImpl::_OnWpaInterfaceAdded(WpaFiW1Wpa_supplicant1 * proxy, const char * path, GVariant * properties)
+void ConnectivityManagerImpl::_OnWpaInterfaceAdded(WpaSupplicant1 * proxy, const char * path, GVariant * properties)
 {
     // When creating D-Bus proxy object, the thread default context must be initialized. Otherwise,
     // all D-Bus signals will be delivered to the GLib global default main context.
@@ -698,7 +697,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceAdded(WpaFiW1Wpa_supplicant1 * prox
         mWpaSupplicant.state = GDBusWpaSupplicant::WpaState::GOT_INTERFACE_PATH;
         ChipLogProgress(DeviceLayer, "wpa_supplicant: WiFi interface added: %s", mWpaSupplicant.interfacePath);
 
-        wpa_fi_w1_wpa_supplicant1_interface_proxy_new_for_bus(
+        wpa_supplicant_1_interface_proxy_new_for_bus(
             G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, kWpaSupplicantServiceName, mWpaSupplicant.interfacePath, nullptr,
             reinterpret_cast<GAsyncReadyCallback>(
                 +[](GObject * sourceObject_, GAsyncResult * res_, ConnectivityManagerImpl * self) {
@@ -706,7 +705,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceAdded(WpaFiW1Wpa_supplicant1 * prox
                 }),
             this);
 
-        wpa_fi_w1_wpa_supplicant1_bss_proxy_new_for_bus(
+        wpa_supplicant_1_bss_proxy_new_for_bus(
             G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, kWpaSupplicantServiceName, mWpaSupplicant.interfacePath, nullptr,
             reinterpret_cast<GAsyncReadyCallback>(
                 +[](GObject * sourceObject_, GAsyncResult * res_, ConnectivityManagerImpl * self) {
@@ -716,7 +715,7 @@ void ConnectivityManagerImpl::_OnWpaInterfaceAdded(WpaFiW1Wpa_supplicant1 * prox
     }
 }
 
-void ConnectivityManagerImpl::_OnWpaInterfaceRemoved(WpaFiW1Wpa_supplicant1 * proxy, const char * path, GVariant * properties)
+void ConnectivityManagerImpl::_OnWpaInterfaceRemoved(WpaSupplicant1 * proxy, const char * path, GVariant * properties)
 {
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
 
@@ -763,7 +762,7 @@ void ConnectivityManagerImpl::_OnWpaProxyReady(GObject * sourceObject, GAsyncRes
 
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
 
-    mWpaSupplicant.proxy = wpa_fi_w1_wpa_supplicant1_proxy_new_for_bus_finish(res, &err.GetReceiver());
+    mWpaSupplicant.proxy = wpa_supplicant_1_proxy_new_for_bus_finish(res, &err.GetReceiver());
     if (mWpaSupplicant.proxy != nullptr && err.get() == nullptr)
     {
         mWpaSupplicant.state = GDBusWpaSupplicant::WpaState::CONNECTED;
@@ -771,22 +770,23 @@ void ConnectivityManagerImpl::_OnWpaProxyReady(GObject * sourceObject, GAsyncRes
 
         g_signal_connect(
             mWpaSupplicant.proxy, "interface-added",
-            G_CALLBACK(+[](WpaFiW1Wpa_supplicant1 * proxy, const char * path, GVariant * properties,
-                           ConnectivityManagerImpl * self) { return self->_OnWpaInterfaceAdded(proxy, path, properties); }),
+            G_CALLBACK(+[](WpaSupplicant1 * proxy, const char * path, GVariant * properties, ConnectivityManagerImpl * self) {
+                return self->_OnWpaInterfaceAdded(proxy, path, properties);
+            }),
             this);
         g_signal_connect(
             mWpaSupplicant.proxy, "interface-removed",
-            G_CALLBACK(+[](WpaFiW1Wpa_supplicant1 * proxy, const char * path, GVariant * properties,
-                           ConnectivityManagerImpl * self) { return self->_OnWpaInterfaceRemoved(proxy, path, properties); }),
+            G_CALLBACK(+[](WpaSupplicant1 * proxy, const char * path, GVariant * properties, ConnectivityManagerImpl * self) {
+                return self->_OnWpaInterfaceRemoved(proxy, path, properties);
+            }),
             this);
 
-        wpa_fi_w1_wpa_supplicant1_call_get_interface(
-            mWpaSupplicant.proxy, sWiFiIfName, nullptr,
-            reinterpret_cast<GAsyncReadyCallback>(
-                +[](GObject * sourceObject_, GAsyncResult * res_, ConnectivityManagerImpl * self) {
-                    return self->_OnWpaInterfaceReady(sourceObject_, res_);
-                }),
-            this);
+        wpa_supplicant_1_call_get_interface(mWpaSupplicant.proxy, sWiFiIfName, nullptr,
+                                            reinterpret_cast<GAsyncReadyCallback>(
+                                                +[](GObject * sourceObject_, GAsyncResult * res_, ConnectivityManagerImpl * self) {
+                                                    return self->_OnWpaInterfaceReady(sourceObject_, res_);
+                                                }),
+                                            this);
     }
     else
     {
@@ -878,11 +878,11 @@ CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFPublish(ConnectivityManager::WiFiPAF
                                               MAX_PAF_PUBLISH_SSI_BUFLEN - strlen(args));
     VerifyOrReturnError(ret == CHIP_NO_ERROR, ret);
     ChipLogProgress(DeviceLayer, "WiFi-PAF: publish: [%s]", args);
-    wpa_fi_w1_wpa_supplicant1_interface_call_nanpublish_sync(mWpaSupplicant.iface, args, &publish_id, nullptr, &err.GetReceiver());
+    wpa_supplicant_1_interface_call_nanpublish_sync(mWpaSupplicant.iface, args, &publish_id, nullptr, &err.GetReceiver());
     ChipLogProgress(DeviceLayer, "WiFi-PAF: publish_id: %d ! ", publish_id);
 
     g_signal_connect(mWpaSupplicant.iface, "nan-receive",
-                     G_CALLBACK(+[](WpaFiW1Wpa_supplicant1Interface * proxy, GVariant * obj, ConnectivityManagerImpl * self) {
+                     G_CALLBACK(+[](WpaSupplicant1Interface * proxy, GVariant * obj, ConnectivityManagerImpl * self) {
                          return self->OnNanReceive(obj);
                      }),
                      this);
@@ -896,7 +896,7 @@ CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFCancelPublish()
 
     ChipLogProgress(DeviceLayer, "WiFi-PAF: cancel publish_id: %d ! ", mpaf_info.peer_publish_id);
     snprintf(args, sizeof(args), "publish_id=%d", mpaf_info.peer_publish_id);
-    wpa_fi_w1_wpa_supplicant1_interface_call_nancancel_publish_sync(mWpaSupplicant.iface, args, nullptr, &err.GetReceiver());
+    wpa_supplicant_1_interface_call_nancancel_publish_sync(mWpaSupplicant.iface, args, nullptr, &err.GetReceiver());
     return CHIP_NO_ERROR;
 }
 
@@ -1020,7 +1020,7 @@ void ConnectivityManagerImpl::DriveAPState()
                 {
                     GAutoPtr<GError> error(nullptr);
 
-                    gboolean result = wpa_fi_w1_wpa_supplicant1_interface_call_remove_network_sync(
+                    gboolean result = wpa_supplicant_1_interface_call_remove_network_sync(
                         mWpaSupplicant.iface, mWpaSupplicant.networkPath, nullptr, &error.GetReceiver());
 
                     if (result)
@@ -1085,8 +1085,8 @@ CHIP_ERROR ConnectivityManagerImpl::ConfigureWiFiAP()
     g_variant_builder_add(&builder, "{sv}", "frequency", g_variant_new_int32(channel));
     args = g_variant_builder_end(&builder);
 
-    gboolean result = wpa_fi_w1_wpa_supplicant1_interface_call_add_network_sync(
-        mWpaSupplicant.iface, args, &mWpaSupplicant.networkPath, nullptr, &err.GetReceiver());
+    gboolean result = wpa_supplicant_1_interface_call_add_network_sync(mWpaSupplicant.iface, args, &mWpaSupplicant.networkPath,
+                                                                       nullptr, &err.GetReceiver());
 
     if (result)
     {
@@ -1094,8 +1094,8 @@ CHIP_ERROR ConnectivityManagerImpl::ConfigureWiFiAP()
 
         ChipLogProgress(DeviceLayer, "wpa_supplicant: added network: SSID: %s: %s", ssid, mWpaSupplicant.networkPath);
 
-        result = wpa_fi_w1_wpa_supplicant1_interface_call_select_network_sync(mWpaSupplicant.iface, mWpaSupplicant.networkPath,
-                                                                              nullptr, &error.GetReceiver());
+        result = wpa_supplicant_1_interface_call_select_network_sync(mWpaSupplicant.iface, mWpaSupplicant.networkPath, nullptr,
+                                                                     &error.GetReceiver());
         if (result)
         {
             ChipLogProgress(DeviceLayer, "wpa_supplicant: succeeded to start softAP: SSID: %s", ssid);
@@ -1148,15 +1148,15 @@ ConnectivityManagerImpl::_ConnectWiFiNetworkAsync(GVariant * args,
     GAutoPtr<GError> err;
     gboolean result;
 
-    const gchar * networkPath = wpa_fi_w1_wpa_supplicant1_interface_get_current_network(mWpaSupplicant.iface);
+    const gchar * networkPath = wpa_supplicant_1_interface_get_current_network(mWpaSupplicant.iface);
 
     // wpa_supplicant DBus API: if network path of current network is not "/", means we have already selected some network.
     if (strcmp(networkPath, "/") != 0)
     {
         GAutoPtr<GError> error;
 
-        result = wpa_fi_w1_wpa_supplicant1_interface_call_remove_network_sync(mWpaSupplicant.iface, networkPath, nullptr,
-                                                                              &error.GetReceiver());
+        result =
+            wpa_supplicant_1_interface_call_remove_network_sync(mWpaSupplicant.iface, networkPath, nullptr, &error.GetReceiver());
 
         if (result)
         {
@@ -1177,18 +1177,18 @@ ConnectivityManagerImpl::_ConnectWiFiNetworkAsync(GVariant * args,
         SuccessOrExit(ret);
     }
 
-    result = wpa_fi_w1_wpa_supplicant1_interface_call_add_network_sync(mWpaSupplicant.iface, args, &mWpaSupplicant.networkPath,
-                                                                       nullptr, &err.GetReceiver());
+    result = wpa_supplicant_1_interface_call_add_network_sync(mWpaSupplicant.iface, args, &mWpaSupplicant.networkPath, nullptr,
+                                                              &err.GetReceiver());
 
     if (result)
     {
         // Note: wpa_supplicant will return immediately if the network is already connected, but it will still try reconnect in the
         // background. The client still need to wait for a few seconds for this reconnect operation. So we always disconnect from
         // the network we are connected and ignore any errors.
-        wpa_fi_w1_wpa_supplicant1_interface_call_disconnect_sync(mWpaSupplicant.iface, nullptr, nullptr);
+        wpa_supplicant_1_interface_call_disconnect_sync(mWpaSupplicant.iface, nullptr, nullptr);
         ChipLogProgress(DeviceLayer, "wpa_supplicant: added network: %s", mWpaSupplicant.networkPath);
 
-        wpa_fi_w1_wpa_supplicant1_interface_call_select_network(
+        wpa_supplicant_1_interface_call_select_network(
             mWpaSupplicant.iface, mWpaSupplicant.networkPath, nullptr,
             reinterpret_cast<GAsyncReadyCallback>(
                 +[](GObject * sourceObject_, GAsyncResult * res_, ConnectivityManagerImpl * self) {
@@ -1243,14 +1243,14 @@ ConnectivityManagerImpl::ConnectWiFiNetworkAsync(ByteSpan ssid, ByteSpan credent
 }
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_PDC
-static CHIP_ERROR AddOrReplaceBlob(WpaFiW1Wpa_supplicant1Interface * iface, const char * nameOrRef, ByteSpan data)
+static CHIP_ERROR AddOrReplaceBlob(WpaSupplicant1Interface * iface, const char * nameOrRef, ByteSpan data)
 {
     // Strip the blob:// prefix off the name (if present), so we don't need as many string constants.
     constexpr auto refPrefix = "blob://"_span;
     const char * name = (strncmp(nameOrRef, refPrefix.data(), refPrefix.size()) == 0) ? nameOrRef + refPrefix.size() : nameOrRef;
 
     GAutoPtr<GError> err;
-    if (!wpa_fi_w1_wpa_supplicant1_interface_call_remove_blob_sync(iface, name, nullptr, &err.GetReceiver()))
+    if (!wpa_supplicant_1_interface_call_remove_blob_sync(iface, name, nullptr, &err.GetReceiver()))
     {
         GAutoPtr<char> remoteError(g_dbus_error_get_remote_error(err.get()));
         if (!(remoteError && strcmp(remoteError.get(), kWpaSupplicantBlobUnknown) == 0))
@@ -1260,7 +1260,7 @@ static CHIP_ERROR AddOrReplaceBlob(WpaFiW1Wpa_supplicant1Interface * iface, cons
         }
         err.reset();
     }
-    if (!wpa_fi_w1_wpa_supplicant1_interface_call_add_blob_sync(
+    if (!wpa_supplicant_1_interface_call_add_blob_sync(
             iface, name, g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, data.data(), data.size(), 1), nullptr, &err.GetReceiver()))
     {
         ChipLogError(DeviceLayer, "wpa_supplicant: failed to add blob: %s", err ? err->message : "unknown error");
@@ -1489,27 +1489,27 @@ CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFConnect(const SetupDiscriminator & c
     VerifyOrReturnError(ret == CHIP_NO_ERROR, ret);
     ChipLogProgress(DeviceLayer, "WiFi-PAF: subscribe: [%s]", args);
 
-    wpa_fi_w1_wpa_supplicant1_interface_call_nansubscribe_sync(mWpaSupplicant.iface, args, &subscribe_id, nullptr,
-                                                               &err.GetReceiver());
+    wpa_supplicant_1_interface_call_nansubscribe_sync(mWpaSupplicant.iface, args, &subscribe_id, nullptr, &err.GetReceiver());
     ChipLogProgress(DeviceLayer, "WiFi-PAF: subscribe_id: [%d]", subscribe_id);
     mpresubscribe_id        = subscribe_id;
     mOnPafSubscribeComplete = onSuccess;
     mOnPafSubscribeError    = onError;
     g_signal_connect(mWpaSupplicant.iface, "nan-discoveryresult",
-                     G_CALLBACK(+[](WpaFiW1Wpa_supplicant1Interface * proxy, gboolean success, GVariant * obj,
+                     G_CALLBACK(+[](WpaSupplicant1Interface * proxy, gboolean success, GVariant * obj,
                                     ConnectivityManagerImpl * self) { return self->OnDiscoveryResult(success, obj); }),
                      this);
 
     g_signal_connect(mWpaSupplicant.iface, "nan-receive",
-                     G_CALLBACK(+[](WpaFiW1Wpa_supplicant1Interface * proxy, GVariant * obj, ConnectivityManagerImpl * self) {
+                     G_CALLBACK(+[](WpaSupplicant1Interface * proxy, GVariant * obj, ConnectivityManagerImpl * self) {
                          return self->OnNanReceive(obj);
                      }),
                      this);
 
     g_signal_connect(
         mWpaSupplicant.iface, "nan-subscribeterminated",
-        G_CALLBACK(+[](WpaFiW1Wpa_supplicant1Interface * proxy, gint term_subscribe_id, gint reason,
-                       ConnectivityManagerImpl * self) { return self->OnNanSubscribeTerminated(term_subscribe_id, reason); }),
+        G_CALLBACK(+[](WpaSupplicant1Interface * proxy, gint term_subscribe_id, gint reason, ConnectivityManagerImpl * self) {
+            return self->OnNanSubscribeTerminated(term_subscribe_id, reason);
+        }),
         this);
 
     return CHIP_NO_ERROR;
@@ -1525,7 +1525,7 @@ CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFCancelConnect()
     gchar args[MAX_PAF_PUBLISH_SSI_BUFLEN];
 
     snprintf(args, sizeof(args), "subscribe_id=%d", mpresubscribe_id);
-    wpa_fi_w1_wpa_supplicant1_interface_call_nancancel_subscribe_sync(mWpaSupplicant.iface, args, nullptr, &err.GetReceiver());
+    wpa_supplicant_1_interface_call_nancancel_subscribe_sync(mWpaSupplicant.iface, args, nullptr, &err.GetReceiver());
     return CHIP_NO_ERROR;
 }
 
@@ -1570,7 +1570,7 @@ CHIP_ERROR ConnectivityManagerImpl::_WiFiPAFSend(System::PacketBufferHandle && m
                                                     MAX_PAF_TX_SSI_BUFLEN - strlen(args));
     VerifyOrReturnError(ret == CHIP_NO_ERROR, ret);
     ChipLogProgress(DeviceLayer, "WiFi-PAF: ssi: [%s]", args);
-    wpa_fi_w1_wpa_supplicant1_interface_call_nantransmit_sync(mWpaSupplicant.iface, args, nullptr, &err.GetReceiver());
+    wpa_supplicant_1_interface_call_nantransmit_sync(mWpaSupplicant.iface, args, nullptr, &err.GetReceiver());
     ChipLogProgress(Controller, "WiFi-PAF: Outbound message (%lu) done", msgBuf->DataLength());
     return ret;
 }
@@ -1584,8 +1584,7 @@ void ConnectivityManagerImpl::_ConnectWiFiNetworkAsyncCallback(GObject * sourceO
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
 
     {
-        gboolean result =
-            wpa_fi_w1_wpa_supplicant1_interface_call_select_network_finish(mWpaSupplicant.iface, res, &err.GetReceiver());
+        gboolean result = wpa_supplicant_1_interface_call_select_network_finish(mWpaSupplicant.iface, res, &err.GetReceiver());
         if (!result)
         {
             ChipLogError(DeviceLayer, "Failed to perform connect network: %s", err == nullptr ? "unknown error" : err->message);
@@ -1602,7 +1601,7 @@ void ConnectivityManagerImpl::_ConnectWiFiNetworkAsyncCallback(GObject * sourceO
             return;
         }
 
-        result = wpa_fi_w1_wpa_supplicant1_interface_call_save_config_sync(mWpaSupplicant.iface, nullptr, &err.GetReceiver());
+        result = wpa_supplicant_1_interface_call_save_config_sync(mWpaSupplicant.iface, nullptr, &err.GetReceiver());
         if (result)
         {
             ChipLogProgress(DeviceLayer, "wpa_supplicant: save config succeeded!");
@@ -1677,7 +1676,7 @@ CHIP_ERROR ConnectivityManagerImpl::CommitConfig()
 
     ChipLogProgress(DeviceLayer, "wpa_supplicant: save config");
 
-    result = wpa_fi_w1_wpa_supplicant1_interface_call_save_config_sync(mWpaSupplicant.iface, nullptr, &err.GetReceiver());
+    result = wpa_supplicant_1_interface_call_save_config_sync(mWpaSupplicant.iface, nullptr, &err.GetReceiver());
 
     if (!result)
     {
@@ -1744,7 +1743,7 @@ CHIP_ERROR ConnectivityManagerImpl::GetWiFiSecurityType(SecurityTypeEnum & secur
         return CHIP_ERROR_INCORRECT_STATE;
     }
 
-    mode = wpa_fi_w1_wpa_supplicant1_interface_get_current_auth_mode(mWpaSupplicant.iface);
+    mode = wpa_supplicant_1_interface_get_current_auth_mode(mWpaSupplicant.iface);
     ChipLogProgress(DeviceLayer, "wpa_supplicant: current Wi-Fi security type: %s", StringOrNullMarker(mode));
 
     if (strncmp(mode, "WPA-PSK", 7) == 0)
@@ -1796,7 +1795,7 @@ int32_t ConnectivityManagerImpl::GetDisconnectReason()
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
     GAutoPtr<GError> err;
 
-    gint errorValue = wpa_fi_w1_wpa_supplicant1_interface_get_disconnect_reason(mWpaSupplicant.iface);
+    gint errorValue = wpa_supplicant_1_interface_get_disconnect_reason(mWpaSupplicant.iface);
     // wpa_supplicant DBus API: DisconnectReason: The most recent IEEE 802.11 reason code for disconnect. Negative value
     // indicates locally generated disconnection.
     return errorValue;
@@ -1818,7 +1817,7 @@ CHIP_ERROR ConnectivityManagerImpl::GetConfiguredNetwork(NetworkCommissioning::N
         return CHIP_ERROR_INCORRECT_STATE;
     }
 
-    const gchar * networkPath = wpa_fi_w1_wpa_supplicant1_interface_get_current_network(mWpaSupplicant.iface);
+    const gchar * networkPath = wpa_supplicant_1_interface_get_current_network(mWpaSupplicant.iface);
 
     // wpa_supplicant DBus API: if network path of current network is "/", means no networks is currently selected.
     if ((networkPath == nullptr) || (strcmp(networkPath, "/") == 0))
@@ -1826,15 +1825,15 @@ CHIP_ERROR ConnectivityManagerImpl::GetConfiguredNetwork(NetworkCommissioning::N
         return CHIP_ERROR_KEY_NOT_FOUND;
     }
 
-    GAutoPtr<WpaFiW1Wpa_supplicant1Network> networkInfo(wpa_fi_w1_wpa_supplicant1_network_proxy_new_for_bus_sync(
+    GAutoPtr<WpaSupplicant1Network> networkInfo(wpa_supplicant_1_network_proxy_new_for_bus_sync(
         G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, kWpaSupplicantServiceName, networkPath, nullptr, &err.GetReceiver()));
     if (networkInfo == nullptr)
     {
         return CHIP_ERROR_INTERNAL;
     }
 
-    network.connected     = wpa_fi_w1_wpa_supplicant1_network_get_enabled(networkInfo.get());
-    GVariant * properties = wpa_fi_w1_wpa_supplicant1_network_get_properties(networkInfo.get());
+    network.connected     = wpa_supplicant_1_network_get_enabled(networkInfo.get());
+    GVariant * properties = wpa_supplicant_1_network_get_properties(networkInfo.get());
     GAutoPtr<GVariant> ssid(g_variant_lookup_value(properties, "ssid", nullptr));
     gsize length;
     const gchar * ssidStr = g_variant_get_string(ssid.get(), &length);
@@ -1857,8 +1856,8 @@ CHIP_ERROR ConnectivityManagerImpl::StopAutoScan()
 
     ChipLogDetail(DeviceLayer, "wpa_supplicant: disabling auto scan");
 
-    result = wpa_fi_w1_wpa_supplicant1_interface_call_auto_scan_sync(
-        mWpaSupplicant.iface, "" /* empty string means disabling auto scan */, nullptr, &err.GetReceiver());
+    result = wpa_supplicant_1_interface_call_auto_scan_sync(mWpaSupplicant.iface, "" /* empty string means disabling auto scan */,
+                                                            nullptr, &err.GetReceiver());
     if (!result)
     {
         ChipLogError(DeviceLayer, "wpa_supplicant: Failed to stop auto network scan: %s", err ? err->message : "unknown");
@@ -1888,7 +1887,7 @@ CHIP_ERROR ConnectivityManagerImpl::StartWiFiScan(ByteSpan ssid, WiFiDriver::Sca
     g_variant_builder_add(&builder, "{sv}", "Type", g_variant_new_string("active"));
     args = g_variant_builder_end(&builder);
 
-    result = wpa_fi_w1_wpa_supplicant1_interface_call_scan_sync(mWpaSupplicant.iface, args, nullptr, &err.GetReceiver());
+    result = wpa_supplicant_1_interface_call_scan_sync(mWpaSupplicant.iface, args, nullptr, &err.GetReceiver());
 
     if (result)
     {
@@ -2015,7 +2014,7 @@ bool ConnectivityManagerImpl::_GetBssInfo(const gchar * bssPath, NetworkCommissi
     // with the proxy object.
 
     GAutoPtr<GError> err;
-    GAutoPtr<WpaFiW1Wpa_supplicant1BSS> bss(wpa_fi_w1_wpa_supplicant1_bss_proxy_new_for_bus_sync(
+    GAutoPtr<WpaSupplicant1BSS> bss(wpa_supplicant_1_bss_proxy_new_for_bus_sync(
         G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, kWpaSupplicantServiceName, bssPath, nullptr, &err.GetReceiver()));
 
     if (bss == nullptr)
@@ -2023,7 +2022,7 @@ bool ConnectivityManagerImpl::_GetBssInfo(const gchar * bssPath, NetworkCommissi
         return false;
     }
 
-    WpaFiW1Wpa_supplicant1BSSProxy * bssProxy = WPA_FI_W1_WPA_SUPPLICANT1_BSS_PROXY(bss.get());
+    WpaSupplicant1BSSProxy * bssProxy = WPA_SUPPLICANT_1_BSS_PROXY(bss.get());
 
     GAutoPtr<GVariant> ssid(g_dbus_proxy_get_cached_property(G_DBUS_PROXY(bssProxy), "SSID"));
     GAutoPtr<GVariant> bssid(g_dbus_proxy_get_cached_property(G_DBUS_PROXY(bssProxy), "BSSID"));
@@ -2041,8 +2040,8 @@ bool ConnectivityManagerImpl::_GetBssInfo(const gchar * bssPath, NetworkCommissi
     char bssidStr[2 * 6 + 5 + 1] = { 0 };
     gsize ssidLen                = 0;
     gsize bssidLen               = 0;
-    gint16 signal                = wpa_fi_w1_wpa_supplicant1_bss_get_signal(bss.get());
-    guint16 frequency            = wpa_fi_w1_wpa_supplicant1_bss_get_frequency(bss.get());
+    gint16 signal                = wpa_supplicant_1_bss_get_signal(bss.get());
+    guint16 frequency            = wpa_supplicant_1_bss_get_frequency(bss.get());
 
     ssidStr  = reinterpret_cast<const guchar *>(g_variant_get_fixed_array(ssid.get(), &ssidLen, sizeof(guchar)));
     bssidBuf = reinterpret_cast<const guchar *>(g_variant_get_fixed_array(bssid.get(), &bssidLen, sizeof(guchar)));
@@ -2135,7 +2134,7 @@ bool ConnectivityManagerImpl::_GetBssInfo(const gchar * bssPath, NetworkCommissi
 
         return res;
     };
-    auto GetNetworkSecurityType = [IsNetworkWPAPSK, IsNetworkWPA2PSK](WpaFiW1Wpa_supplicant1BSSProxy * proxy) -> uint8_t {
+    auto GetNetworkSecurityType = [IsNetworkWPAPSK, IsNetworkWPA2PSK](WpaSupplicant1BSSProxy * proxy) -> uint8_t {
         GAutoPtr<GVariant> wpa(g_dbus_proxy_get_cached_property(G_DBUS_PROXY(proxy), "WPA"));
         GAutoPtr<GVariant> rsn(g_dbus_proxy_get_cached_property(G_DBUS_PROXY(proxy), "RSN"));
 
@@ -2174,12 +2173,12 @@ bool ConnectivityManagerImpl::_GetBssInfo(const gchar * bssPath, NetworkCommissi
     return true;
 }
 
-void ConnectivityManagerImpl::_OnWpaInterfaceScanDone(WpaFiW1Wpa_supplicant1Interface * proxy, gboolean success)
+void ConnectivityManagerImpl::_OnWpaInterfaceScanDone(WpaSupplicant1Interface * proxy, gboolean success)
 {
     std::lock_guard<std::mutex> lock(mWpaSupplicantMutex);
 
     ChipLogProgress(DeviceLayer, "wpa_supplicant: network scan done");
-    gchar ** bsss    = wpa_fi_w1_wpa_supplicant1_interface_dup_bsss(mWpaSupplicant.iface);
+    gchar ** bsss    = wpa_supplicant_1_interface_dup_bsss(mWpaSupplicant.iface);
     gchar ** oldBsss = bsss;
     if (bsss == nullptr)
     {
@@ -2235,7 +2234,7 @@ CHIP_ERROR ConnectivityManagerImpl::_StartWiFiManagement()
     VerifyOrDie(g_main_context_get_thread_default() != nullptr);
 
     ChipLogProgress(DeviceLayer, "wpa_supplicant: Start WiFi management");
-    wpa_fi_w1_wpa_supplicant1_proxy_new_for_bus(
+    wpa_supplicant_1_proxy_new_for_bus(
         G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, kWpaSupplicantServiceName, kWpaSupplicantObjectPath, nullptr,
         reinterpret_cast<GAsyncReadyCallback>(+[](GObject * sourceObject_, GAsyncResult * res_, ConnectivityManagerImpl * self) {
             return self->_OnWpaProxyReady(sourceObject_, res_);
diff --git a/src/platform/Linux/ConnectivityManagerImpl.h b/src/platform/Linux/ConnectivityManagerImpl.h
index 2025f228532961..deb014a00e1610 100644
--- a/src/platform/Linux/ConnectivityManagerImpl.h
+++ b/src/platform/Linux/ConnectivityManagerImpl.h
@@ -86,13 +86,13 @@ struct GDBusWpaSupplicant
         SCANNING,
     };
 
-    WpaState state                          = WpaState::INIT;
-    WpaScanningState scanState              = WpaScanningState::IDLE;
-    WpaFiW1Wpa_supplicant1 * proxy          = nullptr;
-    WpaFiW1Wpa_supplicant1Interface * iface = nullptr;
-    WpaFiW1Wpa_supplicant1BSS * bss         = nullptr;
-    gchar * interfacePath                   = nullptr;
-    gchar * networkPath                     = nullptr;
+    WpaState state                  = WpaState::INIT;
+    WpaScanningState scanState      = WpaScanningState::IDLE;
+    WpaSupplicant1 * proxy          = nullptr;
+    WpaSupplicant1Interface * iface = nullptr;
+    WpaSupplicant1BSS * bss         = nullptr;
+    gchar * interfacePath           = nullptr;
+    gchar * networkPath             = nullptr;
 };
 #endif
 
@@ -222,10 +222,10 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
     CHIP_ERROR StopAutoScan();
 
     void _OnWpaProxyReady(GObject * sourceObject, GAsyncResult * res);
-    void _OnWpaInterfaceRemoved(WpaFiW1Wpa_supplicant1 * proxy, const char * path, GVariant * properties);
-    void _OnWpaInterfaceAdded(WpaFiW1Wpa_supplicant1 * proxy, const char * path, GVariant * properties);
-    void _OnWpaPropertiesChanged(WpaFiW1Wpa_supplicant1Interface * proxy, GVariant * properties);
-    void _OnWpaInterfaceScanDone(WpaFiW1Wpa_supplicant1Interface * proxy, gboolean success);
+    void _OnWpaInterfaceRemoved(WpaSupplicant1 * proxy, const char * path, GVariant * properties);
+    void _OnWpaInterfaceAdded(WpaSupplicant1 * proxy, const char * path, GVariant * properties);
+    void _OnWpaPropertiesChanged(WpaSupplicant1Interface * proxy, GVariant * properties);
+    void _OnWpaInterfaceScanDone(WpaSupplicant1Interface * proxy, gboolean success);
     void _OnWpaInterfaceReady(GObject * sourceObject, GAsyncResult * res);
     void _OnWpaInterfaceProxyReady(GObject * sourceObject, GAsyncResult * res);
     void _OnWpaBssProxyReady(GObject * sourceObject, GAsyncResult * res);
diff --git a/src/platform/Linux/ThreadStackManagerImpl.cpp b/src/platform/Linux/ThreadStackManagerImpl.cpp
index 76fd478a050f89..a67942be8dac06 100644
--- a/src/platform/Linux/ThreadStackManagerImpl.cpp
+++ b/src/platform/Linux/ThreadStackManagerImpl.cpp
@@ -51,7 +51,7 @@ namespace {
 
 struct SetActiveDatasetContext
 {
-    OpenthreadIoOpenthreadBorderRouter * proxy;
+    OpenthreadBorderRouter * proxy;
     ByteSpan netInfo;
 };
 
@@ -67,7 +67,7 @@ CHIP_ERROR GLibMatterContextSetActiveDataset(SetActiveDatasetContext * context)
     GAutoPtr<GVariant> value(g_variant_new_from_bytes(G_VARIANT_TYPE_BYTESTRING, bytes.release(), true));
     if (!value)
         return CHIP_ERROR_NO_MEMORY;
-    openthread_io_openthread_border_router_set_active_dataset_tlvs(context->proxy, value.release());
+    openthread_border_router_set_active_dataset_tlvs(context->proxy, value.release());
     return CHIP_NO_ERROR;
 }
 
@@ -82,9 +82,9 @@ CHIP_ERROR ThreadStackManagerImpl::GLibMatterContextInitThreadStack(ThreadStackM
     VerifyOrDie(g_main_context_get_thread_default() != nullptr);
 
     GAutoPtr<GError> err;
-    self->mProxy.reset(openthread_io_openthread_border_router_proxy_new_for_bus_sync(
-        G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, kDBusOpenThreadService, kDBusOpenThreadObjectPath, nullptr,
-        &err.GetReceiver()));
+    self->mProxy.reset(openthread_border_router_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE,
+                                                                       kDBusOpenThreadService, kDBusOpenThreadObjectPath, nullptr,
+                                                                       &err.GetReceiver()));
     VerifyOrReturnError(
         self->mProxy != nullptr, CHIP_ERROR_INTERNAL,
         ChipLogError(DeviceLayer, "openthread: failed to create openthread dbus proxy %s", err ? err->message : "unknown error"));
@@ -103,7 +103,7 @@ CHIP_ERROR ThreadStackManagerImpl::_InitThreadStack()
 
     // If get property is called inside dbus thread (we are going to make it so), XXX_get_XXX can be used instead of XXX_dup_XXX
     // which is a little bit faster and the returned object doesn't need to be freed. Same for all following get properties.
-    GAutoPtr<char> role(openthread_io_openthread_border_router_dup_device_role(mProxy.get()));
+    GAutoPtr<char> role(openthread_border_router_dup_device_role(mProxy.get()));
     if (role)
     {
         ThreadDeviceRoleChangedHandler(role.get());
@@ -112,7 +112,7 @@ CHIP_ERROR ThreadStackManagerImpl::_InitThreadStack()
     return CHIP_NO_ERROR;
 }
 
-void ThreadStackManagerImpl::OnDbusPropertiesChanged(OpenthreadIoOpenthreadBorderRouter * proxy, GVariant * changed_properties,
+void ThreadStackManagerImpl::OnDbusPropertiesChanged(OpenthreadBorderRouter * proxy, GVariant * changed_properties,
                                                      const gchar * const * invalidated_properties, gpointer user_data)
 {
     ThreadStackManagerImpl * me = reinterpret_cast<ThreadStackManagerImpl *>(user_data);
@@ -182,7 +182,7 @@ bool ThreadStackManagerImpl::_HaveRouteToAddress(const Inet::IPAddress & destAdd
         return true;
     }
 
-    GAutoPtr<GVariant> routes(openthread_io_openthread_border_router_dup_external_routes(mProxy.get()));
+    GAutoPtr<GVariant> routes(openthread_border_router_dup_external_routes(mProxy.get()));
     if (!routes)
         return false;
 
@@ -368,7 +368,7 @@ bool ThreadStackManagerImpl::_IsThreadAttached() const
 CHIP_ERROR ThreadStackManagerImpl::GLibMatterContextCallAttach(ThreadStackManagerImpl * self)
 {
     VerifyOrDie(g_main_context_get_thread_default() != nullptr);
-    openthread_io_openthread_border_router_call_attach(self->mProxy.get(), nullptr, _OnThreadBrAttachFinished, self);
+    openthread_border_router_call_attach(self->mProxy.get(), nullptr, _OnThreadBrAttachFinished, self);
     return CHIP_NO_ERROR;
 }
 
@@ -383,7 +383,7 @@ CHIP_ERROR ThreadStackManagerImpl::_SetThreadEnabled(bool val)
     else
     {
         GAutoPtr<GError> err;
-        gboolean result = openthread_io_openthread_border_router_call_reset_sync(mProxy.get(), nullptr, &err.GetReceiver());
+        gboolean result = openthread_border_router_call_reset_sync(mProxy.get(), nullptr, &err.GetReceiver());
         if (err)
         {
             ChipLogError(DeviceLayer, "openthread: _SetThreadEnabled calling %s failed: %s", "Reset", err->message);
@@ -405,7 +405,7 @@ void ThreadStackManagerImpl::_OnThreadBrAttachFinished(GObject * source_object,
     GAutoPtr<GVariant> attachRes;
     GAutoPtr<GError> err;
     {
-        gboolean result = openthread_io_openthread_border_router_call_attach_finish(this_->mProxy.get(), res, &err.GetReceiver());
+        gboolean result = openthread_border_router_call_attach_finish(this_->mProxy.get(), res, &err.GetReceiver());
         if (!result)
         {
             ChipLogError(DeviceLayer, "Failed to perform finish Thread network scan: %s",
@@ -442,7 +442,7 @@ ConnectivityManager::ThreadDeviceType ThreadStackManagerImpl::_GetThreadDeviceTy
         return ConnectivityManager::ThreadDeviceType::kThreadDeviceType_NotSupported;
     }
 
-    GAutoPtr<char> role(openthread_io_openthread_border_router_dup_device_role(mProxy.get()));
+    GAutoPtr<char> role(openthread_border_router_dup_device_role(mProxy.get()));
     if (!role)
         return ConnectivityManager::ThreadDeviceType::kThreadDeviceType_NotSupported;
     if (strcmp(role.get(), kOpenthreadDeviceRoleDetached) == 0 || strcmp(role.get(), kOpenthreadDeviceRoleDisabled) == 0)
@@ -451,7 +451,7 @@ ConnectivityManager::ThreadDeviceType ThreadStackManagerImpl::_GetThreadDeviceTy
     }
     if (strcmp(role.get(), kOpenthreadDeviceRoleChild) == 0)
     {
-        GAutoPtr<GVariant> linkMode(openthread_io_openthread_border_router_dup_link_mode(mProxy.get()));
+        GAutoPtr<GVariant> linkMode(openthread_border_router_dup_link_mode(mProxy.get()));
         if (!linkMode)
             return ConnectivityManager::ThreadDeviceType::kThreadDeviceType_NotSupported;
         gboolean rx_on_when_idle;
@@ -499,7 +499,7 @@ CHIP_ERROR ThreadStackManagerImpl::_SetThreadDeviceType(ConnectivityManager::Thr
         GAutoPtr<GVariant> linkMode(g_variant_new("(bbb)", rx_on_when_idle, device_type, network_data));
         if (!linkMode)
             return CHIP_ERROR_NO_MEMORY;
-        openthread_io_openthread_border_router_set_link_mode(mProxy.get(), linkMode.release());
+        openthread_border_router_set_link_mode(mProxy.get(), linkMode.release());
     }
 
     return CHIP_NO_ERROR;
@@ -546,7 +546,7 @@ CHIP_ERROR ThreadStackManagerImpl::_GetAndLogThreadTopologyFull()
 CHIP_ERROR ThreadStackManagerImpl::_GetPrimary802154MACAddress(uint8_t * buf)
 {
     VerifyOrReturnError(mProxy, CHIP_ERROR_INCORRECT_STATE);
-    guint64 extAddr = openthread_io_openthread_border_router_get_extended_address(mProxy.get());
+    guint64 extAddr = openthread_border_router_get_extended_address(mProxy.get());
 
     for (size_t i = 0; i < sizeof(extAddr); i++)
     {
@@ -579,7 +579,7 @@ CHIP_ERROR ThreadStackManagerImpl::_GetPollPeriod(uint32_t & buf)
 CHIP_ERROR ThreadStackManagerImpl::GLibMatterContextCallScan(ThreadStackManagerImpl * self)
 {
     VerifyOrDie(g_main_context_get_thread_default() != nullptr);
-    openthread_io_openthread_border_router_call_scan(self->mProxy.get(), nullptr, _OnNetworkScanFinished, self);
+    openthread_border_router_call_scan(self->mProxy.get(), nullptr, _OnNetworkScanFinished, self);
     return CHIP_NO_ERROR;
 }
 
@@ -604,8 +604,8 @@ void ThreadStackManagerImpl::_OnNetworkScanFinished(GAsyncResult * res)
     GAutoPtr<GVariant> scan_result;
     GAutoPtr<GError> err;
     {
-        gboolean result = openthread_io_openthread_border_router_call_scan_finish(mProxy.get(), &scan_result.GetReceiver(), res,
-                                                                                  &err.GetReceiver());
+        gboolean result =
+            openthread_border_router_call_scan_finish(mProxy.get(), &scan_result.GetReceiver(), res, &err.GetReceiver());
         if (!result)
         {
             ChipLogError(DeviceLayer, "Failed to perform finish Thread network scan: %s",
diff --git a/src/platform/Linux/ThreadStackManagerImpl.h b/src/platform/Linux/ThreadStackManagerImpl.h
index 685348a4ae4a72..20cf85f2faf54c 100755
--- a/src/platform/Linux/ThreadStackManagerImpl.h
+++ b/src/platform/Linux/ThreadStackManagerImpl.h
@@ -23,7 +23,7 @@
 #include <app/icd/server/ICDServerConfig.h>
 #include <lib/support/ThreadOperationalDataset.h>
 #include <platform/GLibTypeDeleter.h>
-#include <platform/Linux/dbus/openthread/introspect.h>
+#include <platform/Linux/dbus/openthread/DBusOpenthread.h>
 #include <platform/NetworkCommissioning.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 #include <platform/internal/DeviceNetworkInfo.h>
@@ -31,7 +31,7 @@
 namespace chip {
 
 template <>
-struct GAutoPtrDeleter<OpenthreadIoOpenthreadBorderRouter>
+struct GAutoPtrDeleter<OpenthreadBorderRouter>
 {
     using deleter = GObjectDeleter;
 };
@@ -149,12 +149,12 @@ class ThreadStackManagerImpl : public ThreadStackManager
         uint8_t lqi;
     };
 
-    GAutoPtr<OpenthreadIoOpenthreadBorderRouter> mProxy;
+    GAutoPtr<OpenthreadBorderRouter> mProxy;
 
     static CHIP_ERROR GLibMatterContextInitThreadStack(ThreadStackManagerImpl * self);
     static CHIP_ERROR GLibMatterContextCallAttach(ThreadStackManagerImpl * self);
     static CHIP_ERROR GLibMatterContextCallScan(ThreadStackManagerImpl * self);
-    static void OnDbusPropertiesChanged(OpenthreadIoOpenthreadBorderRouter * proxy, GVariant * changed_properties,
+    static void OnDbusPropertiesChanged(OpenthreadBorderRouter * proxy, GVariant * changed_properties,
                                         const gchar * const * invalidated_properties, gpointer user_data);
     void ThreadDeviceRoleChangedHandler(const gchar * role);
 
diff --git a/src/platform/Linux/bluez/AdapterIterator.cpp b/src/platform/Linux/bluez/AdapterIterator.cpp
index dd51ea470ae319..b2f9e394f2de69 100644
--- a/src/platform/Linux/bluez/AdapterIterator.cpp
+++ b/src/platform/Linux/bluez/AdapterIterator.cpp
@@ -25,7 +25,7 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/GLibTypeDeleter.h>
-#include <platform/Linux/dbus/bluez/DbusBluez.h>
+#include <platform/Linux/dbus/bluez/DBusBluez.h>
 
 #include "BluezObjectIterator.h"
 #include "BluezObjectList.h"
diff --git a/src/platform/Linux/bluez/AdapterIterator.h b/src/platform/Linux/bluez/AdapterIterator.h
index 3de2db068fb634..8a85795dfb9424 100644
--- a/src/platform/Linux/bluez/AdapterIterator.h
+++ b/src/platform/Linux/bluez/AdapterIterator.h
@@ -20,7 +20,7 @@
 #include <cstdint>
 
 #include <platform/GLibTypeDeleter.h>
-#include <platform/Linux/dbus/bluez/DbusBluez.h>
+#include <platform/Linux/dbus/bluez/DBusBluez.h>
 
 #include "BluezObjectIterator.h"
 #include "BluezObjectManager.h"
diff --git a/src/platform/Linux/bluez/BluezAdvertisement.cpp b/src/platform/Linux/bluez/BluezAdvertisement.cpp
index 859c1bf64fa07b..40db7a17032e1f 100644
--- a/src/platform/Linux/bluez/BluezAdvertisement.cpp
+++ b/src/platform/Linux/bluez/BluezAdvertisement.cpp
@@ -29,7 +29,7 @@
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/ConfigurationManager.h>
 #include <platform/GLibTypeDeleter.h>
-#include <platform/Linux/dbus/bluez/DbusBluez.h>
+#include <platform/Linux/dbus/bluez/DBusBluez.h>
 #include <platform/PlatformManager.h>
 
 #include "BluezEndpoint.h"
diff --git a/src/platform/Linux/bluez/BluezAdvertisement.h b/src/platform/Linux/bluez/BluezAdvertisement.h
index fcae7713a43efc..9b69e297cef524 100644
--- a/src/platform/Linux/bluez/BluezAdvertisement.h
+++ b/src/platform/Linux/bluez/BluezAdvertisement.h
@@ -27,7 +27,7 @@
 #include <ble/Ble.h>
 #include <lib/core/CHIPError.h>
 #include <platform/GLibTypeDeleter.h>
-#include <platform/Linux/dbus/bluez/DbusBluez.h>
+#include <platform/Linux/dbus/bluez/DBusBluez.h>
 
 #include "BluezEndpoint.h"
 #include "Types.h"
diff --git a/src/platform/Linux/bluez/BluezConnection.cpp b/src/platform/Linux/bluez/BluezConnection.cpp
index d39411d18d6aef..24c9c2d7f3df14 100644
--- a/src/platform/Linux/bluez/BluezConnection.cpp
+++ b/src/platform/Linux/bluez/BluezConnection.cpp
@@ -29,7 +29,7 @@
 #include <lib/support/CodeUtils.h>
 #include <platform/ConnectivityManager.h>
 #include <platform/GLibTypeDeleter.h>
-#include <platform/Linux/dbus/bluez/DbusBluez.h>
+#include <platform/Linux/dbus/bluez/DBusBluez.h>
 #include <platform/PlatformManager.h>
 #include <platform/internal/BLEManager.h>
 #include <system/SystemPacketBuffer.h>
diff --git a/src/platform/Linux/bluez/BluezConnection.h b/src/platform/Linux/bluez/BluezConnection.h
index f4efb3a5b22f2b..773b3928e2e57d 100644
--- a/src/platform/Linux/bluez/BluezConnection.h
+++ b/src/platform/Linux/bluez/BluezConnection.h
@@ -25,7 +25,7 @@
 
 #include <lib/core/CHIPError.h>
 #include <platform/GLibTypeDeleter.h>
-#include <platform/Linux/dbus/bluez/DbusBluez.h>
+#include <platform/Linux/dbus/bluez/DBusBluez.h>
 #include <system/SystemPacketBuffer.h>
 
 #include "Types.h"
diff --git a/src/platform/Linux/bluez/BluezEndpoint.cpp b/src/platform/Linux/bluez/BluezEndpoint.cpp
index 9915abceb49712..9b873a707ff99b 100644
--- a/src/platform/Linux/bluez/BluezEndpoint.cpp
+++ b/src/platform/Linux/bluez/BluezEndpoint.cpp
@@ -66,7 +66,7 @@
 #include <platform/ConnectivityManager.h>
 #include <platform/DeviceInstanceInfoProvider.h>
 #include <platform/GLibTypeDeleter.h>
-#include <platform/Linux/dbus/bluez/DbusBluez.h>
+#include <platform/Linux/dbus/bluez/DBusBluez.h>
 #include <platform/PlatformManager.h>
 #include <platform/internal/BLEManager.h>
 #include <setup_payload/AdditionalDataPayloadGenerator.h>
diff --git a/src/platform/Linux/bluez/BluezEndpoint.h b/src/platform/Linux/bluez/BluezEndpoint.h
index 01821bf11c6507..457062e7bb5292 100644
--- a/src/platform/Linux/bluez/BluezEndpoint.h
+++ b/src/platform/Linux/bluez/BluezEndpoint.h
@@ -55,7 +55,7 @@
 #include <ble/Ble.h>
 #include <lib/core/CHIPError.h>
 #include <platform/GLibTypeDeleter.h>
-#include <platform/Linux/dbus/bluez/DbusBluez.h>
+#include <platform/Linux/dbus/bluez/DBusBluez.h>
 
 #include "BluezConnection.h"
 #include "BluezObjectManager.h"
diff --git a/src/platform/Linux/bluez/BluezObjectIterator.h b/src/platform/Linux/bluez/BluezObjectIterator.h
index 6b177acd03027b..4df65295c6ca54 100644
--- a/src/platform/Linux/bluez/BluezObjectIterator.h
+++ b/src/platform/Linux/bluez/BluezObjectIterator.h
@@ -22,7 +22,7 @@
 #include <glib.h>
 
 #include <platform/CHIPDeviceConfig.h>
-#include <platform/Linux/dbus/bluez/DbusBluez.h>
+#include <platform/Linux/dbus/bluez/DBusBluez.h>
 
 namespace chip {
 namespace DeviceLayer {
diff --git a/src/platform/Linux/bluez/BluezObjectList.h b/src/platform/Linux/bluez/BluezObjectList.h
index c79141f6a73cad..bff461e0d82626 100644
--- a/src/platform/Linux/bluez/BluezObjectList.h
+++ b/src/platform/Linux/bluez/BluezObjectList.h
@@ -21,7 +21,7 @@
 
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/CHIPDeviceConfig.h>
-#include <platform/Linux/dbus/bluez/DbusBluez.h>
+#include <platform/Linux/dbus/bluez/DBusBluez.h>
 
 #include "BluezObjectIterator.h"
 
diff --git a/src/platform/Linux/bluez/BluezObjectManager.cpp b/src/platform/Linux/bluez/BluezObjectManager.cpp
index 3a694dd64601d3..c11e15c07a27ef 100644
--- a/src/platform/Linux/bluez/BluezObjectManager.cpp
+++ b/src/platform/Linux/bluez/BluezObjectManager.cpp
@@ -31,7 +31,7 @@
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/ConfigurationManager.h>
 #include <platform/GLibTypeDeleter.h>
-#include <platform/Linux/dbus/bluez/DbusBluez.h>
+#include <platform/Linux/dbus/bluez/DBusBluez.h>
 #include <platform/PlatformManager.h>
 
 #include "Types.h"
diff --git a/src/platform/Linux/bluez/ChipDeviceScanner.h b/src/platform/Linux/bluez/ChipDeviceScanner.h
index 274af60d32d442..e0043e83172718 100644
--- a/src/platform/Linux/bluez/ChipDeviceScanner.h
+++ b/src/platform/Linux/bluez/ChipDeviceScanner.h
@@ -24,7 +24,7 @@
 #include <ble/Ble.h>
 #include <lib/core/CHIPError.h>
 #include <platform/GLibTypeDeleter.h>
-#include <platform/Linux/dbus/bluez/DbusBluez.h>
+#include <platform/Linux/dbus/bluez/DBusBluez.h>
 #include <system/SystemLayer.h>
 
 #include "BluezObjectManager.h"
diff --git a/src/platform/Linux/bluez/Types.h b/src/platform/Linux/bluez/Types.h
index 4bd2c89d9a7966..3c1d60cdd4c234 100644
--- a/src/platform/Linux/bluez/Types.h
+++ b/src/platform/Linux/bluez/Types.h
@@ -50,7 +50,7 @@
 
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
 
-#include <platform/Linux/dbus/bluez/DbusBluez.h>
+#include <platform/Linux/dbus/bluez/DBusBluez.h>
 
 namespace chip {
 
diff --git a/src/platform/Linux/dbus/bluez/BUILD.gn b/src/platform/Linux/dbus/bluez/BUILD.gn
index 308feccb9b8b35..a90c3429a01619 100644
--- a/src/platform/Linux/dbus/bluez/BUILD.gn
+++ b/src/platform/Linux/dbus/bluez/BUILD.gn
@@ -17,7 +17,7 @@ import("//build_overrides/chip.gni")
 import("${chip_root}/build/chip/linux/gdbus_library.gni")
 
 gdbus_library("bluez") {
-  sources = [ "DbusBluez.xml" ]
+  sources = [ "DBusBluez.xml" ]
 
   c_namespace = "Bluez"
   interface_prefix = "org.bluez"
diff --git a/src/platform/Linux/dbus/bluez/DbusBluez.xml b/src/platform/Linux/dbus/bluez/DBusBluez.xml
similarity index 96%
rename from src/platform/Linux/dbus/bluez/DbusBluez.xml
rename to src/platform/Linux/dbus/bluez/DBusBluez.xml
index 1e193ceafb8586..601a555365c9cb 100644
--- a/src/platform/Linux/dbus/bluez/DbusBluez.xml
+++ b/src/platform/Linux/dbus/bluez/DBusBluez.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
 # Copyright (c) 2020 Project CHIP Authors
 #
@@ -21,8 +20,10 @@
 # relevant for the Matter GATT service and advertisement management. Also,
 # some properties and methods not used by Matter are omitted in order to
 # decrease the size of Matter SDK library.
-#
 -->
+<!DOCTYPE node PUBLIC
+  "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+  "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 
 <node>
 
@@ -158,9 +159,9 @@
     <property name="Discoverable" type="b" access="read"/>
     <!--
     Do not expose discoverable timeout property, so BlueZ will set it
-    internally to zero, effectively disabling the timeout. Becase of BlueZ
+    internally to zero, effectively disabling the timeout. Because of BlueZ
     bug, which is not fixed until BlueZ 5.73, exposing discoverable timeout
-    as zero will timout the advertisement immediately.
+    as zero will timeout the advertisement immediately.
 
     <property name="DiscoverableTimeout" type="q" access="read"/>
     -->
diff --git a/src/platform/Linux/dbus/openthread/BUILD.gn b/src/platform/Linux/dbus/openthread/BUILD.gn
index b18b534c2e1b6d..9aca9d806d7301 100644
--- a/src/platform/Linux/dbus/openthread/BUILD.gn
+++ b/src/platform/Linux/dbus/openthread/BUILD.gn
@@ -17,9 +17,10 @@ import("//build_overrides/chip.gni")
 import("${chip_root}/build/chip/linux/gdbus_library.gni")
 
 gdbus_library("openthread") {
-  sources = [ "introspect.xml" ]
+  sources = [ "DBusOpenthread.xml" ]
 
   c_namespace = "Openthread"
+  interface_prefix = "io.openthread"
   c_generate_object_manager = false
   dbus_out_dir = "platform/Linux/dbus/openthread"
 }
diff --git a/src/platform/Linux/dbus/openthread/DBusOpenthread.xml b/src/platform/Linux/dbus/openthread/DBusOpenthread.xml
new file mode 100644
index 00000000000000..3e48e5ca625d0e
--- /dev/null
+++ b/src/platform/Linux/dbus/openthread/DBusOpenthread.xml
@@ -0,0 +1,131 @@
+<!--
+Copyright (c) 2021 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<!--
+This file is constructed based on the OpenThread D-Bus API exposed by the
+OpenThread Border Router. The list of methods and properties is available
+at: https://github.com/openthread/ot-br-posix/blob/main/src/dbus/common/constants.hpp
+
+Please note that this file is not a complete representation of the OpenThread
+D-Bus API, but only includes the methods and properties that are relevant for
+the OpenThread integration with the Matter SDK.
+-->
+
+<!DOCTYPE node PUBLIC
+  "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+  "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+
+<node>
+  <interface name="io.openthread.BorderRouter">
+
+    <!-- Scan: Perform a Thread network scan.
+      @scan_result: array of scan results.
+
+      The result structure definition is:
+      <literallayout>
+        struct {
+          uint64 ext_address
+          string network_name
+          uint64 ext_panid
+          uint8[] steering_data
+          uint16 panid
+          uint16 joiner_udp_port
+          uint8 channel
+          int16 rssi
+          uint8 lqi
+          uint8 version
+          bool is_native
+          bool is_joinable
+        }
+      </literallayout>
+    -->
+    <method name="Scan">
+      <arg name="scan_result" type="a(tstayqqynyybb)" direction="out"/>
+    </method>
+
+    <!--
+    Attach the current device to the Thread network using
+    the current active network dataset.
+    -->
+    <method name="Attach" />
+
+    <!--
+    Perform a reset, will try to resume the network after reset.
+    -->
+    <method name="Reset" />
+
+    <!--
+    The current link mode.
+
+    This property is a struct with the following fields:
+      bool rx_on_when_idle    // whether the radio receiving is on when idle
+      bool device_type        // ftd or mtd
+      bool network_data       // full or stable
+    -->
+    <property name="LinkMode" type="(bbb)" access="readwrite">
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+    </property>
+
+    <!--
+    The current device role.
+
+    Possible values are:
+      - disabled
+      - detached
+      - child
+      - router
+      - leader
+    -->
+    <property name="DeviceRole" type="s" access="read">
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
+    </property>
+
+    <!--
+    The 64-bit extended address.
+    -->
+    <property name="ExtendedAddress" type="t" access="read">
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+    </property>
+
+    <!--
+    The list of current external route rules.
+
+    The structure definition for a single route rule:
+      struct {
+        struct {
+          uint8[] prefix_bytes
+          uint8 prefix_length
+        }
+        uint16 rloc
+        uint8 preference
+        bool stable
+        bool next_hop_is_self
+      }
+    -->
+    <property name="ExternalRoutes" type="a((ayy)qybb)" access="read">
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+    </property>
+
+    <!--
+    The Thread active dataset TLV in binary form.
+    -->
+    <property name="ActiveDatasetTlvs" type="ay" access="readwrite">
+      <annotation name="org.gtk.GDBus.C.ForceGVariant" value="true"/>
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+    </property>
+
+  </interface>
+</node>
diff --git a/src/platform/Linux/dbus/openthread/introspect.xml b/src/platform/Linux/dbus/openthread/introspect.xml
deleted file mode 100644
index a520c0afbfae5f..00000000000000
--- a/src/platform/Linux/dbus/openthread/introspect.xml
+++ /dev/null
@@ -1,476 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (c) 2021 Project CHIP Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="io.openthread.BorderRouter">
-    <!-- Scan: Perform a Thread network scan.
-      @scan_result: array of scan results.
-
-      The result struture definition is:
-      <literallayout>
-        struct {
-          uint64 ext_address
-          string network_name
-          uint64 ext_panid
-          uint8[] steering_data
-          uint16 panid
-          uint16 joiner_udp_port
-          uint8 channel
-          int16 rssi
-          uint8 lqi
-          uint8 version
-          bool is_native
-          bool is_joinable
-        }
-      </literallayout>
-    -->
-    <method name="Scan">
-      <arg name="scan_result" type="a(tstayqqynyybb)" direction="out"/> 
-    </method>
-
-    <!-- Attach: Attach the current device to the Thread network using the current active network dataset. -->
-    <method name="Attach" />
-
-    <!-- PermitUnsecureJoin: Allow joining the network via unsecure traffic temporarily.
-      @port: The port of the unsecure traffic.
-      @timeout: The timeout for the permission.
-    -->
-    <method name="PermitUnsecureJoin">
-      <arg name="port" type="q"/>
-      <arg name="timeout" type="u"/>
-    </method>
-
-    <!-- JoinerStart: Start Thread joining.
-      @pskd: The pre-shared key for the device.
-      @provision_url: The url for further provision.
-      @vendor vendor_name: The current device vendor name.
-      @vendor vendor_model: The current device model.
-      @vendor vendor_sw_version: The current device software version.
-      @vendor vendor_data: The additional vendor data.
-    -->
-    <method name="JoinerStart">
-      <arg name="pskd" type="s"/>
-      <arg name="provision_url" type="s"/>
-      <arg name="vendor_name" type="s"/>
-      <arg name="vendor_model" type="s"/>
-      <arg name="vendor_sw_version" type="s"/>
-      <arg name="vendor_data" type="s"/>
-    </method>
-
-    <!-- JoinerStop: Stop Thread joining. -->
-    <method name="JoinerStop">
-    </method>
-
-    <!-- FactoryReset: Perform a factory reset, will wipe all Thread persistent data. -->
-    <method name="FactoryReset">
-    </method>
-
-    <!-- Reset: Perform a reset, will try to resume the network after reset. -->
-    <method name="Reset">
-    </method>
-
-    <!-- AddExternalRoute: Add an external border routing rule to the network.
-      @prefix: The prefix for border routing.
-
-      This will make the current device act as the border router for the prefix.
-      The prefix structure is:
-      <literallayout>
-        struct {
-          struct {
-            uint8[] prefix_bytes
-            uint8 prefix_length
-          }
-          uint16 rloc // Not used
-          uint8 preference
-          bool stable
-          bool next_hop_is_self // Not used
-        }
-      </literallayout>
-    -->
-    <method name="AddExternalRoute">
-      <arg name="prefix" type="((ayy)qybb)"/>
-    </method>
-
-    <!-- RemoveExternalRoute: Remove an external border routing rule from the network.
-      @prefix: The prefix for border routing.
-
-      The prefix structure is:
-      <literallayout>
-        struct {
-          uint8[] prefix_bytes
-          uint8 prefix_length
-        }
-      </literallayout>
-    -->
-    <method name="RemoveExternalRoute">
-      <arg name="prefix" type="(ayy)"/>
-    </method>
-
-    <!-- AddOnMeshPrefix: Add an on-mesh prefix to the network.
-      @prefix: The on-mesh prefix.
-
-      The on-mesh prefix structure is:
-      <literallayout>
-        struct {
-          struct {
-            uint8[] prefix_bytes
-            uint8 prefix_length
-          }
-          byte preference
-          struct {
-            boolean preferred
-            boolean slaac 
-            boolean dhcp 
-            boolean configure 
-            boolean default_route   
-            boolean on_mesh
-            boolean stable 
-          }
-        }
-      </literallayout>
-    -->
-    <method name="AddOnMeshPrefix">
-      <arg name="prefix" type="((ayy)y(bbbbbbb))"/>
-    </method>
-    
-    <!-- RemoveOnMeshPrefix: Remove an on-mesh prefix from the network.
-      @prefix: The on-mesh prefix.
-
-      The prefix structure is:
-      <literallayout>
-        struct {
-          uint8[] prefix_bytes
-          uint8 prefix_length
-        }
-      </literallayout>
-    -->
-    <method name="RemoveOnMeshPrefix">
-      <arg name="prefix" type="(ayy)"/>
-    </method>
-
-    <!-- MeshLocalPrefix: The /64 mesh-local prefix.  -->
-    <property name="MeshLocalPrefix" type="ay" access="readwrite">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- LegacyULAPrefix: The /64 legacy prefix.  -->
-    <property name="LegacyULAPrefix" type="ay" access="readwrite">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- LinkMode: The current link mode.
-      <literallayout>
-      struct {
-        bool rx_on_when_idle    //whether the radio receiving is on when idle
-        bool device_type        //ftd or mtd
-        bool network_data       //full or stable
-      }
-      </literallayout>
-    -->
-    <property name="LinkMode" type="(bbb)" access="readwrite">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- DeviceRole: The current device role.
-      Possible values are:
-      <literallayout>
-        0: Disabled
-        1: Detached
-        2: Child
-        3: Router
-        4: Leader
-      </literallayout>
-    -->
-    <property name="DeviceRole" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
-    </property>
-
-    <!-- NetworkName: The network name. -->
-    <property name="NetworkName" type="s" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- PanId: The pan ID. -->
-    <property name="PanId" type="q" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- ExtPanId: The extended pan ID. -->
-    <property name="ExtPanId" type="t" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- Channel: The current network channel, from 11 to 26 -->
-    <property name="Channel" type="q" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- CcaFailureRate: The Clear Channel Assessment failure rate. -->
-    <property name="CcaFailureRate" type="q" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- MacCounters: The mac layer statistic counters.
-      The counter structure definition:
-      <literallayout>
-        struct {
-          uint32 tx_total;
-          uint32 tx_unicast;
-          uint32 tx_broadcast;
-          uint32 tx_ack_requested;
-          uint32 tx_acked;
-          uint32 tx_no_ack_requested;
-          uint32 tx_data;
-          uint32 tx_data_poll;
-          uint32 tx_beacon;
-          uint32 tx_beacon_request;
-          uint32 tx_other;
-          uint32 tx_retry;
-          uint32 tx_err_cca;
-          uint32 tx_err_abort;
-          uint32 tx_busy_channel;
-          uint32 rx_total;
-          uint32 rx_unicast;
-          uint32 rx_broadcast;
-          uint32 rx_data;
-          uint32 rx_data_poll;
-          uint32 rx_beacon;
-          uint32 rx_beacon_request;
-          uint32 rx_other;
-          uint32 rx_address_filtered;
-          uint32 rx_dest_address_filtered;
-          uint32 rx_duplicated;
-          uint32 rx_err_no_frame;
-          uint32 rx_err_unknown_neighbor;
-          uint32 rx_err_invalid_src_addr;
-          uint32 rx_err_sec;
-          uint32 rx_err_fcs;
-          uint32 rx_err_other;
-        }
-      </literallayout>
-    -->
-    <property name="MacCounters" type="(uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- LinkCounters: The link statistic counters.
-      The counter structure definition:
-      <literallayout>
-        struct {
-          uint32 ip_tx_success;
-          uint32 ip_rx_success;
-          uint32 ip_tx_failure;
-          uint32 ip_rx_failure;
-        }
-      </literallayout>
-    -->
-    <property name="LinkCounters" type="(uuuu)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- LinkSupportedChannelMask: The bitwise link supported channel mask -->
-    <property name="LinkSupportedChannelMask" type="u" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- Rloc16: The 16-bit routing locator -->
-    <property name="Rloc16" type="q" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- ExtendedAddress: The 64-bit extended address -->
-    <property name="ExtendedAddress" type="t" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- RouterID: The current router ID -->
-    <property name="RouterID" type="y" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- LeaderData: The network leader data.
-      The structure definition:
-      <literallayout>
-        struct {
-          uint32_t mPartitionId;       // Partition ID
-          uint8_t  mWeighting;         // Leader Weight
-          uint8_t  mDataVersion;       // Full Network Data Version
-          uint8_t  mStableDataVersion; // Stable Network Data Version
-          uint8_t  mLeaderRouterId;    // Leader Router ID
-        }
-      </literallayout>
-    -->
-    <property name="LeaderData" type="(uyyyy)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- NetworkData: The network data. -->
-    <property name="NetworkData" type="ay" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- StableNetworkData: The stable network data. -->
-    <property name="StableNetworkData" type="ay" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- LocalLeaderWeight: The leader weight of the current node. -->
-    <property name="LocalLeaderWeight" type="y" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- ChannelMonitorSampleCount: The number of the collected samples from the channel monitor -->
-    <property name="ChannelMonitorSampleCount" type="u" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- ChannelMonitorChannelQualityMap: The channel monitor statistics data.
-      The structure definition:
-      <literallayout>
-        struct {
-          uint8_t  mChannel;
-          uint16_t mOccupancy;
-        }
-      </literallayout>
-    -->
-    <property name="ChannelMonitorChannelQualityMap" type="a(yq)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- ChildTable: The node's child table as an array of child entry structure.
-      The child entry structure definition:
-      <literallayout>
-        struct {
-          uint64_t mExtAddress;         // IEEE 802.15.4 Extended Address
-          uint32_t mTimeout;            // Timeout
-          uint32_t mAge;                // Time last heard
-          uint16_t mRloc16;             // RLOC16
-          uint16_t mChildId;            // Child ID
-          uint8_t  mNetworkDataVersion; // Network Data Version
-          uint8_t  mLinkQualityIn;      // Link Quality In
-          int8_t   mAverageRssi;        // Average RSSI
-          int8_t   mLastRssi;           // Last observed RSSI
-          uint16_t mFrameErrorRate;     // Frame error rate (0xffff->100%). Requires error tracking feature.
-          uint16_t mMessageErrorRate;   // (IPv6) msg error rate (0xffff->100%). Requires error tracking feature.
-          bool     mRxOnWhenIdle;       // rx-on-when-idle
-          bool     mFullThreadDevice;   // Full Thread Device
-          bool     mFullNetworkData;    // Full Network Data
-          bool     mIsStateRestoring;   // Is in restoring state
-        }
-      </literallayout>
-    -->
-    <property name="ChildTable" type="a(tuuqqyyyyqqbbbb)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- NeighborTable: The node's neighbor table as an array of neighbor entry structure.
-      The neighbor entry structure definition:
-      <literallayout>
-        struct {
-          uint64_t mExtAddress;        // IEEE 802.15.4 Extended Address
-          uint32_t mAge;               // Time last heard
-          uint16_t mRloc16;            // RLOC16
-          uint32_t mLinkFrameCounter;  // Link Frame Counter
-          uint32_t mMleFrameCounter;   // MLE Frame Counter
-          uint8_t  mLinkQualityIn;     // Link Quality In
-          int8_t   mAverageRssi;       // Average RSSI
-          int8_t   mLastRssi;          // Last observed RSSI
-          uint16_t mFrameErrorRate;    // Frame error rate (0xffff->100%). Requires error tracking feature.
-          uint16_t mMessageErrorRate;  // (IPv6) msg error rate (0xffff->100%). Requires error tracking feature.
-          bool     mRxOnWhenIdle;      // rx-on-when-idle
-          bool     mFullThreadDevice;  // Full Thread Device
-          bool     mFullNetworkData;   // Full Network Data
-          bool     mIsChild;           // Is the neighbor a child
-        }
-      </literallayout>
-    -->
-    <property name="NeighborTable" type="a(tuquuyyyqqbbbb)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- PartitionId: The network partition ID. -->
-    <property name="PartitionId" type="u" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- InstantRssi: The RSSI of the last received packet. -->
-    <property name="InstantRssi" type="y" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- RadioTxPower: The radio transmit power. -->
-    <property name="RadioTxPower" type="y" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- ExternalRoutes: The list of current external route rules.
-      External route rule structure definition:
-      <literallayout>
-        struct {
-          struct {
-            uint8[] prefix_bytes
-            uint8 prefix_length
-          }
-          uint16 rloc
-          uint8 preference
-          bool stable
-          bool next_hop_is_self
-        }
-      </literallayout>
-    -->
-    <property name="ExternalRoutes" type="a((ayy)qybb)" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- ActiveDatasetTlvs: The Thread active dataset tlv in binary form. -->
-    <property name="ActiveDatasetTlvs" type="ay" access="readwrite">
-      <annotation name="org.gtk.GDBus.C.ForceGVariant" value="true"/>
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-
-    <!-- RadioRegion: The radio region code in ISO 3166-1. -->
-    <property name="RadioRegion" type="s" access="readwrite">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-    </property>
-  </interface>
-
-  <interface name="org.freedesktop.DBus.Properties">
-    <method name="Get">
-      <arg name="interface" direction="in" type="s"/>
-      <arg name="property" direction="in" type="s"/>
-      <arg name="value" direction="out" type="v"/>
-    </method>
-
-    <method name="GetAll">
-      <arg name="interface" direction="in" type="s"/>
-      <arg name="properties" direction="out" type="a{sv}"/>
-    </method>
-
-    <method name="Set">
-      <arg name="interface" direction="in" type="s"/>
-      <arg name="property" direction="in" type="s"/>
-      <arg name="value" direction="in" type="v"/>
-    </method>
-
-    <signal name="PropertiesChanged">
-      <arg type="s" name="interface"/>
-      <arg type="a{sv}" name="changed_properties"/>
-      <arg type="as" name="invalidated_properties"/>
-    </signal>
-  </interface>
-</node>
diff --git a/src/platform/Linux/dbus/wpa/BUILD.gn b/src/platform/Linux/dbus/wpa/BUILD.gn
index 5080622540339c..2cd77d02eb23a2 100644
--- a/src/platform/Linux/dbus/wpa/BUILD.gn
+++ b/src/platform/Linux/dbus/wpa/BUILD.gn
@@ -24,7 +24,8 @@ gdbus_library("wpa") {
     "DBusWpaNetwork.xml",
   ]
 
-  c_namespace = "Wpa"
+  c_namespace = "WpaSupplicant"
+  interface_prefix = "fi.w1.wpa_supplicant"
   c_generate_object_manager = false
   dbus_out_dir = "platform/Linux/dbus/wpa"
 }
diff --git a/src/platform/Linux/dbus/wpa/DBusWpa.xml b/src/platform/Linux/dbus/wpa/DBusWpa.xml
index f43d6916e76b10..395dc3f3542eb9 100644
--- a/src/platform/Linux/dbus/wpa/DBusWpa.xml
+++ b/src/platform/Linux/dbus/wpa/DBusWpa.xml
@@ -1,36 +1,42 @@
-<?xml version="1.0" ?>
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "https://raw.githubusercontent.com/freedesktop/dbus/master/doc/introspect.dtd">
+<!--
+Copyright (c) 2020 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<!--
+This file is constructed based on the wpa_supplicant D-Bus API exposed by the
+wpa_supplicant daemon. The list of methods and properties is available at:
+https://w1.fi/wpa_supplicant/devel/dbus.html
+
+Please note that this file is not a complete representation of the
+wpa_supplicant D-Bus API, but only includes the methods that are relevant for
+the wpa_supplicant integration with the Matter SDK.
+-->
+
+<!DOCTYPE node PUBLIC
+  "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+  "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+
 <node>
     <interface name="fi.w1.wpa_supplicant1">
         <method name="CreateInterface">
             <arg name="args" type="a{sv}" direction="in" />
             <arg name="path" type="o" direction="out" />
         </method>
-        <method name="RemoveInterface">
-            <arg name="path" type="o" direction="in" />
-        </method>
         <method name="GetInterface">
             <arg name="ifname" type="s" direction="in" />
             <arg name="path" type="o" direction="out" />
         </method>
-        <method name="ExpectDisconnect" />
-        <signal name="InterfaceAdded">
-            <arg name="path" type="o" />
-            <arg name="properties" type="a{sv}" />
-        </signal>
-        <signal name="InterfaceRemoved">
-            <arg name="path" type="o" />
-        </signal>
-        <signal name="PropertiesChanged">
-            <arg name="properties" type="a{sv}" />
-        </signal>
-        <property name="DebugLevel" type="s" access="readwrite" />
-        <property name="DebugTimestamp" type="b" access="readwrite" />
-        <property name="DebugShowKeys" type="b" access="readwrite" />
-        <property name="Interfaces" type="ao" access="read" />
-        <property name="EapMethods" type="as" access="read" />
-        <property name="Capabilities" type="as" access="read" />
-        <property name="WFDIEs" type="ay" access="readwrite" />
     </interface>
-    <node name="Interfaces" />
 </node>
diff --git a/src/platform/Linux/dbus/wpa/DBusWpaBss.xml b/src/platform/Linux/dbus/wpa/DBusWpaBss.xml
index 8ec5c4aa749dcb..feabafdc42b14a 100644
--- a/src/platform/Linux/dbus/wpa/DBusWpaBss.xml
+++ b/src/platform/Linux/dbus/wpa/DBusWpaBss.xml
@@ -1,19 +1,25 @@
-<?xml version="1.0" ?>
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "https://raw.githubusercontent.com/freedesktop/dbus/master/doc/introspect.dtd">
+<!--
+Copyright (c) 2021 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<!DOCTYPE node PUBLIC
+  "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+  "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+
 <node>
     <interface name="fi.w1.wpa_supplicant1.BSS">
-        <annotation name="org.gtk.GDBus.C.ForceGVariant" value="true"/>
-        <signal name="PropertiesChanged">
-            <arg name="properties" type="a{sv}" />
-        </signal>
-
-        <property name="SSID" type="ay" access="read">
-            <annotation name="org.gtk.GDBus.C.ForceGVariant" value="true"/>
-        </property>
-        <property name="BSSID" type="ay" access="read">
-            <annotation name="org.gtk.GDBus.C.ForceGVariant" value="true"/>
-        </property>
-        <property name="WPA" type="a{sv}" access="read" />
         <property name="Signal" type="n" access="read" />
         <property name="Frequency" type="q" access="read" />
     </interface>
diff --git a/src/platform/Linux/dbus/wpa/DBusWpaInterface.xml b/src/platform/Linux/dbus/wpa/DBusWpaInterface.xml
index 721ca0033cca09..1669c2ae0f0fd1 100644
--- a/src/platform/Linux/dbus/wpa/DBusWpaInterface.xml
+++ b/src/platform/Linux/dbus/wpa/DBusWpaInterface.xml
@@ -1,33 +1,57 @@
-<?xml version="1.0" ?>
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "https://raw.githubusercontent.com/freedesktop/dbus/master/doc/introspect.dtd">
+<!--
+Copyright (c) 2020 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<!--
+This file is constructed based on the wpa_supplicant D-Bus API exposed by the
+wpa_supplicant daemon. The list of methods and properties is available at:
+https://w1.fi/wpa_supplicant/devel/dbus.html
+
+Please note that this file is not a complete representation of the
+wpa_supplicant D-Bus API, but only includes the methods that are relevant for
+the wpa_supplicant integration with the Matter SDK.
+-->
+
+<!DOCTYPE node PUBLIC
+  "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+  "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+
 <node>
     <interface name="fi.w1.wpa_supplicant1.Interface">
+
         <method name="Scan">
             <arg name="args" type="a{sv}" direction="in" />
         </method>
-        <method name="SignalPoll">
-            <arg name="args" type="a{sv}" direction="out" />
-        </method>
+
         <method name="Disconnect" />
+
         <method name="AddNetwork">
             <arg name="args" type="a{sv}" direction="in" />
             <arg name="path" type="o" direction="out" />
         </method>
-        <method name="Reassociate" />
-        <method name="Reattach" />
-        <method name="Reconnect" />
+
         <method name="RemoveNetwork">
             <arg name="path" type="o" direction="in" />
         </method>
+
         <method name="RemoveAllNetworks" />
+
         <method name="SelectNetwork">
             <arg name="path" type="o" direction="in" />
         </method>
-        <method name="NetworkReply">
-            <arg name="path" type="o" direction="in" />
-            <arg name="field" type="s" direction="in" />
-            <arg name="value" type="s" direction="in" />
-        </method>
+
         <method name="AddBlob">
             <arg name="name" type="s" direction="in" />
             <arg name="data" type="ay" direction="in">
@@ -35,266 +59,47 @@
                 <annotation name="org.gtk.GDBus.C.ForceGVariant" value="true"/>
             </arg>
         </method>
-        <method name="GetBlob">
-            <arg name="name" type="s" direction="in" />
-            <arg name="data" type="ay" direction="out" />
-        </method>
+
         <method name="RemoveBlob">
             <arg name="name" type="s" direction="in" />
         </method>
-        <method name="SetPKCS11EngineAndModulePath">
-            <arg name="pkcs11_engine_path" type="s" direction="in" />
-            <arg name="pkcs11_module_path" type="s" direction="in" />
-        </method>
-        <method name="FlushBSS">
-            <arg name="age" type="u" direction="in" />
-        </method>
-        <method name="SubscribeProbeReq" />
-        <method name="UnsubscribeProbeReq" />
-        <method name="EAPLogoff" />
-        <method name="EAPLogon" />
+
         <method name="AutoScan">
             <arg name="arg" type="s" direction="in" />
         </method>
+
         <method name="NANPublish">
             <arg name="nan_args" type="s" direction="in" />
             <arg name="publish_id" type="i" direction="out" />
         </method>
+
         <method name="NANCancelPublish">
             <arg name="nan_args" type="s" direction="in" />
         </method>
+
         <method name="NANSubscribe">
             <arg name="nan_args" type="s" direction="in" />
             <arg name="subscribe_id" type="i" direction="out" />
         </method>
+
         <method name="NANCancelSubscribe">
             <arg name="nan_args" type="s" direction="in" />
         </method>
+
         <method name="NANTransmit">
             <arg name="nan_args" type="s" direction="in" />
         </method>
-        <method name="TDLSDiscover">
-            <arg name="peer_address" type="s" direction="in" />
-        </method>
-        <method name="TDLSSetup">
-            <arg name="peer_address" type="s" direction="in" />
-        </method>
-        <method name="TDLSStatus">
-            <arg name="peer_address" type="s" direction="in" />
-            <arg name="status" type="s" direction="out" />
-        </method>
-        <method name="TDLSTeardown">
-            <arg name="peer_address" type="s" direction="in" />
-        </method>
-        <method name="TDLSChannelSwitch">
-            <arg name="args" type="a{sv}" direction="in" />
-        </method>
-        <method name="TDLSCancelChannelSwitch">
-            <arg name="peer_address" type="s" direction="in" />
-        </method>
-        <method name="VendorElemAdd">
-            <arg name="frame_id" type="i" direction="in" />
-            <arg name="ielems" type="ay" direction="in" />
-        </method>
-        <method name="VendorElemGet">
-            <arg name="frame_id" type="i" direction="in" />
-            <arg name="ielems" type="ay" direction="out" />
-        </method>
-        <method name="VendorElemRem">
-            <arg name="frame_id" type="i" direction="in" />
-            <arg name="ielems" type="ay" direction="in" />
-        </method>
+
         <method name="SaveConfig" />
-        <method name="AbortScan" />
-        <signal name="ScanDone">
-            <arg name="success" type="b" />
-        </signal>
-        <signal name="NanDiscoveryresult">
-            <arg name="result" type="b" />
-            <arg name="discov_info" type="a{sv}" />
-        </signal>
-        <signal name="NanReceive">
-            <arg name="nanrx" type="a{sv}" />
-        </signal>
-        <signal name="NanPublishterminated">
-            <arg name="publish_id" type="i" />
-            <arg name="reason" type="i" />
-        </signal>
-        <signal name="NanSubscribeterminated">
-            <arg name="term_subscribe_id" type="i" />
-            <arg name="reason" type="i" />
-        </signal>
-        <signal name="BSSAdded">
-            <arg name="path" type="o" />
-            <arg name="properties" type="a{sv}" />
-        </signal>
-        <signal name="BSSRemoved">
-            <arg name="path" type="o" />
-        </signal>
-        <signal name="BlobAdded">
-            <arg name="name" type="s" />
-        </signal>
-        <signal name="BlobRemoved">
-            <arg name="name" type="s" />
-        </signal>
-        <signal name="NetworkAdded">
-            <arg name="path" type="o" />
-            <arg name="properties" type="a{sv}" />
-        </signal>
-        <signal name="NetworkRemoved">
-            <arg name="path" type="o" />
-        </signal>
-        <signal name="NetworkSelected">
-            <arg name="path" type="o" />
-        </signal>
-        <signal name="PropertiesChanged">
-            <arg name="properties" type="a{sv}" />
-        </signal>
-        <signal name="ProbeRequest">
-            <arg name="args" type="a{sv}" />
-        </signal>
-        <signal name="Certification">
-            <arg name="certification" type="a{sv}" />
-        </signal>
-        <signal name="EAP">
-            <arg name="status" type="s" />
-            <arg name="parameter" type="s" />
-        </signal>
-        <signal name="StaAuthorized">
-            <arg name="name" type="s" />
-        </signal>
-        <signal name="StaDeauthorized">
-            <arg name="name" type="s" />
-        </signal>
-        <signal name="StationAdded">
-            <arg name="path" type="o" />
-            <arg name="properties" type="a{sv}" />
-        </signal>
-        <signal name="StationRemoved">
-            <arg name="path" type="o" />
-        </signal>
-        <signal name="NetworkRequest">
-            <arg name="path" type="o" />
-            <arg name="field" type="s" />
-            <arg name="text" type="s" />
-        </signal>
-        <property name="Capabilities" type="a{sv}" access="read" />
+
         <property name="State" type="s" access="read" />
-        <property name="Scanning" type="b" access="read" />
-        <property name="ApScan" type="u" access="readwrite" />
-        <property name="BSSExpireAge" type="u" access="readwrite" />
-        <property name="BSSExpireCount" type="u" access="readwrite" />
-        <property name="Country" type="s" access="readwrite" />
-        <property name="Ifname" type="s" access="read" />
-        <property name="Driver" type="s" access="read" />
-        <property name="BridgeIfname" type="s" access="read" />
-        <property name="ConfigFile" type="s" access="read" />
         <property name="CurrentBSS" type="o" access="read" />
         <property name="CurrentNetwork" type="o" access="read" />
         <property name="CurrentAuthMode" type="s" access="read" />
-        <property name="Blobs" type="a{say}" access="read" />
         <property name="BSSs" type="ao" access="read" />
-        <property name="Networks" type="ao" access="read" />
-        <property name="FastReauth" type="b" access="readwrite" />
-        <property name="ScanInterval" type="i" access="readwrite" />
-        <property name="PKCS11EnginePath" type="s" access="read" />
-        <property name="PKCS11ModulePath" type="s" access="read" />
         <property name="DisconnectReason" type="i" access="read" />
         <property name="AuthStatusCode" type="i" access="read" />
         <property name="AssocStatusCode" type="i" access="read" />
-        <property name="RoamTime" type="u" access="read" />
-        <property name="RoamComplete" type="b" access="read" />
-        <property name="SessionLength" type="u" access="read" />
-        <property name="BSSTMStatus" type="u" access="read" />
-        <property name="Stations" type="ao" access="read" />
-        <property name="MACAddressRandomizationMask" type="a{say}" access="readwrite" />
-        <property name="CtrlInterface" type="s" access="readwrite" />
-        <property name="CtrlInterfaceGroup" type="s" access="readwrite" />
-        <property name="EapolVersion" type="s" access="readwrite" />
-        <property name="Bgscan" type="s" access="readwrite" />
-        <property name="DisableScanOffload" type="s" access="readwrite" />
-        <property name="OpenscEnginePath" type="s" access="readwrite" />
-        <property name="OpensslCiphers" type="s" access="readwrite" />
-        <property name="PcscReader" type="s" access="readwrite" />
-        <property name="PcscPin" type="s" access="readwrite" />
-        <property name="ExternalSim" type="s" access="readwrite" />
-        <property name="DriverParam" type="s" access="readwrite" />
-        <property name="Dot11RSNAConfigPMKLifetime" type="s" access="readwrite" />
-        <property name="Dot11RSNAConfigPMKReauthThreshold" type="s" access="readwrite" />
-        <property name="Dot11RSNAConfigSATimeout" type="s" access="readwrite" />
-        <property name="UpdateConfig" type="s" access="readwrite" />
-        <property name="Uuid" type="s" access="readwrite" />
-        <property name="AutoUuid" type="s" access="readwrite" />
-        <property name="DeviceName" type="s" access="readwrite" />
-        <property name="Manufacturer" type="s" access="readwrite" />
-        <property name="ModelName" type="s" access="readwrite" />
-        <property name="ModelNumber" type="s" access="readwrite" />
-        <property name="SerialNumber" type="s" access="readwrite" />
-        <property name="DeviceType" type="s" access="readwrite" />
-        <property name="OsVersion" type="s" access="readwrite" />
-        <property name="ConfigMethods" type="s" access="readwrite" />
-        <property name="SecDeviceType" type="s" access="readwrite" />
-        <property name="IpAddrGo" type="s" access="readwrite" />
-        <property name="IpAddrMask" type="s" access="readwrite" />
-        <property name="IpAddrStart" type="s" access="readwrite" />
-        <property name="IpAddrEnd" type="s" access="readwrite" />
-        <property name="BssMaxCount" type="s" access="readwrite" />
-        <property name="FilterSsids" type="s" access="readwrite" />
-        <property name="FilterRssi" type="s" access="readwrite" />
-        <property name="MaxNumSta" type="s" access="readwrite" />
-        <property name="ApIsolate" type="s" access="readwrite" />
-        <property name="DisassocLowAck" type="s" access="readwrite" />
-        <property name="Hs20" type="s" access="readwrite" />
-        <property name="Interworking" type="s" access="readwrite" />
-        <property name="Hessid" type="s" access="readwrite" />
-        <property name="AccessNetworkType" type="s" access="readwrite" />
-        <property name="GoInterworking" type="s" access="readwrite" />
-        <property name="GoAccessNetworkType" type="s" access="readwrite" />
-        <property name="GoInternet" type="s" access="readwrite" />
-        <property name="GoVenueGroup" type="s" access="readwrite" />
-        <property name="GoVenueType" type="s" access="readwrite" />
-        <property name="PbcInM1" type="s" access="readwrite" />
-        <property name="Autoscan" type="s" access="readwrite" />
-        <property name="ExtPasswordBackend" type="s" access="readwrite" />
-        <property name="AutoInterworking" type="s" access="readwrite" />
-        <property name="Okc" type="s" access="readwrite" />
-        <property name="Pmf" type="s" access="readwrite" />
-        <property name="SaeGroups" type="s" access="readwrite" />
-        <property name="SaePwe" type="s" access="readwrite" />
-        <property name="SaePmkidInAssoc" type="s" access="readwrite" />
-        <property name="DtimPeriod" type="s" access="readwrite" />
-        <property name="BeaconInt" type="s" access="readwrite" />
-        <property name="ApVendorElements" type="s" access="readwrite" />
-        <property name="IgnoreOldScanRes" type="s" access="readwrite" />
-        <property name="FreqList" type="s" access="readwrite" />
-        <property name="ScanCurFreq" type="s" access="readwrite" />
-        <property name="SchedScanInterval" type="s" access="readwrite" />
-        <property name="SchedScanStartDelay" type="s" access="readwrite" />
-        <property name="TdlsExternalControl" type="s" access="readwrite" />
-        <property name="OsuDir" type="s" access="readwrite" />
-        <property name="WowlanTriggers" type="s" access="readwrite" />
-        <property name="MacAddr" type="s" access="readwrite" />
-        <property name="RandAddrLifetime" type="s" access="readwrite" />
-        <property name="PreassocMacAddr" type="s" access="readwrite" />
-        <property name="KeyMgmtOffload" type="s" access="readwrite" />
-        <property name="PassiveScan" type="s" access="readwrite" />
-        <property name="ReassocSameBssOptim" type="s" access="readwrite" />
-        <property name="FstGroupId" type="s" access="readwrite" />
-        <property name="FstPriority" type="s" access="readwrite" />
-        <property name="FstLlt" type="s" access="readwrite" />
-        <property name="CertInCb" type="s" access="readwrite" />
-        <property name="WpaRscRelaxation" type="s" access="readwrite" />
-        <property name="SchedScanPlans" type="s" access="readwrite" />
-        <property name="GasAddress3" type="s" access="readwrite" />
-        <property name="FtmResponder" type="s" access="readwrite" />
-        <property name="FtmInitiator" type="s" access="readwrite" />
-        <property name="GasRandAddrLifetime" type="s" access="readwrite" />
-        <property name="GasRandMacAddr" type="s" access="readwrite" />
-        <property name="DppConfigProcessing" type="s" access="readwrite" />
-        <property name="DppName" type="s" access="readwrite" />
-        <property name="DppMudUrl" type="s" access="readwrite" />
-        <property name="ColocIntfReporting" type="s" access="readwrite" />
+
     </interface>
-    <node name="BSSs" />
-    <node name="Networks" />
 </node>
diff --git a/src/platform/Linux/dbus/wpa/DBusWpaNetwork.xml b/src/platform/Linux/dbus/wpa/DBusWpaNetwork.xml
index 1b0ea70f4d0ca6..ec78e6fe229ce9 100644
--- a/src/platform/Linux/dbus/wpa/DBusWpaNetwork.xml
+++ b/src/platform/Linux/dbus/wpa/DBusWpaNetwork.xml
@@ -1,10 +1,25 @@
-<?xml version="1.0" ?>
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "https://raw.githubusercontent.com/freedesktop/dbus/master/doc/introspect.dtd">
+<!--
+Copyright (c) 2021 Project CHIP Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<!DOCTYPE node PUBLIC
+  "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+  "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+
 <node>
     <interface name="fi.w1.wpa_supplicant1.Network">
-        <signal name="PropertiesChanged">
-            <arg name="properties" type="a{sv}" />
-        </signal>
         <property name="Properties" type="a{sv}" access="readwrite" />
         <property name="Enabled" type="b" access="readwrite" />
     </interface>
diff --git a/src/platform/NuttX/ThreadStackManagerImpl.h b/src/platform/NuttX/ThreadStackManagerImpl.h
index ce66d51c2201a2..b511da0f3b7af3 100644
--- a/src/platform/NuttX/ThreadStackManagerImpl.h
+++ b/src/platform/NuttX/ThreadStackManagerImpl.h
@@ -25,7 +25,7 @@
 #include <lib/support/ThreadOperationalDataset.h>
 #include <platform/GLibTypeDeleter.h>
 #include <platform/NetworkCommissioning.h>
-#include <platform/NuttX/dbus/openthread/introspect.h>
+#include <platform/NuttX/dbus/openthread/DBusOpenthread.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 #include <platform/internal/DeviceNetworkInfo.h>
 
diff --git a/src/platform/webos/ThreadStackManagerImpl.h b/src/platform/webos/ThreadStackManagerImpl.h
index 64c3b8f6200bb8..5a70e882e595ee 100644
--- a/src/platform/webos/ThreadStackManagerImpl.h
+++ b/src/platform/webos/ThreadStackManagerImpl.h
@@ -25,7 +25,7 @@
 #include <platform/NetworkCommissioning.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 #include <platform/internal/DeviceNetworkInfo.h>
-#include <platform/webos/dbus/openthread/introspect.h>
+#include <platform/webos/dbus/openthread/DBusOpenthread.h>
 
 namespace chip {
 namespace DeviceLayer {