diff --git a/avahimonitor/devicepluginavahimonitor.cpp b/avahimonitor/devicepluginavahimonitor.cpp
index 49f1a1f6..e2e5dd14 100644
--- a/avahimonitor/devicepluginavahimonitor.cpp
+++ b/avahimonitor/devicepluginavahimonitor.cpp
@@ -44,7 +44,7 @@
 #include "plugin/device.h"
 #include "devicemanager.h"
 #include "plugininfo.h"
-#include "network/avahi/qtavahiservicebrowser.h"
+#include "network/zeroconf/zeroconfservicebrowser.h"
 
 #include <QDebug>
 #include <QStringList>
@@ -58,8 +58,8 @@ DevicePluginAvahiMonitor::DevicePluginAvahiMonitor()
 
 void DevicePluginAvahiMonitor::init()
 {
-    connect(hardwareManager()->avahiBrowser(), &QtAvahiServiceBrowser::serviceEntryAdded, this, &DevicePluginAvahiMonitor::onServiceEntryAdded);
-    connect(hardwareManager()->avahiBrowser(), &QtAvahiServiceBrowser::serviceEntryRemoved, this, &DevicePluginAvahiMonitor::onServiceEntryRemoved);
+    connect(hardwareManager()->zeroConfServiceBrowser(), &ZeroConfServiceBrowser::serviceEntryAdded, this, &DevicePluginAvahiMonitor::onServiceEntryAdded);
+    connect(hardwareManager()->zeroConfServiceBrowser(), &ZeroConfServiceBrowser::serviceEntryRemoved, this, &DevicePluginAvahiMonitor::onServiceEntryRemoved);
 }
 
 DeviceManager::DeviceSetupStatus DevicePluginAvahiMonitor::setupDevice(Device *device)
@@ -77,7 +77,7 @@ DeviceManager::DeviceError DevicePluginAvahiMonitor::discoverDevices(const Devic
         return DeviceManager::DeviceErrorDeviceClassNotFound;
 
     QList<DeviceDescriptor> deviceDescriptors;
-    foreach (const AvahiServiceEntry &service, hardwareManager()->avahiBrowser()->serviceEntries()) {
+    foreach (const ZeroConfServiceEntry &service, hardwareManager()->zeroConfServiceBrowser()->serviceEntries()) {
         DeviceDescriptor deviceDescriptor(avahiDeviceClassId, service.name(), service.hostAddress().toString());
         ParamList params;
         params.append(Param(avahiDeviceServiceParamTypeId, service.name()));
@@ -97,7 +97,7 @@ DeviceManager::DeviceError DevicePluginAvahiMonitor::discoverDevices(const Devic
     return DeviceManager::DeviceErrorAsync;
 }
 
-void DevicePluginAvahiMonitor::onServiceEntryAdded(const AvahiServiceEntry &serviceEntry)
+void DevicePluginAvahiMonitor::onServiceEntryAdded(const ZeroConfServiceEntry &serviceEntry)
 {
     foreach (Device *device, myDevices()) {
         if (device->paramValue(avahiDeviceServiceParamTypeId).toString() == serviceEntry.name()) {
@@ -107,7 +107,7 @@ void DevicePluginAvahiMonitor::onServiceEntryAdded(const AvahiServiceEntry &serv
     }
 }
 
-void DevicePluginAvahiMonitor::onServiceEntryRemoved(const AvahiServiceEntry &serviceEntry)
+void DevicePluginAvahiMonitor::onServiceEntryRemoved(const ZeroConfServiceEntry &serviceEntry)
 {
     foreach (Device *device, myDevices()) {
         if (device->paramValue(avahiDeviceServiceParamTypeId).toString() == serviceEntry.name()) {
diff --git a/avahimonitor/devicepluginavahimonitor.h b/avahimonitor/devicepluginavahimonitor.h
index 1ad123a3..7b531491 100644
--- a/avahimonitor/devicepluginavahimonitor.h
+++ b/avahimonitor/devicepluginavahimonitor.h
@@ -25,7 +25,7 @@
 #define DEVICEPLUGINAVAHIMONITOR_H
 
 #include "plugin/deviceplugin.h"
-#include "network/avahi/avahiserviceentry.h"
+#include "network/zeroconf/zeroconfserviceentry.h"
 
 #include <QProcess>
 
@@ -45,8 +45,8 @@ public:
     DeviceManager::DeviceError discoverDevices(const DeviceClassId &deviceClassId, const ParamList &params) override;
 
 private slots:
-    void onServiceEntryAdded(const AvahiServiceEntry &serviceEntry);
-    void onServiceEntryRemoved(const AvahiServiceEntry &serviceEntry);
+    void onServiceEntryAdded(const ZeroConfServiceEntry &serviceEntry);
+    void onServiceEntryRemoved(const ZeroConfServiceEntry &serviceEntry);
 };
 
 #endif // DEVICEPLUGINAVAHIMONITOR_H
diff --git a/kodi/devicepluginkodi.cpp b/kodi/devicepluginkodi.cpp
index 8c47a557..cf41811b 100644
--- a/kodi/devicepluginkodi.cpp
+++ b/kodi/devicepluginkodi.cpp
@@ -65,8 +65,8 @@
 #include "plugin/device.h"
 #include "plugininfo.h"
 #include "network/upnp/upnpdiscovery.h"
-#include "network/avahi/qtavahiservicebrowser.h"
-#include "network/avahi/avahiserviceentry.h"
+#include "network/zeroconf/zeroconfservicebrowser.h"
+#include "network/zeroconf/zeroconfserviceentry.h"
 #include "network/networkaccessmanager.h"
 
 #include <QNetworkRequest>
@@ -184,7 +184,7 @@ DeviceManager::DeviceError DevicePluginKodi::discoverDevices(const DeviceClassId
     Q_UNUSED(deviceClassId)
 
     QList<DeviceDescriptor> descriptors;
-    foreach (const AvahiServiceEntry &avahiEntry, hardwareManager()->avahiBrowser()->serviceEntries()) {
+    foreach (const ZeroConfServiceEntry &avahiEntry, hardwareManager()->zeroConfServiceBrowser()->serviceEntries()) {
         if (avahiEntry.serviceType() == "_xbmc-jsonrpc._tcp") {
             qCDebug(dcKodi) << "Zeroconf entry:" << avahiEntry;
             DeviceDescriptor descriptor(kodiDeviceClassId, avahiEntry.name(), avahiEntry.hostName() + " (" + avahiEntry.hostAddress().toString() + ")");