diff --git a/libguh/devicemanager.cpp b/libguh/devicemanager.cpp
index 555eb07e..613f5668 100644
--- a/libguh/devicemanager.cpp
+++ b/libguh/devicemanager.cpp
@@ -938,7 +938,24 @@ void DeviceManager::replyReady(const PluginId &pluginId, QNetworkReply *reply)
 {
     foreach (DevicePlugin *devicePlugin, m_devicePlugins) {
         if (devicePlugin->requiredHardware().testFlag(HardwareResourceNetworkManager) && devicePlugin->pluginId() == pluginId) {
-            devicePlugin->replyReady(reply);
+            devicePlugin->networkManagerReplyReady(reply);
+	}
+    }
+}
+void DeviceManager::upnpDiscoveryFinished(const QList<UpnpDeviceDescriptor> &deviceDescriptorList, const PluginId &pluginId)
+{
+    foreach (DevicePlugin *devicePlugin, m_devicePlugins) {
+        if (devicePlugin->requiredHardware().testFlag(HardwareResourceUpnpDisovery) && devicePlugin->pluginId() == pluginId) {
+            devicePlugin->upnpDiscoveryFinished(deviceDescriptorList);
+        }
+    }
+}
+
+void DeviceManager::upnpNotifyReceived(const QByteArray &notifyData)
+{
+    foreach (DevicePlugin *devicePlugin, m_devicePlugins) {
+        if (devicePlugin->requiredHardware().testFlag(HardwareResourceUpnpDisovery)) {
+            devicePlugin->upnpNotifyReceived(notifyData);
         }
     }
 }
diff --git a/libguh/network/networkmanager.cpp b/libguh/network/networkmanager.cpp
index 08b9a872..b8b4258b 100644
--- a/libguh/network/networkmanager.cpp
+++ b/libguh/network/networkmanager.cpp
@@ -29,21 +29,21 @@ NetworkManager::NetworkManager(QObject *parent) :
 QNetworkReply *NetworkManager::get(const PluginId &pluginId, const QNetworkRequest &request)
 {
     QNetworkReply  *reply = m_manager->get(request);
-    m_replys.insert(reply, pluginId);
+    m_replies.insert(reply, pluginId);
     return reply;
 }
 
 QNetworkReply *NetworkManager::post(const PluginId &pluginId, const QNetworkRequest &request, const QByteArray &data)
 {
     QNetworkReply  *reply = m_manager->post(request, data);
-    m_replys.insert(reply, pluginId);
+    m_replies.insert(reply, pluginId);
     return reply;
 }
 
 QNetworkReply *NetworkManager::put(const PluginId &pluginId, const QNetworkRequest &request, const QByteArray &data)
 {
     QNetworkReply  *reply = m_manager->put(request, data);
-    m_replys.insert(reply, pluginId);
+    m_replies.insert(reply, pluginId);
     return reply;
 }
 
@@ -54,6 +54,6 @@ void NetworkManager::replyFinished(QNetworkReply *reply)
     }
 
     // NOTE: Each plugin has to delete his own replys with deleteLater()!!
-    PluginId pluginId = m_replys.take(reply);
+    PluginId pluginId = m_replies.take(reply);
     emit replyReady(pluginId, reply);
 }
diff --git a/libguh/network/networkmanager.h b/libguh/network/networkmanager.h
index 39583e1f..09552504 100644
--- a/libguh/network/networkmanager.h
+++ b/libguh/network/networkmanager.h
@@ -42,7 +42,7 @@ public:
 
 private:
     QNetworkAccessManager *m_manager;
-    QHash<QNetworkReply *, PluginId> m_replys;
+    QHash<QNetworkReply *, PluginId> m_replies;
 
 signals:
     void replyReady(const PluginId &pluginId, QNetworkReply *reply);
@@ -50,8 +50,6 @@ signals:
 private slots:
     void replyFinished(QNetworkReply *reply);
 
-public slots:
-
 };
 
 #endif // NETWORKMANAGER_H
diff --git a/libguh/plugin/deviceplugin.cpp b/libguh/plugin/deviceplugin.cpp
index a9b299e1..229d3a9d 100644
--- a/libguh/plugin/deviceplugin.cpp
+++ b/libguh/plugin/deviceplugin.cpp
@@ -519,7 +519,7 @@ bool DevicePlugin::transmitData(int delay, QList<int> rawData, int repetitions)
     return false;
 }
 
-QNetworkReply *DevicePlugin::get(const QNetworkRequest &request)
+QNetworkReply *DevicePlugin::networkManagerGet(const QNetworkRequest &request)
 {
     if (requiredHardware().testFlag(DeviceManager::HardwareResourceNetworkManager)) {
         return deviceManager()->m_networkManager->get(pluginId(), request);
@@ -529,7 +529,7 @@ QNetworkReply *DevicePlugin::get(const QNetworkRequest &request)
     return nullptr;
 }
 
-QNetworkReply *DevicePlugin::post(const QNetworkRequest &request, const QByteArray &data)
+QNetworkReply *DevicePlugin::networkManagerPost(const QNetworkRequest &request, const QByteArray &data)
 {
     if (requiredHardware().testFlag(DeviceManager::HardwareResourceNetworkManager)) {
         return deviceManager()->m_networkManager->post(pluginId(), request, data);
@@ -539,7 +539,7 @@ QNetworkReply *DevicePlugin::post(const QNetworkRequest &request, const QByteArr
     return nullptr;
 }
 
-QNetworkReply *DevicePlugin::put(const QNetworkRequest &request, const QByteArray &data)
+QNetworkReply *DevicePlugin::networkManagerPut(const QNetworkRequest &request, const QByteArray &data)
 {
     if (requiredHardware().testFlag(DeviceManager::HardwareResourceNetworkManager)) {
         return deviceManager()->m_networkManager->put(pluginId(), request, data);
diff --git a/libguh/plugin/deviceplugin.h b/libguh/plugin/deviceplugin.h
index 498d8df2..cdf29263 100644
--- a/libguh/plugin/deviceplugin.h
+++ b/libguh/plugin/deviceplugin.h
@@ -64,7 +64,7 @@ public:
     virtual void upnpDiscoveryFinished(const QList<UpnpDeviceDescriptor> &upnpDeviceDescriptorList) {Q_UNUSED(upnpDeviceDescriptorList)}
     virtual void upnpNotifyReceived(const QByteArray &notifyData) {Q_UNUSED(notifyData)}
 
-    virtual void replyReady(QNetworkReply *reply) {Q_UNUSED(reply)}
+    virtual void networkManagerReplyReady(QNetworkReply *reply) {Q_UNUSED(reply)}
 
     // Configuration
     virtual QList<ParamType> configurationDescription() const;
@@ -97,9 +97,9 @@ protected:
     bool transmitData(int delay, QList<int> rawData);
 
     // Network manager
-    QNetworkReply *get(const QNetworkRequest &request);
-    QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data);
-    QNetworkReply *put(const QNetworkRequest &request, const QByteArray &data);
+    QNetworkReply *networkManagerGet(const QNetworkRequest &request);
+    QNetworkReply *networkManagerPost(const QNetworkRequest &request, const QByteArray &data);
+    QNetworkReply *networkManagerPut(const QNetworkRequest &request, const QByteArray &data);
 
 private:
     void initPlugin(const QJsonObject &metaData, DeviceManager *deviceManager);