diff --git a/libguh-core/guhcore.cpp b/libguh-core/guhcore.cpp
index 6bd6ec41..b620babb 100644
--- a/libguh-core/guhcore.cpp
+++ b/libguh-core/guhcore.cpp
@@ -97,7 +97,7 @@
 
 #include "guhcore.h"
 #include "loggingcategories.h"
-#include "jsonrpcserver.h"
+#include "jsonrpc/jsonrpcserver.h"
 #include "ruleengine.h"
 #include "networkmanager/networkmanager.h"
 
diff --git a/libguh-core/hardware/network/avahi/qtavahiservice.cpp b/libguh-core/hardware/network/avahi/qtavahiservice.cpp
index 2aa81d16..cb4c21c6 100644
--- a/libguh-core/hardware/network/avahi/qtavahiservice.cpp
+++ b/libguh-core/hardware/network/avahi/qtavahiservice.cpp
@@ -24,7 +24,7 @@
     \class QtAvahiService
     \brief Allows to publish an avahi service to the network.
 
-    \inmodule libguh
+    \inmodule libnymea
 */
 
 /*! \enum QtAvahiService::QtAvahiServiceState
diff --git a/libguh-core/hardware/network/avahi/qtavahiservicebrowserimplementation.cpp b/libguh-core/hardware/network/avahi/qtavahiservicebrowserimplementation.cpp
index 5bd01a74..f2a970fb 100644
--- a/libguh-core/hardware/network/avahi/qtavahiservicebrowserimplementation.cpp
+++ b/libguh-core/hardware/network/avahi/qtavahiservicebrowserimplementation.cpp
@@ -25,7 +25,7 @@
     \brief Allows to browse avahi services in the local network.
 
     \ingroup hardware
-    \inmodule libguh
+    \inmodule libnymea
 */
 
 /*! \fn void QtAvahiServiceBrowserImplementation::serviceEntryAdded(const AvahiServiceEntry &entry);
diff --git a/libguh-core/hardware/network/networkaccessmanagerimpl.cpp b/libguh-core/hardware/network/networkaccessmanagerimpl.cpp
index 9950ba9c..45d259af 100644
--- a/libguh-core/hardware/network/networkaccessmanagerimpl.cpp
+++ b/libguh-core/hardware/network/networkaccessmanagerimpl.cpp
@@ -25,7 +25,7 @@
   \brief Allows to send network requests and receive replies.
 
   \ingroup hardware
-  \inmodule libguh
+  \inmodule libnymea
 
   The network manager class is a reimplementation of the \l{http://doc-snapshot.qt-project.org/qt5-5.4/qnetworkaccessmanager.html}{QNetworkAccessManager}
   and allows plugins to send network requests and receive replies.
diff --git a/libguh-core/hardware/network/networkaccessmanagerimpl.h b/libguh-core/hardware/network/networkaccessmanagerimpl.h
index 59070f6d..ab2aaf7c 100644
--- a/libguh-core/hardware/network/networkaccessmanagerimpl.h
+++ b/libguh-core/hardware/network/networkaccessmanagerimpl.h
@@ -25,7 +25,7 @@
 
 #include "libguh.h"
 #include "typeutils.h"
-#include "libguh/network/networkaccessmanager.h"
+#include "network/networkaccessmanager.h"
 
 #include <QObject>
 #include <QNetworkAccessManager>
diff --git a/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp b/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp
index cd694bb3..4c7e80ac 100644
--- a/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp
+++ b/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp
@@ -25,7 +25,7 @@
   \brief Allows to detect UPnP devices in the network.
 
   \ingroup hardware
-  \inmodule libguh
+  \inmodule libnymea
 
   This resource allows plugins to discover UPnP devices in the network and receive notification messages. The resource
   will bind a UDP socket to the multicast 239.255.255.250 on port 1900.
diff --git a/libguh-core/hardware/radio433/radio433brennenstuhl.cpp b/libguh-core/hardware/radio433/radio433brennenstuhl.cpp
index b698e619..cc77aa42 100644
--- a/libguh-core/hardware/radio433/radio433brennenstuhl.cpp
+++ b/libguh-core/hardware/radio433/radio433brennenstuhl.cpp
@@ -25,7 +25,7 @@
   \brief The Radio433 class helps to interact with the 433 MHz receiver and transmitter.
 
   \ingroup hardware
-  \inmodule libguh
+  \inmodule libnymea
 
   This class handles all supported radio 433 MHz transmitter. Receiving data on the 433.92 MHz frequency
   is only supported, if there are \l{Gpio}{GPIO's} available and a suitable receiver is connected to GPIO 27. Examples for receiver
diff --git a/libguh-core/libguh-core.pro b/libguh-core/libguh-core.pro
index 667594f3..28a3863e 100644
--- a/libguh-core/libguh-core.pro
+++ b/libguh-core/libguh-core.pro
@@ -1,11 +1,11 @@
 TEMPLATE = lib
 TARGET = guh-core
 
-include(../guh.pri)
+include(../nymea.pri)
 
 QT += sql
-INCLUDEPATH += $$top_srcdir/libguh $$top_srcdir jsonrpc
-LIBS += -L$$top_builddir/libguh/ -lguh -lssl -lcrypto -lavahi-common -lavahi-client
+INCLUDEPATH += $$top_srcdir/libnymea
+LIBS += -L$$top_builddir/libnymea/ -lnymea -lssl -lcrypto -lavahi-common -lavahi-client
 
 target.path = /usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH')
 INSTALLS += target
diff --git a/libguh-core/mocktcpserver.cpp b/libguh-core/mocktcpserver.cpp
index dc57d32c..46f3762a 100644
--- a/libguh-core/mocktcpserver.cpp
+++ b/libguh-core/mocktcpserver.cpp
@@ -20,7 +20,6 @@
 
 #include "mocktcpserver.h"
 #include "loggingcategories.h"
-#include "jsonrpcserver.h"
 #include "guhcore.h"
 
 #include <QUuid>
diff --git a/libguh-core/rest/deviceclassesresource.h b/libguh-core/rest/deviceclassesresource.h
index 82979417..d25ac9da 100644
--- a/libguh-core/rest/deviceclassesresource.h
+++ b/libguh-core/rest/deviceclassesresource.h
@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QHash>
 
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 #include "restresource.h"
 #include "httpreply.h"
 
diff --git a/libguh-core/rest/devicesresource.cpp b/libguh-core/rest/devicesresource.cpp
index 73b6c495..a3eb84c3 100644
--- a/libguh-core/rest/devicesresource.cpp
+++ b/libguh-core/rest/devicesresource.cpp
@@ -39,7 +39,7 @@
 #include "devicesresource.h"
 #include "httpreply.h"
 #include "httprequest.h"
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 #include "guhcore.h"
 
 #include <QJsonDocument>
diff --git a/libguh-core/rest/devicesresource.h b/libguh-core/rest/devicesresource.h
index cc5e15b2..2895e4a7 100644
--- a/libguh-core/rest/devicesresource.h
+++ b/libguh-core/rest/devicesresource.h
@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QHash>
 
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 #include "restresource.h"
 #include "httpreply.h"
 
diff --git a/libguh-core/rest/logsresource.h b/libguh-core/rest/logsresource.h
index eda16643..58749794 100644
--- a/libguh-core/rest/logsresource.h
+++ b/libguh-core/rest/logsresource.h
@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QHash>
 
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 #include "restresource.h"
 #include "httpreply.h"
 
diff --git a/libguh-core/rest/pluginsresource.h b/libguh-core/rest/pluginsresource.h
index df68f931..b0effd4f 100644
--- a/libguh-core/rest/pluginsresource.h
+++ b/libguh-core/rest/pluginsresource.h
@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QHash>
 
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 #include "restresource.h"
 #include "httpreply.h"
 
diff --git a/libguh-core/rest/restresource.h b/libguh-core/rest/restresource.h
index 842282f8..14ee80c8 100644
--- a/libguh-core/rest/restresource.h
+++ b/libguh-core/rest/restresource.h
@@ -26,7 +26,7 @@
 
 #include "httpreply.h"
 #include "httprequest.h"
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 
 class QVariant;
 
diff --git a/libguh-core/rest/restserver.h b/libguh-core/rest/restserver.h
index 230af0cc..15730a0a 100644
--- a/libguh-core/rest/restserver.h
+++ b/libguh-core/rest/restserver.h
@@ -24,7 +24,7 @@
 #include <QObject>
 
 #include "webserver.h"
-#include "jsonhandler.h"
+#include "jsonrpc/jsonhandler.h"
 #include "devicesresource.h"
 #include "deviceclassesresource.h"
 #include "vendorsresource.h"
diff --git a/libguh-core/rest/rulesresource.h b/libguh-core/rest/rulesresource.h
index c1e90a3f..2e4bab7f 100644
--- a/libguh-core/rest/rulesresource.h
+++ b/libguh-core/rest/rulesresource.h
@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QHash>
 
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 #include "restresource.h"
 #include "httpreply.h"
 
diff --git a/libguh-core/rest/vendorsresource.h b/libguh-core/rest/vendorsresource.h
index e64029e0..a571c77c 100644
--- a/libguh-core/rest/vendorsresource.h
+++ b/libguh-core/rest/vendorsresource.h
@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QHash>
 
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 #include "restresource.h"
 #include "httpreply.h"
 
diff --git a/libguh/LICENSE b/libnymea/LICENSE
similarity index 100%
rename from libguh/LICENSE
rename to libnymea/LICENSE
diff --git a/libguh/coap/coap.cpp b/libnymea/coap/coap.cpp
similarity index 99%
rename from libguh/coap/coap.cpp
rename to libnymea/coap/coap.cpp
index 1549bc61..d878ce23 100644
--- a/libguh/coap/coap.cpp
+++ b/libnymea/coap/coap.cpp
@@ -23,7 +23,7 @@
     \brief The client connection class to a CoAP server.
 
     \ingroup coap
-    \inmodule libguh
+    \inmodule libnymea
 
     The Coap class provides a signal solt based communication with a \l{https://tools.ietf.org/html/rfc7252}{CoAP (Constrained Application Protocol)}
     server. The API of this class was inspired by the \l{http://doc.qt.io/qt-5/qnetworkaccessmanager.html}{QNetworkAccessManager} and was
diff --git a/libguh/coap/coap.h b/libnymea/coap/coap.h
similarity index 100%
rename from libguh/coap/coap.h
rename to libnymea/coap/coap.h
diff --git a/libguh/coap/coap.pri b/libnymea/coap/coap.pri
similarity index 100%
rename from libguh/coap/coap.pri
rename to libnymea/coap/coap.pri
diff --git a/libguh/coap/coapobserveresource.cpp b/libnymea/coap/coapobserveresource.cpp
similarity index 99%
rename from libguh/coap/coapobserveresource.cpp
rename to libnymea/coap/coapobserveresource.cpp
index 38776f0f..c0dde8d2 100644
--- a/libguh/coap/coapobserveresource.cpp
+++ b/libnymea/coap/coapobserveresource.cpp
@@ -23,7 +23,7 @@
     \brief Holds information about an observed resource.
 
     \ingroup coap
-    \inmodule libguh
+    \inmodule libnymea
 
     The CoapObserveResource class holds information about an observed resource.
 
diff --git a/libguh/coap/coapobserveresource.h b/libnymea/coap/coapobserveresource.h
similarity index 100%
rename from libguh/coap/coapobserveresource.h
rename to libnymea/coap/coapobserveresource.h
diff --git a/libguh/coap/coapoption.cpp b/libnymea/coap/coapoption.cpp
similarity index 99%
rename from libguh/coap/coapoption.cpp
rename to libnymea/coap/coapoption.cpp
index a238efd5..baabadf7 100644
--- a/libguh/coap/coapoption.cpp
+++ b/libnymea/coap/coapoption.cpp
@@ -23,7 +23,7 @@
     \brief Represents the option of a \l{CoapPdu}.
 
     \ingroup coap
-    \inmodule libguh
+    \inmodule libnymea
 
     The CoapOption class provides an easy way to create / parse CoAP options of a \l{CoapPdu} (Protocol Data Unit). An options
     can be compared with a HTTP header.
diff --git a/libguh/coap/coapoption.h b/libnymea/coap/coapoption.h
similarity index 100%
rename from libguh/coap/coapoption.h
rename to libnymea/coap/coapoption.h
diff --git a/libguh/coap/coappdu.cpp b/libnymea/coap/coappdu.cpp
similarity index 99%
rename from libguh/coap/coappdu.cpp
rename to libnymea/coap/coappdu.cpp
index 0229e6ff..67ba9115 100644
--- a/libguh/coap/coappdu.cpp
+++ b/libnymea/coap/coappdu.cpp
@@ -23,7 +23,7 @@
     \brief Represents a CoAP protocol data unit (PDU).
 
     \ingroup coap
-    \inmodule libguh
+    \inmodule libnymea
 
 */
 
diff --git a/libguh/coap/coappdu.h b/libnymea/coap/coappdu.h
similarity index 100%
rename from libguh/coap/coappdu.h
rename to libnymea/coap/coappdu.h
diff --git a/libguh/coap/coappdublock.cpp b/libnymea/coap/coappdublock.cpp
similarity index 100%
rename from libguh/coap/coappdublock.cpp
rename to libnymea/coap/coappdublock.cpp
diff --git a/libguh/coap/coappdublock.h b/libnymea/coap/coappdublock.h
similarity index 100%
rename from libguh/coap/coappdublock.h
rename to libnymea/coap/coappdublock.h
diff --git a/libguh/coap/coapreply.cpp b/libnymea/coap/coapreply.cpp
similarity index 99%
rename from libguh/coap/coapreply.cpp
rename to libnymea/coap/coapreply.cpp
index 0a88e734..94e1afc5 100644
--- a/libguh/coap/coapreply.cpp
+++ b/libnymea/coap/coapreply.cpp
@@ -23,7 +23,7 @@
     \brief Represents a reply of a CoAP request.
 
     \ingroup coap
-    \inmodule libguh
+    \inmodule libnymea
 
     The CoapReply class contains the data and headers for a request sent with \l{Coap} client.
 
diff --git a/libguh/coap/coapreply.h b/libnymea/coap/coapreply.h
similarity index 100%
rename from libguh/coap/coapreply.h
rename to libnymea/coap/coapreply.h
diff --git a/libguh/coap/coaprequest.cpp b/libnymea/coap/coaprequest.cpp
similarity index 99%
rename from libguh/coap/coaprequest.cpp
rename to libnymea/coap/coaprequest.cpp
index e57a9a27..cf9e3edc 100644
--- a/libguh/coap/coaprequest.cpp
+++ b/libnymea/coap/coaprequest.cpp
@@ -23,7 +23,7 @@
     \brief Represents a request to a CoAP server.
 
     \ingroup coap
-    \inmodule libguh
+    \inmodule libnymea
 
 */
 
diff --git a/libguh/coap/coaprequest.h b/libnymea/coap/coaprequest.h
similarity index 100%
rename from libguh/coap/coaprequest.h
rename to libnymea/coap/coaprequest.h
diff --git a/libguh/coap/corelink.cpp b/libnymea/coap/corelink.cpp
similarity index 99%
rename from libguh/coap/corelink.cpp
rename to libnymea/coap/corelink.cpp
index 69626a6c..9446f982 100644
--- a/libguh/coap/corelink.cpp
+++ b/libnymea/coap/corelink.cpp
@@ -23,7 +23,7 @@
     \brief Represents a link of a CoRE link format.
 
     \ingroup coap
-    \inmodule libguh
+    \inmodule libnymea
 
     This class represents a Constrained RESTful Environments (CoRE) Link format according to the
     \l{http://tools.ietf.org/html/rfc6690}{RFC6690} specification.
diff --git a/libguh/coap/corelink.h b/libnymea/coap/corelink.h
similarity index 100%
rename from libguh/coap/corelink.h
rename to libnymea/coap/corelink.h
diff --git a/libguh/coap/corelinkparser.cpp b/libnymea/coap/corelinkparser.cpp
similarity index 99%
rename from libguh/coap/corelinkparser.cpp
rename to libnymea/coap/corelinkparser.cpp
index 44f84a5b..13a1154f 100644
--- a/libguh/coap/corelinkparser.cpp
+++ b/libnymea/coap/corelinkparser.cpp
@@ -23,7 +23,7 @@
     \brief Provides an easy way to parse a CoRE link list.
 
     \ingroup coap
-    \inmodule libguh
+    \inmodule libnymea
 
     \section2 Example
 
diff --git a/libguh/coap/corelinkparser.h b/libnymea/coap/corelinkparser.h
similarity index 100%
rename from libguh/coap/corelinkparser.h
rename to libnymea/coap/corelinkparser.h
diff --git a/libguh/devicemanager.cpp b/libnymea/devicemanager.cpp
similarity index 99%
rename from libguh/devicemanager.cpp
rename to libnymea/devicemanager.cpp
index 87b10ca9..1516714b 100644
--- a/libguh/devicemanager.cpp
+++ b/libnymea/devicemanager.cpp
@@ -26,7 +26,7 @@
     \brief The main entry point when interacting with \l{Device}{Devices}
 
     \ingroup devices
-    \inmodule libguh
+    \inmodule libnymea
 
     The DeviceManager hold  s all information about supported and configured Devices in the system.
 
@@ -244,10 +244,10 @@ QList<QJsonObject> DeviceManager::pluginsMetadata()
         QDir dir(path);
         foreach (const QString &entry, dir.entryList()) {
             QFileInfo fi;
-            if (entry.startsWith("libguh_deviceplugin") && entry.endsWith(".so")) {
+            if (entry.startsWith("libnymea_deviceplugin") && entry.endsWith(".so")) {
                 fi.setFile(path + "/" + entry);
             } else {
-                fi.setFile(path + "/" + entry + "/libguh_deviceplugin" + entry + ".so");
+                fi.setFile(path + "/" + entry + "/libnymea_deviceplugin" + entry + ".so");
             }
             if (!fi.exists()) {
                 continue;
@@ -1008,10 +1008,10 @@ void DeviceManager::loadPlugins()
         qCDebug(dcDeviceManager) << "Loading plugins from:" << dir.absolutePath();
         foreach (const QString &entry, dir.entryList()) {
             QFileInfo fi;
-            if (entry.startsWith("libguh_deviceplugin") && entry.endsWith(".so")) {
+            if (entry.startsWith("libnymea_deviceplugin") && entry.endsWith(".so")) {
                 fi.setFile(path + "/" + entry);
             } else {
-                fi.setFile(path + "/" + entry + "/libguh_deviceplugin" + entry + ".so");
+                fi.setFile(path + "/" + entry + "/libnymea_deviceplugin" + entry + ".so");
             }
 
             if (!fi.exists())
diff --git a/libguh/devicemanager.h b/libnymea/devicemanager.h
similarity index 100%
rename from libguh/devicemanager.h
rename to libnymea/devicemanager.h
diff --git a/libguh/guhsettings.cpp b/libnymea/guhsettings.cpp
similarity index 100%
rename from libguh/guhsettings.cpp
rename to libnymea/guhsettings.cpp
diff --git a/libguh/guhsettings.h b/libnymea/guhsettings.h
similarity index 100%
rename from libguh/guhsettings.h
rename to libnymea/guhsettings.h
diff --git a/libguh/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.cpp b/libnymea/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.cpp
similarity index 100%
rename from libguh/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.cpp
rename to libnymea/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.cpp
diff --git a/libguh/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.h b/libnymea/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.h
similarity index 100%
rename from libguh/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.h
rename to libnymea/hardware/bluetoothlowenergy/bluetoothdiscoveryreply.h
diff --git a/libguh/hardware/bluetoothlowenergy/bluetoothlowenergydevice.cpp b/libnymea/hardware/bluetoothlowenergy/bluetoothlowenergydevice.cpp
similarity index 100%
rename from libguh/hardware/bluetoothlowenergy/bluetoothlowenergydevice.cpp
rename to libnymea/hardware/bluetoothlowenergy/bluetoothlowenergydevice.cpp
diff --git a/libguh/hardware/bluetoothlowenergy/bluetoothlowenergydevice.h b/libnymea/hardware/bluetoothlowenergy/bluetoothlowenergydevice.h
similarity index 100%
rename from libguh/hardware/bluetoothlowenergy/bluetoothlowenergydevice.h
rename to libnymea/hardware/bluetoothlowenergy/bluetoothlowenergydevice.h
diff --git a/libguh/hardware/bluetoothlowenergy/bluetoothlowenergymanager.cpp b/libnymea/hardware/bluetoothlowenergy/bluetoothlowenergymanager.cpp
similarity index 100%
rename from libguh/hardware/bluetoothlowenergy/bluetoothlowenergymanager.cpp
rename to libnymea/hardware/bluetoothlowenergy/bluetoothlowenergymanager.cpp
diff --git a/libguh/hardware/bluetoothlowenergy/bluetoothlowenergymanager.h b/libnymea/hardware/bluetoothlowenergy/bluetoothlowenergymanager.h
similarity index 100%
rename from libguh/hardware/bluetoothlowenergy/bluetoothlowenergymanager.h
rename to libnymea/hardware/bluetoothlowenergy/bluetoothlowenergymanager.h
diff --git a/libguh/hardware/gpio.cpp b/libnymea/hardware/gpio.cpp
similarity index 99%
rename from libguh/hardware/gpio.cpp
rename to libnymea/hardware/gpio.cpp
index cbf7b30a..c285a4a7 100644
--- a/libguh/hardware/gpio.cpp
+++ b/libnymea/hardware/gpio.cpp
@@ -25,7 +25,7 @@
   \brief The Gpio class allows to interact with the GPIOs.
 
   \ingroup hardware
-  \inmodule libguh
+  \inmodule libnymea
 
   A "General Purpose Input/Output" (GPIO) is a flexible software-controlled
   digital signal. They are provided from many kinds of chip, and are familiar
diff --git a/libguh/hardware/gpio.h b/libnymea/hardware/gpio.h
similarity index 100%
rename from libguh/hardware/gpio.h
rename to libnymea/hardware/gpio.h
diff --git a/libguh/hardware/gpiomonitor.cpp b/libnymea/hardware/gpiomonitor.cpp
similarity index 99%
rename from libguh/hardware/gpiomonitor.cpp
rename to libnymea/hardware/gpiomonitor.cpp
index 75dcb20e..bfe6c3f4 100644
--- a/libguh/hardware/gpiomonitor.cpp
+++ b/libnymea/hardware/gpiomonitor.cpp
@@ -25,7 +25,7 @@
     \brief The GpioMonitor class allows to monitor GPIOs.
 
     \ingroup hardware
-    \inmodule libguh
+    \inmodule libnymea
 
     An instance of this class creates a thread, which monitors each of the added GPIOs. The object
     emits a signal if one of the added GPIOs changes its value. The GpioMonitor configures a GPIO as an
diff --git a/libguh/hardware/gpiomonitor.h b/libnymea/hardware/gpiomonitor.h
similarity index 100%
rename from libguh/hardware/gpiomonitor.h
rename to libnymea/hardware/gpiomonitor.h
diff --git a/libguh/hardware/pwm.cpp b/libnymea/hardware/pwm.cpp
similarity index 100%
rename from libguh/hardware/pwm.cpp
rename to libnymea/hardware/pwm.cpp
diff --git a/libguh/hardware/pwm.h b/libnymea/hardware/pwm.h
similarity index 100%
rename from libguh/hardware/pwm.h
rename to libnymea/hardware/pwm.h
diff --git a/libguh/hardware/radio433/radio433.cpp b/libnymea/hardware/radio433/radio433.cpp
similarity index 99%
rename from libguh/hardware/radio433/radio433.cpp
rename to libnymea/hardware/radio433/radio433.cpp
index 7a93e227..a59efc09 100644
--- a/libguh/hardware/radio433/radio433.cpp
+++ b/libnymea/hardware/radio433/radio433.cpp
@@ -25,7 +25,7 @@
   \brief The Radio433 class helps to interact with the 433 MHz receiver and transmitter.
 
   \ingroup hardware
-  \inmodule libguh
+  \inmodule libnymea
 
   This class handles all supported radio 433 MHz transmitter. Receiving data on the 433.92 MHz frequency
   is only supported, if there are \l{Gpio}{GPIO's} available and a suitable receiver is connected to GPIO 27. Examples for receiver
diff --git a/libguh/hardware/radio433/radio433.h b/libnymea/hardware/radio433/radio433.h
similarity index 100%
rename from libguh/hardware/radio433/radio433.h
rename to libnymea/hardware/radio433/radio433.h
diff --git a/libguh/hardware/radio433/radio433receiver.cpp b/libnymea/hardware/radio433/radio433receiver.cpp
similarity index 100%
rename from libguh/hardware/radio433/radio433receiver.cpp
rename to libnymea/hardware/radio433/radio433receiver.cpp
diff --git a/libguh/hardware/radio433/radio433receiver.h b/libnymea/hardware/radio433/radio433receiver.h
similarity index 100%
rename from libguh/hardware/radio433/radio433receiver.h
rename to libnymea/hardware/radio433/radio433receiver.h
diff --git a/libguh/hardwaremanager.cpp b/libnymea/hardwaremanager.cpp
similarity index 100%
rename from libguh/hardwaremanager.cpp
rename to libnymea/hardwaremanager.cpp
diff --git a/libguh/hardwaremanager.h b/libnymea/hardwaremanager.h
similarity index 100%
rename from libguh/hardwaremanager.h
rename to libnymea/hardwaremanager.h
diff --git a/libguh/hardwareresource.cpp b/libnymea/hardwareresource.cpp
similarity index 100%
rename from libguh/hardwareresource.cpp
rename to libnymea/hardwareresource.cpp
diff --git a/libguh/hardwareresource.h b/libnymea/hardwareresource.h
similarity index 100%
rename from libguh/hardwareresource.h
rename to libnymea/hardwareresource.h
diff --git a/libguh/interfaces/battery.json b/libnymea/interfaces/battery.json
similarity index 100%
rename from libguh/interfaces/battery.json
rename to libnymea/interfaces/battery.json
diff --git a/libguh/interfaces/button.json b/libnymea/interfaces/button.json
similarity index 100%
rename from libguh/interfaces/button.json
rename to libnymea/interfaces/button.json
diff --git a/libguh/interfaces/colorlight.json b/libnymea/interfaces/colorlight.json
similarity index 100%
rename from libguh/interfaces/colorlight.json
rename to libnymea/interfaces/colorlight.json
diff --git a/libguh/interfaces/connectable.json b/libnymea/interfaces/connectable.json
similarity index 100%
rename from libguh/interfaces/connectable.json
rename to libnymea/interfaces/connectable.json
diff --git a/libguh/interfaces/dimmablelight.json b/libnymea/interfaces/dimmablelight.json
similarity index 100%
rename from libguh/interfaces/dimmablelight.json
rename to libnymea/interfaces/dimmablelight.json
diff --git a/libguh/interfaces/extendedvolumecontroller.json b/libnymea/interfaces/extendedvolumecontroller.json
similarity index 100%
rename from libguh/interfaces/extendedvolumecontroller.json
rename to libnymea/interfaces/extendedvolumecontroller.json
diff --git a/libguh/interfaces/garagegate.json b/libnymea/interfaces/garagegate.json
similarity index 100%
rename from libguh/interfaces/garagegate.json
rename to libnymea/interfaces/garagegate.json
diff --git a/libguh/interfaces/gateway.json b/libnymea/interfaces/gateway.json
similarity index 100%
rename from libguh/interfaces/gateway.json
rename to libnymea/interfaces/gateway.json
diff --git a/libguh/interfaces/generatedoc.sh b/libnymea/interfaces/generatedoc.sh
similarity index 100%
rename from libguh/interfaces/generatedoc.sh
rename to libnymea/interfaces/generatedoc.sh
diff --git a/libguh/interfaces/humiditysensor.json b/libnymea/interfaces/humiditysensor.json
similarity index 100%
rename from libguh/interfaces/humiditysensor.json
rename to libnymea/interfaces/humiditysensor.json
diff --git a/libguh/interfaces/inputtrigger.json b/libnymea/interfaces/inputtrigger.json
similarity index 100%
rename from libguh/interfaces/inputtrigger.json
rename to libnymea/interfaces/inputtrigger.json
diff --git a/libguh/interfaces/interfaces.qrc b/libnymea/interfaces/interfaces.qrc
similarity index 100%
rename from libguh/interfaces/interfaces.qrc
rename to libnymea/interfaces/interfaces.qrc
diff --git a/libguh/interfaces/light.json b/libnymea/interfaces/light.json
similarity index 100%
rename from libguh/interfaces/light.json
rename to libnymea/interfaces/light.json
diff --git a/libguh/interfaces/longpressbutton.json b/libnymea/interfaces/longpressbutton.json
similarity index 100%
rename from libguh/interfaces/longpressbutton.json
rename to libnymea/interfaces/longpressbutton.json
diff --git a/libguh/interfaces/longpressmultibutton.json b/libnymea/interfaces/longpressmultibutton.json
similarity index 100%
rename from libguh/interfaces/longpressmultibutton.json
rename to libnymea/interfaces/longpressmultibutton.json
diff --git a/libguh/interfaces/media.json b/libnymea/interfaces/media.json
similarity index 100%
rename from libguh/interfaces/media.json
rename to libnymea/interfaces/media.json
diff --git a/libguh/interfaces/mediacontroller.json b/libnymea/interfaces/mediacontroller.json
similarity index 100%
rename from libguh/interfaces/mediacontroller.json
rename to libnymea/interfaces/mediacontroller.json
diff --git a/libguh/interfaces/mediametadataprovider.json b/libnymea/interfaces/mediametadataprovider.json
similarity index 100%
rename from libguh/interfaces/mediametadataprovider.json
rename to libnymea/interfaces/mediametadataprovider.json
diff --git a/libguh/interfaces/mediaplayer.json b/libnymea/interfaces/mediaplayer.json
similarity index 100%
rename from libguh/interfaces/mediaplayer.json
rename to libnymea/interfaces/mediaplayer.json
diff --git a/libguh/interfaces/notifications.json b/libnymea/interfaces/notifications.json
similarity index 100%
rename from libguh/interfaces/notifications.json
rename to libnymea/interfaces/notifications.json
diff --git a/libguh/interfaces/outputtrigger.json b/libnymea/interfaces/outputtrigger.json
similarity index 100%
rename from libguh/interfaces/outputtrigger.json
rename to libnymea/interfaces/outputtrigger.json
diff --git a/libguh/interfaces/power.json b/libnymea/interfaces/power.json
similarity index 100%
rename from libguh/interfaces/power.json
rename to libnymea/interfaces/power.json
diff --git a/libguh/interfaces/sensor.json b/libnymea/interfaces/sensor.json
similarity index 100%
rename from libguh/interfaces/sensor.json
rename to libnymea/interfaces/sensor.json
diff --git a/libguh/interfaces/simplebutton.json b/libnymea/interfaces/simplebutton.json
similarity index 100%
rename from libguh/interfaces/simplebutton.json
rename to libnymea/interfaces/simplebutton.json
diff --git a/libguh/interfaces/simplemultibutton.json b/libnymea/interfaces/simplemultibutton.json
similarity index 100%
rename from libguh/interfaces/simplemultibutton.json
rename to libnymea/interfaces/simplemultibutton.json
diff --git a/libguh/interfaces/temperaturesensor.json b/libnymea/interfaces/temperaturesensor.json
similarity index 100%
rename from libguh/interfaces/temperaturesensor.json
rename to libnymea/interfaces/temperaturesensor.json
diff --git a/libguh/interfaces/volumecontroller.json b/libnymea/interfaces/volumecontroller.json
similarity index 100%
rename from libguh/interfaces/volumecontroller.json
rename to libnymea/interfaces/volumecontroller.json
diff --git a/libguh/interfaces/weather.json b/libnymea/interfaces/weather.json
similarity index 100%
rename from libguh/interfaces/weather.json
rename to libnymea/interfaces/weather.json
diff --git a/libguh/libguh.h b/libnymea/libguh.h
similarity index 100%
rename from libguh/libguh.h
rename to libnymea/libguh.h
diff --git a/libguh/libguh.pro b/libnymea/libnymea.pro
similarity index 99%
rename from libguh/libguh.pro
rename to libnymea/libnymea.pro
index ab309c3a..b92c9615 100644
--- a/libguh/libguh.pro
+++ b/libnymea/libnymea.pro
@@ -1,6 +1,6 @@
-include(../guh.pri)
+include(../nymea.pri)
 
-TARGET = guh
+TARGET = nymea
 TEMPLATE = lib
 
 QT += network bluetooth
diff --git a/libguh/loggingcategories.cpp b/libnymea/loggingcategories.cpp
similarity index 100%
rename from libguh/loggingcategories.cpp
rename to libnymea/loggingcategories.cpp
diff --git a/libguh/loggingcategories.h b/libnymea/loggingcategories.h
similarity index 99%
rename from libguh/loggingcategories.h
rename to libnymea/loggingcategories.h
index 2506f28c..b3f8959c 100644
--- a/libguh/loggingcategories.h
+++ b/libnymea/loggingcategories.h
@@ -29,7 +29,7 @@
 // Include dcCoap
 #include "coap/coap.h"
 
-// Core / libguh
+// Core / libnymea
 Q_DECLARE_LOGGING_CATEGORY(dcApplication)
 Q_DECLARE_LOGGING_CATEGORY(dcDeviceManager)
 Q_DECLARE_LOGGING_CATEGORY(dcTimeManager)
diff --git a/libguh/network/avahi/avahiserviceentry.cpp b/libnymea/network/avahi/avahiserviceentry.cpp
similarity index 99%
rename from libguh/network/avahi/avahiserviceentry.cpp
rename to libnymea/network/avahi/avahiserviceentry.cpp
index 3bd0bc71..c406116d 100644
--- a/libguh/network/avahi/avahiserviceentry.cpp
+++ b/libnymea/network/avahi/avahiserviceentry.cpp
@@ -25,7 +25,7 @@
     \brief Holds information about an avahi service entry.
 
     \ingroup types
-    \inmodule libguh
+    \inmodule libnymea
 
 */
 
diff --git a/libguh/network/avahi/avahiserviceentry.h b/libnymea/network/avahi/avahiserviceentry.h
similarity index 100%
rename from libguh/network/avahi/avahiserviceentry.h
rename to libnymea/network/avahi/avahiserviceentry.h
diff --git a/libguh/network/avahi/qtavahiservicebrowser.cpp b/libnymea/network/avahi/qtavahiservicebrowser.cpp
similarity index 99%
rename from libguh/network/avahi/qtavahiservicebrowser.cpp
rename to libnymea/network/avahi/qtavahiservicebrowser.cpp
index 075f4a39..a3763484 100644
--- a/libguh/network/avahi/qtavahiservicebrowser.cpp
+++ b/libnymea/network/avahi/qtavahiservicebrowser.cpp
@@ -25,7 +25,7 @@
     \brief Allows to browse avahi services in the local network.
 
     \ingroup hardware
-    \inmodule libguh
+    \inmodule libnymea
 */
 
 /*! \fn void QtAvahiServiceBrowser::serviceEntryAdded(const AvahiServiceEntry &entry);
diff --git a/libguh/network/avahi/qtavahiservicebrowser.h b/libnymea/network/avahi/qtavahiservicebrowser.h
similarity index 100%
rename from libguh/network/avahi/qtavahiservicebrowser.h
rename to libnymea/network/avahi/qtavahiservicebrowser.h
diff --git a/libguh/network/networkaccessmanager.cpp b/libnymea/network/networkaccessmanager.cpp
similarity index 99%
rename from libguh/network/networkaccessmanager.cpp
rename to libnymea/network/networkaccessmanager.cpp
index 4ac02a31..afc94eef 100644
--- a/libguh/network/networkaccessmanager.cpp
+++ b/libnymea/network/networkaccessmanager.cpp
@@ -25,7 +25,7 @@
   \brief Allows to send network requests and receive replies.
 
   \ingroup hardware
-  \inmodule libguh
+  \inmodule libnymea
 
   The network manager class is a reimplementation of the \l{http://doc-snapshot.qt-project.org/qt5-5.4/qnetworkaccessmanager.html}{QNetworkAccessManager}
   and allows plugins to send network requests and receive replies.
diff --git a/libguh/network/networkaccessmanager.h b/libnymea/network/networkaccessmanager.h
similarity index 100%
rename from libguh/network/networkaccessmanager.h
rename to libnymea/network/networkaccessmanager.h
diff --git a/libguh/network/oauth2.cpp b/libnymea/network/oauth2.cpp
similarity index 100%
rename from libguh/network/oauth2.cpp
rename to libnymea/network/oauth2.cpp
diff --git a/libguh/network/oauth2.h b/libnymea/network/oauth2.h
similarity index 100%
rename from libguh/network/oauth2.h
rename to libnymea/network/oauth2.h
diff --git a/libguh/network/upnp/upnpdevice.cpp b/libnymea/network/upnp/upnpdevice.cpp
similarity index 99%
rename from libguh/network/upnp/upnpdevice.cpp
rename to libnymea/network/upnp/upnpdevice.cpp
index 6ebb8beb..1ca189c2 100644
--- a/libguh/network/upnp/upnpdevice.cpp
+++ b/libnymea/network/upnp/upnpdevice.cpp
@@ -25,7 +25,7 @@
     \brief Describes an UPnP device.
 
     \ingroup types
-    \inmodule libguh
+    \inmodule libnymea
 
     This class represents a UPnP device with all parameters described in following documentation: \l{http://upnp.org/specs/arch/UPnP-arch-DeviceArchitecture-v1.1.pdf}.
 
diff --git a/libguh/network/upnp/upnpdevice.h b/libnymea/network/upnp/upnpdevice.h
similarity index 100%
rename from libguh/network/upnp/upnpdevice.h
rename to libnymea/network/upnp/upnpdevice.h
diff --git a/libguh/network/upnp/upnpdevicedescriptor.cpp b/libnymea/network/upnp/upnpdevicedescriptor.cpp
similarity index 99%
rename from libguh/network/upnp/upnpdevicedescriptor.cpp
rename to libnymea/network/upnp/upnpdevicedescriptor.cpp
index f96d2a83..66dbdc57 100644
--- a/libguh/network/upnp/upnpdevicedescriptor.cpp
+++ b/libnymea/network/upnp/upnpdevicedescriptor.cpp
@@ -25,7 +25,7 @@
     \brief Holds the description of an UPnP device.
 
     \ingroup types
-    \inmodule libguh
+    \inmodule libnymea
 
 
     \sa UpnpDevice
diff --git a/libguh/network/upnp/upnpdevicedescriptor.h b/libnymea/network/upnp/upnpdevicedescriptor.h
similarity index 100%
rename from libguh/network/upnp/upnpdevicedescriptor.h
rename to libnymea/network/upnp/upnpdevicedescriptor.h
diff --git a/libguh/network/upnp/upnpdiscovery.cpp b/libnymea/network/upnp/upnpdiscovery.cpp
similarity index 99%
rename from libguh/network/upnp/upnpdiscovery.cpp
rename to libnymea/network/upnp/upnpdiscovery.cpp
index d4ae8307..a3ec7afe 100644
--- a/libguh/network/upnp/upnpdiscovery.cpp
+++ b/libnymea/network/upnp/upnpdiscovery.cpp
@@ -25,7 +25,7 @@
   \brief Allows to detect UPnP devices in the network.
 
   \ingroup hardware
-  \inmodule libguh
+  \inmodule libnymea
 
   This resource allows plugins to discover UPnP devices in the network and receive notification messages. The resource
   will bind a UDP socket to the multicast 239.255.255.250 on port 1900.
diff --git a/libguh/network/upnp/upnpdiscovery.h b/libnymea/network/upnp/upnpdiscovery.h
similarity index 100%
rename from libguh/network/upnp/upnpdiscovery.h
rename to libnymea/network/upnp/upnpdiscovery.h
diff --git a/libguh/network/upnp/upnpdiscoveryreply.cpp b/libnymea/network/upnp/upnpdiscoveryreply.cpp
similarity index 100%
rename from libguh/network/upnp/upnpdiscoveryreply.cpp
rename to libnymea/network/upnp/upnpdiscoveryreply.cpp
diff --git a/libguh/network/upnp/upnpdiscoveryreply.h b/libnymea/network/upnp/upnpdiscoveryreply.h
similarity index 100%
rename from libguh/network/upnp/upnpdiscoveryreply.h
rename to libnymea/network/upnp/upnpdiscoveryreply.h
diff --git a/libguh/plugin/device.cpp b/libnymea/plugin/device.cpp
similarity index 99%
rename from libguh/plugin/device.cpp
rename to libnymea/plugin/device.cpp
index ade2398a..cd59f97b 100644
--- a/libguh/plugin/device.cpp
+++ b/libnymea/plugin/device.cpp
@@ -26,7 +26,7 @@
   \brief A Device represents a installed and configured hardware device.
 
   \ingroup devices
-  \inmodule libguh
+  \inmodule libnymea
 
   This class holds the values for configured devices. It is associated with a \{DeviceClass} which
   can be used to get more details about the device.
diff --git a/libguh/plugin/device.h b/libnymea/plugin/device.h
similarity index 100%
rename from libguh/plugin/device.h
rename to libnymea/plugin/device.h
diff --git a/libguh/plugin/devicedescriptor.cpp b/libnymea/plugin/devicedescriptor.cpp
similarity index 99%
rename from libguh/plugin/devicedescriptor.cpp
rename to libnymea/plugin/devicedescriptor.cpp
index 840c8134..e2763fdf 100644
--- a/libguh/plugin/devicedescriptor.cpp
+++ b/libnymea/plugin/devicedescriptor.cpp
@@ -26,7 +26,7 @@
     \brief Holds the description of a \l{Device}.
 
     \ingroup devices
-    \inmodule libguh
+    \inmodule libnymea
 
     An DeviceDescriptor describes an \l{Device} in order to match it with a \l{guhserver::Rule}.
 
diff --git a/libguh/plugin/devicedescriptor.h b/libnymea/plugin/devicedescriptor.h
similarity index 100%
rename from libguh/plugin/devicedescriptor.h
rename to libnymea/plugin/devicedescriptor.h
diff --git a/libguh/plugin/devicepairinginfo.cpp b/libnymea/plugin/devicepairinginfo.cpp
similarity index 100%
rename from libguh/plugin/devicepairinginfo.cpp
rename to libnymea/plugin/devicepairinginfo.cpp
diff --git a/libguh/plugin/devicepairinginfo.h b/libnymea/plugin/devicepairinginfo.h
similarity index 100%
rename from libguh/plugin/devicepairinginfo.h
rename to libnymea/plugin/devicepairinginfo.h
diff --git a/libguh/plugin/deviceplugin.cpp b/libnymea/plugin/deviceplugin.cpp
similarity index 99%
rename from libguh/plugin/deviceplugin.cpp
rename to libnymea/plugin/deviceplugin.cpp
index 6e199c25..c10f670d 100644
--- a/libguh/plugin/deviceplugin.cpp
+++ b/libnymea/plugin/deviceplugin.cpp
@@ -26,7 +26,7 @@
   \brief This is the base class interface for device plugins.
 
   \ingroup devices
-  \inmodule libguh
+  \inmodule libnymea
 
 
 */
diff --git a/libguh/plugin/deviceplugin.h b/libnymea/plugin/deviceplugin.h
similarity index 100%
rename from libguh/plugin/deviceplugin.h
rename to libnymea/plugin/deviceplugin.h
diff --git a/libguh/plugintimer.cpp b/libnymea/plugintimer.cpp
similarity index 100%
rename from libguh/plugintimer.cpp
rename to libnymea/plugintimer.cpp
diff --git a/libguh/plugintimer.h b/libnymea/plugintimer.h
similarity index 100%
rename from libguh/plugintimer.h
rename to libnymea/plugintimer.h
diff --git a/libguh/types/action.cpp b/libnymea/types/action.cpp
similarity index 99%
rename from libguh/types/action.cpp
rename to libnymea/types/action.cpp
index ea806bea..1ec569a8 100644
--- a/libguh/types/action.cpp
+++ b/libnymea/types/action.cpp
@@ -26,7 +26,7 @@
     \brief Holds information required to execute an action described by a \l{ActionType}.
 
     \ingroup guh-types
-    \inmodule libguh
+    \inmodule libnymea
 
     It is bound to a \l{Device} and an \l{ActionType} and holds the parameters
     for the execution of the action.
diff --git a/libguh/types/action.h b/libnymea/types/action.h
similarity index 100%
rename from libguh/types/action.h
rename to libnymea/types/action.h
diff --git a/libguh/types/actiontype.cpp b/libnymea/types/actiontype.cpp
similarity index 99%
rename from libguh/types/actiontype.cpp
rename to libnymea/types/actiontype.cpp
index 76100dd4..28ebb893 100644
--- a/libguh/types/actiontype.cpp
+++ b/libnymea/types/actiontype.cpp
@@ -26,7 +26,7 @@
     \brief Describes an \l{Action} for a \l{Device}.
 
     \ingroup guh-types
-    \inmodule libguh
+    \inmodule libnymea
 
     ActionTypes are contained in \l{DeviceClass} templates returned
     by \l{DevicePlugin}{DevicePlugins} in order to describe the hardware supported
diff --git a/libguh/types/actiontype.h b/libnymea/types/actiontype.h
similarity index 100%
rename from libguh/types/actiontype.h
rename to libnymea/types/actiontype.h
diff --git a/libguh/types/deviceclass.cpp b/libnymea/types/deviceclass.cpp
similarity index 97%
rename from libguh/types/deviceclass.cpp
rename to libnymea/types/deviceclass.cpp
index 7e9454b1..c0e90449 100644
--- a/libguh/types/deviceclass.cpp
+++ b/libnymea/types/deviceclass.cpp
@@ -1,9 +1,9 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *                                                                         *
  *  Copyright (C) 2015 Simon Stürz <simon.stuerz@guh.io>                   *
- *  Copyright (C) 2014 Michael Zanetti <michael_zanetti@gmx.net>           *
+ *  Copyright (C) 2014-2018 Michael Zanetti <michael.zanetti@guh.io>       *
  *                                                                         *
- *  This file is part of guh.                                              *
+ *  This file is part of nymea.                                            *
  *                                                                         *
  *  This library is free software; you can redistribute it and/or          *
  *  modify it under the terms of the GNU Lesser General Public             *
@@ -25,7 +25,7 @@
     \brief Describes \l{Device}{Devices}.
 
     \ingroup devices
-    \inmodule libguh
+    \inmodule libnymea
 
     It holds information general information about devices and their vendors and
     describes what actions, events and states a device supports. As this is
@@ -204,13 +204,13 @@ bool DeviceClass::isValid() const
     return !m_id.isNull() && !m_vendorId.isNull() && !m_pluginId.isNull();
 }
 
-/*! Returns the name of this \l{DeviceClass}. This is used internally. */
+/*! Returns the name of this \l{DeviceClass}. This is visible to the user. */
 QString DeviceClass::name() const
 {
     return m_name;
 }
 
-/*! Set the \a name of this \l{DeviceClass}. This is used internally. */
+/*! Set the \a name of this \l{DeviceClass}. This is visible to the user. */
 void DeviceClass::setName(const QString &name)
 {
     m_name = name;
diff --git a/libguh/types/deviceclass.h b/libnymea/types/deviceclass.h
similarity index 97%
rename from libguh/types/deviceclass.h
rename to libnymea/types/deviceclass.h
index 9e72acaa..eeaebcfe 100644
--- a/libguh/types/deviceclass.h
+++ b/libnymea/types/deviceclass.h
@@ -1,9 +1,9 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *                                                                         *
  *  Copyright (C) 2015 Simon Stürz <simon.stuerz@guh.io>                   *
- *  Copyright (C) 2014 Michael Zanetti <michael_zanetti@gmx.net>           *
+ *  Copyright (C) 2014-2018 Michael Zanetti <michael.zanetti@guh.io>       *
  *                                                                         *
- *  This file is part of guh.                                              *
+ *  This file is part of nymea.                                            *
  *                                                                         *
  *  This library is free software; you can redistribute it and/or          *
  *  modify it under the terms of the GNU Lesser General Public             *
diff --git a/libguh/types/event.cpp b/libnymea/types/event.cpp
similarity index 99%
rename from libguh/types/event.cpp
rename to libnymea/types/event.cpp
index 7a00ff3e..eee59d1e 100644
--- a/libguh/types/event.cpp
+++ b/libnymea/types/event.cpp
@@ -26,7 +26,7 @@
     \brief Holds information required to emit a event described by a \l{EventType}.
 
     \ingroup guh-types
-    \inmodule libguh
+    \inmodule libnymea
 
     It is bound to a \l{Device} and a \l{EventType} and holds the parameters
     for the event that happened.
diff --git a/libguh/types/event.h b/libnymea/types/event.h
similarity index 100%
rename from libguh/types/event.h
rename to libnymea/types/event.h
diff --git a/libguh/types/eventdescriptor.cpp b/libnymea/types/eventdescriptor.cpp
similarity index 99%
rename from libguh/types/eventdescriptor.cpp
rename to libnymea/types/eventdescriptor.cpp
index 789c891d..528a68e5 100644
--- a/libguh/types/eventdescriptor.cpp
+++ b/libnymea/types/eventdescriptor.cpp
@@ -27,7 +27,7 @@
 
     \ingroup guh-types
     \ingroup rules
-    \inmodule libguh
+    \inmodule libnymea
 
     An EventDescriptor describes an \l{Event} in order to match it with a \l{guhserver::Rule}.
 
diff --git a/libguh/types/eventdescriptor.h b/libnymea/types/eventdescriptor.h
similarity index 100%
rename from libguh/types/eventdescriptor.h
rename to libnymea/types/eventdescriptor.h
diff --git a/libguh/types/eventtype.cpp b/libnymea/types/eventtype.cpp
similarity index 99%
rename from libguh/types/eventtype.cpp
rename to libnymea/types/eventtype.cpp
index 34ee916d..14a56832 100644
--- a/libguh/types/eventtype.cpp
+++ b/libnymea/types/eventtype.cpp
@@ -26,7 +26,7 @@
     \brief Describes a \l{Event} for a \l{Device}.
 
     \ingroup guh-types
-    \inmodule libguh
+    \inmodule libnymea
 
     \sa Event, EventDescriptor
 */
diff --git a/libguh/types/eventtype.h b/libnymea/types/eventtype.h
similarity index 100%
rename from libguh/types/eventtype.h
rename to libnymea/types/eventtype.h
diff --git a/libguh/types/interface.cpp b/libnymea/types/interface.cpp
similarity index 100%
rename from libguh/types/interface.cpp
rename to libnymea/types/interface.cpp
diff --git a/libguh/types/interface.h b/libnymea/types/interface.h
similarity index 100%
rename from libguh/types/interface.h
rename to libnymea/types/interface.h
diff --git a/libguh/types/param.cpp b/libnymea/types/param.cpp
similarity index 98%
rename from libguh/types/param.cpp
rename to libnymea/types/param.cpp
index 944ad208..92c1eaab 100644
--- a/libguh/types/param.cpp
+++ b/libnymea/types/param.cpp
@@ -26,7 +26,7 @@
     \brief Holds the parameters of a Param.
 
     \ingroup guh-types
-    \inmodule libguh
+    \inmodule libnymea
 
     \sa Device, ParamType, ParamDescriptor
 */
@@ -89,7 +89,7 @@ QDebug operator<<(QDebug dbg, const ParamList &params)
     \brief Holds a list of \l{Param}{Params}
 
     \ingroup types
-    \inmodule libguh
+    \inmodule libnymea
 
     \sa Param,
 */
diff --git a/libguh/types/param.h b/libnymea/types/param.h
similarity index 100%
rename from libguh/types/param.h
rename to libnymea/types/param.h
diff --git a/libguh/types/paramdescriptor.cpp b/libnymea/types/paramdescriptor.cpp
similarity index 99%
rename from libguh/types/paramdescriptor.cpp
rename to libnymea/types/paramdescriptor.cpp
index 8c924b91..7ae73d93 100644
--- a/libguh/types/paramdescriptor.cpp
+++ b/libnymea/types/paramdescriptor.cpp
@@ -27,7 +27,7 @@
 
     \ingroup guh-types
     \ingroup rules
-    \inmodule libguh
+    \inmodule libnymea
 
     An ParamDescriptor describes a \l{Param} in order to match it with a \l{guhserver::Rule}.
 
diff --git a/libguh/types/paramdescriptor.h b/libnymea/types/paramdescriptor.h
similarity index 100%
rename from libguh/types/paramdescriptor.h
rename to libnymea/types/paramdescriptor.h
diff --git a/libguh/types/paramtype.cpp b/libnymea/types/paramtype.cpp
similarity index 99%
rename from libguh/types/paramtype.cpp
rename to libnymea/types/paramtype.cpp
index f832ea61..852a43e4 100644
--- a/libguh/types/paramtype.cpp
+++ b/libnymea/types/paramtype.cpp
@@ -26,7 +26,7 @@
     \brief Describes a certain ParamType.
 
     \ingroup guh-types
-    \inmodule libguh
+    \inmodule libnymea
 
     \sa Device, Param, ParamDescriptor
 */
diff --git a/libguh/types/paramtype.h b/libnymea/types/paramtype.h
similarity index 100%
rename from libguh/types/paramtype.h
rename to libnymea/types/paramtype.h
diff --git a/libguh/types/ruleaction.cpp b/libnymea/types/ruleaction.cpp
similarity index 99%
rename from libguh/types/ruleaction.cpp
rename to libnymea/types/ruleaction.cpp
index 961f502f..a3a30e73 100644
--- a/libguh/types/ruleaction.cpp
+++ b/libnymea/types/ruleaction.cpp
@@ -27,7 +27,7 @@
 
     \ingroup guh-types
     \ingroup rules
-    \inmodule libguh
+    \inmodule libnymea
 
     A RuleAction describes a special form of an \l{Action} for a \l{guhserver::Rule}. The main difference is
     the \l{RuleActionParam}, which allows to use an EventTypeId within a \l{guhserver::Rule} to execute this \l{RuleAction}.
diff --git a/libguh/types/ruleaction.h b/libnymea/types/ruleaction.h
similarity index 100%
rename from libguh/types/ruleaction.h
rename to libnymea/types/ruleaction.h
diff --git a/libguh/types/ruleactionparam.cpp b/libnymea/types/ruleactionparam.cpp
similarity index 99%
rename from libguh/types/ruleactionparam.cpp
rename to libnymea/types/ruleactionparam.cpp
index 33b5430c..04865677 100644
--- a/libguh/types/ruleactionparam.cpp
+++ b/libnymea/types/ruleactionparam.cpp
@@ -27,7 +27,7 @@
 
     \ingroup guh-types
     \ingroup rules
-    \inmodule libguh
+    \inmodule libnymea
 
     A RuleActionParam allows rules to take over an \l{Event} parameter into a rule
     \l{RuleAction}.
@@ -141,7 +141,7 @@ QDebug operator<<(QDebug dbg, const RuleActionParam &ruleActionParam)
     \brief Holds a list of \l{RuleActionParam}{RuleActionParams}
 
     \ingroup types
-    \inmodule libguh
+    \inmodule libnymea
 
     \sa RuleActionParam, RuleAction,
 */
diff --git a/libguh/types/ruleactionparam.h b/libnymea/types/ruleactionparam.h
similarity index 100%
rename from libguh/types/ruleactionparam.h
rename to libnymea/types/ruleactionparam.h
diff --git a/libguh/types/state.cpp b/libnymea/types/state.cpp
similarity index 99%
rename from libguh/types/state.cpp
rename to libnymea/types/state.cpp
index ecf078ad..db617fe3 100644
--- a/libguh/types/state.cpp
+++ b/libnymea/types/state.cpp
@@ -26,7 +26,7 @@
   \brief Holds the parameters of a State of a \l{Device}.
 
   \ingroup guh-types
-  \inmodule libguh
+  \inmodule libnymea
 
   States hold the state values for devices. A State is associated to a \l{Device} by
   the \l{State::deviceId()} and represents the value of a state described in a \l{StateType}
diff --git a/libguh/types/state.h b/libnymea/types/state.h
similarity index 100%
rename from libguh/types/state.h
rename to libnymea/types/state.h
diff --git a/libguh/types/statedescriptor.cpp b/libnymea/types/statedescriptor.cpp
similarity index 99%
rename from libguh/types/statedescriptor.cpp
rename to libnymea/types/statedescriptor.cpp
index 787b0916..fcc14330 100644
--- a/libguh/types/statedescriptor.cpp
+++ b/libnymea/types/statedescriptor.cpp
@@ -27,7 +27,7 @@
 
     \ingroup guh-types
     \ingroup rules
-    \inmodule libguh
+    \inmodule libnymea
 
     An StateDescriptor describes a \l{State} in order to match it with a \l{guhserver::Rule}.
 
diff --git a/libguh/types/statedescriptor.h b/libnymea/types/statedescriptor.h
similarity index 100%
rename from libguh/types/statedescriptor.h
rename to libnymea/types/statedescriptor.h
diff --git a/libguh/types/statetype.cpp b/libnymea/types/statetype.cpp
similarity index 99%
rename from libguh/types/statetype.cpp
rename to libnymea/types/statetype.cpp
index 43b61af4..eca442c4 100644
--- a/libguh/types/statetype.cpp
+++ b/libnymea/types/statetype.cpp
@@ -27,7 +27,7 @@
     \brief Describes the Type of a \l{State} from \l{Device}.
 
     \ingroup guh-types
-    \inmodule libguh
+    \inmodule libnymea
 
     \sa State, StateDescriptor
 */
diff --git a/libguh/types/statetype.h b/libnymea/types/statetype.h
similarity index 100%
rename from libguh/types/statetype.h
rename to libnymea/types/statetype.h
diff --git a/libguh/types/vendor.cpp b/libnymea/types/vendor.cpp
similarity index 99%
rename from libguh/types/vendor.cpp
rename to libnymea/types/vendor.cpp
index 9c05624c..506c1dec 100644
--- a/libguh/types/vendor.cpp
+++ b/libnymea/types/vendor.cpp
@@ -26,7 +26,7 @@
     \brief Holds information about a the vendor of a \l{Device}.
 
     \ingroup guh-types
-    \inmodule libguh
+    \inmodule libnymea
 
     \sa DevicePlugin
 */
diff --git a/libguh/types/vendor.h b/libnymea/types/vendor.h
similarity index 100%
rename from libguh/types/vendor.h
rename to libnymea/types/vendor.h
diff --git a/libguh/typeutils.h b/libnymea/typeutils.h
similarity index 100%
rename from libguh/typeutils.h
rename to libnymea/typeutils.h
diff --git a/guh.pri b/nymea.pri
similarity index 100%
rename from guh.pri
rename to nymea.pri
diff --git a/guh.pro b/nymea.pro
similarity index 86%
rename from guh.pro
rename to nymea.pro
index 9f8f9eed..960c5f33 100644
--- a/guh.pro
+++ b/nymea.pro
@@ -1,24 +1,24 @@
-include(guh.pri)
+include(nymea.pri)
 
 TEMPLATE=subdirs
 
-SUBDIRS += libguh libguh-core server plugins
+SUBDIRS += libnymea libguh-core server plugins
 
-libguh-core.depends = libguh
-server.depends = libguh libguh-core plugins
-plugins.depends = libguh
-tests.depends = libguh libguh-core
+libguh-core.depends = libnymea
+server.depends = libnymea libguh-core plugins
+plugins.depends = libnymea
+tests.depends = libnymea libguh-core
 
 doc.depends = FORCE
 # Note: some how extraimages in qdocconf did not the trick
-doc.commands += cd $$top_srcdir/libguh/interfaces; ./generatedoc.sh;
+doc.commands += cd $$top_srcdir/libnymea/interfaces; ./generatedoc.sh;
 doc.commands += cd $$top_srcdir/doc; qdoc config.qdocconf; cp -r images/* html/images/; \
                 cp -r favicons/* html/; cp -r $$top_srcdir/doc/html $$top_builddir/
 
 licensecheck.commands = $$top_srcdir/tests/auto/checklicenseheaders.sh $$top_srcdir
 
 test.depends = licensecheck
-test.commands = LD_LIBRARY_PATH=$$top_builddir/libguh-core:$$top_builddir/libguh make check
+test.commands = LD_LIBRARY_PATH=$$top_builddir/libguh-core:$$top_builddir/libnymea make check
 
 # Translations:
 # make lupdate to update .ts files
diff --git a/plugins/plugins.pri b/plugins/plugins.pri
index b05d04e6..b615e5b6 100644
--- a/plugins/plugins.pri
+++ b/plugins/plugins.pri
@@ -1,12 +1,12 @@
-include(../guh.pri)
+include(../nymea.pri)
 
 TEMPLATE = lib
 CONFIG += plugin
 
 QT += network bluetooth
 
-INCLUDEPATH += $$top_srcdir/libguh
-LIBS += -L../../libguh -lguh
+INCLUDEPATH += $$top_srcdir/libnymea
+LIBS += -L../../libnymea -lnymea
 HEADERS += plugininfo.h
 
 # Create plugininfo file
diff --git a/server/main.cpp b/server/main.cpp
index 828b01d1..b4d2e88b 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
     application.setApplicationName("guhd");
     application.setApplicationVersion(GUH_VERSION_STRING);
 
-    // logging filers for core and libguh
+    // logging filers for core and libnymea
     s_loggingFilters.insert("Application", true);
     s_loggingFilters.insert("Warnings", true);
     s_loggingFilters.insert("DeviceManager", true);
diff --git a/server/server.pro b/server/server.pro
index 90f777b7..200666f3 100644
--- a/server/server.pro
+++ b/server/server.pro
@@ -1,16 +1,16 @@
-include(../guh.pri)
+include(../nymea.pri)
 
 TARGET = guhd
 TEMPLATE = app
 
-INCLUDEPATH += ../libguh-core ../libguh-core/jsonrpc ../libguh
+INCLUDEPATH += ../libnymea ../libguh-core
 
 target.path = /usr/bin
 INSTALLS += target
 
 QT *= sql xml websockets bluetooth dbus network
 
-LIBS += -L$$top_builddir/libguh/ -lguh -L$$top_builddir/libguh-core -lguh-core -lssl -lcrypto -laws-iot-sdk-cpp
+LIBS += -L$$top_builddir/libnymea/ -lnymea -L$$top_builddir/libguh-core -lguh-core -lssl -lcrypto -laws-iot-sdk-cpp
 
 # Server files
 include(qtservice/qtservice.pri)
diff --git a/tests/auto/actions/actions.pro b/tests/auto/actions/actions.pro
index b8e65eed..8cf10580 100644
--- a/tests/auto/actions/actions.pro
+++ b/tests/auto/actions/actions.pro
@@ -1,6 +1,6 @@
 TARGET = testactions
 
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 SOURCES += testactions.cpp
diff --git a/tests/auto/autotests.pri b/tests/auto/autotests.pri
index 261694c6..c7702a49 100644
--- a/tests/auto/autotests.pri
+++ b/tests/auto/autotests.pri
@@ -1,12 +1,11 @@
 QT += testlib network sql
 CONFIG += testcase
 
-INCLUDEPATH += $$top_srcdir/libguh \
+INCLUDEPATH += $$top_srcdir/libnymea \
                $$top_srcdir/libguh-core \
-               $$top_srcdir/libguh-core/jsonrpc \
                $$top_srcdir/tests/auto/
 
-LIBS += -L$$top_builddir/libguh/ -lguh -L$$top_builddir/plugins/mock/ \
+LIBS += -L$$top_builddir/libnymea/ -lnymea -L$$top_builddir/plugins/mock/ \
         -L$$top_builddir/libguh-core/ -lguh-core -lssl -lcrypto -laws-iot-sdk-cpp -lavahi-common -lavahi-client
 
 SOURCES += ../guhtestbase.cpp \
diff --git a/tests/auto/configurations/configurations.pro b/tests/auto/configurations/configurations.pro
index 36a9da78..3c08eefa 100644
--- a/tests/auto/configurations/configurations.pro
+++ b/tests/auto/configurations/configurations.pro
@@ -1,6 +1,6 @@
 TARGET = testconfigurations
 
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 SOURCES += testconfigurations.cpp
diff --git a/tests/auto/devices/devices.pro b/tests/auto/devices/devices.pro
index dc20bd80..1b9e2ef3 100644
--- a/tests/auto/devices/devices.pro
+++ b/tests/auto/devices/devices.pro
@@ -1,4 +1,4 @@
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 TARGET = testdevices
diff --git a/tests/auto/events/events.pro b/tests/auto/events/events.pro
index cc1f4c4f..8bbd7556 100644
--- a/tests/auto/events/events.pro
+++ b/tests/auto/events/events.pro
@@ -1,4 +1,4 @@
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 TARGET = testevents
diff --git a/tests/auto/guhtestbase.cpp b/tests/auto/guhtestbase.cpp
index d875388a..a77db100 100644
--- a/tests/auto/guhtestbase.cpp
+++ b/tests/auto/guhtestbase.cpp
@@ -26,7 +26,7 @@
 #include "devicemanager.h"
 #include "loggingcategories.h"
 #include "logging/logengine.h"
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 
 #include <QVariantMap>
 #include <QJsonDocument>
@@ -144,7 +144,7 @@ void GuhTestBase::initTestCase()
     guhdSettings.clear();
 
     // debug categories
-    // logging filers for core and libguh
+    // logging filers for core and libnymea
     s_loggingFilters.insert("Application", true);
     s_loggingFilters.insert("Warnings", true);
     s_loggingFilters.insert("DeviceManager", true);
diff --git a/tests/auto/guhtestbase.h b/tests/auto/guhtestbase.h
index 728ba901..60dee09d 100644
--- a/tests/auto/guhtestbase.h
+++ b/tests/auto/guhtestbase.h
@@ -27,7 +27,7 @@
 #include "mocktcpserver.h"
 #include "devicemanager.h"
 #include "ruleengine.h"
-#include "jsontypes.h"
+#include "jsonrpc/jsontypes.h"
 
 #include <QObject>
 #include <QUuid>
diff --git a/tests/auto/jsonrpc/jsonrpc.pro b/tests/auto/jsonrpc/jsonrpc.pro
index b239ef31..6dc7fea1 100644
--- a/tests/auto/jsonrpc/jsonrpc.pro
+++ b/tests/auto/jsonrpc/jsonrpc.pro
@@ -1,4 +1,4 @@
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 TARGET = testjsonrpc
diff --git a/tests/auto/logging/logging.pro b/tests/auto/logging/logging.pro
index 84a8fc5e..fa3f89ab 100644
--- a/tests/auto/logging/logging.pro
+++ b/tests/auto/logging/logging.pro
@@ -1,4 +1,4 @@
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 TARGET = testlogging
diff --git a/tests/auto/loggingdirect/loggingdirect.pro b/tests/auto/loggingdirect/loggingdirect.pro
index bf60e3ec..ea35fcc3 100644
--- a/tests/auto/loggingdirect/loggingdirect.pro
+++ b/tests/auto/loggingdirect/loggingdirect.pro
@@ -1,4 +1,4 @@
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 TARGET = testloggingdirect
diff --git a/tests/auto/loggingloading/loggingloading.pro b/tests/auto/loggingloading/loggingloading.pro
index aaef3966..05baa6ef 100644
--- a/tests/auto/loggingloading/loggingloading.pro
+++ b/tests/auto/loggingloading/loggingloading.pro
@@ -1,4 +1,4 @@
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 RESOURCES += loggingloading.qrc
diff --git a/tests/auto/plugins/plugins.pro b/tests/auto/plugins/plugins.pro
index e56cb1cc..90e3faed 100644
--- a/tests/auto/plugins/plugins.pro
+++ b/tests/auto/plugins/plugins.pro
@@ -1,6 +1,6 @@
 TARGET = testactions
 
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 SOURCES += testplugins.cpp
diff --git a/tests/auto/restdeviceclasses/restdeviceclasses.pro b/tests/auto/restdeviceclasses/restdeviceclasses.pro
index 887d952e..478e30cc 100644
--- a/tests/auto/restdeviceclasses/restdeviceclasses.pro
+++ b/tests/auto/restdeviceclasses/restdeviceclasses.pro
@@ -1,4 +1,4 @@
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 TARGET = restdeviceclasses
diff --git a/tests/auto/restdevices/restdevices.pro b/tests/auto/restdevices/restdevices.pro
index f7d2bb84..77977f8d 100644
--- a/tests/auto/restdevices/restdevices.pro
+++ b/tests/auto/restdevices/restdevices.pro
@@ -1,4 +1,4 @@
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 TARGET = restdevices
diff --git a/tests/auto/restlogging/restlogging.pro b/tests/auto/restlogging/restlogging.pro
index f321deba..03f7b70e 100644
--- a/tests/auto/restlogging/restlogging.pro
+++ b/tests/auto/restlogging/restlogging.pro
@@ -1,4 +1,4 @@
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 TARGET = testrestlogging
diff --git a/tests/auto/restplugins/restplugins.pro b/tests/auto/restplugins/restplugins.pro
index e9ae148f..8b05ebab 100644
--- a/tests/auto/restplugins/restplugins.pro
+++ b/tests/auto/restplugins/restplugins.pro
@@ -1,4 +1,4 @@
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 TARGET = restplugins
diff --git a/tests/auto/restrules/restrules.pro b/tests/auto/restrules/restrules.pro
index a1009699..f0c81252 100644
--- a/tests/auto/restrules/restrules.pro
+++ b/tests/auto/restrules/restrules.pro
@@ -1,4 +1,4 @@
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 TARGET = restrules
diff --git a/tests/auto/restvendors/restvendors.pro b/tests/auto/restvendors/restvendors.pro
index 1b27ceb5..7854165a 100644
--- a/tests/auto/restvendors/restvendors.pro
+++ b/tests/auto/restvendors/restvendors.pro
@@ -1,4 +1,4 @@
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 TARGET = restvendors
diff --git a/tests/auto/rules/rules.pro b/tests/auto/rules/rules.pro
index c0b57068..d8603b75 100644
--- a/tests/auto/rules/rules.pro
+++ b/tests/auto/rules/rules.pro
@@ -1,4 +1,4 @@
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 TARGET = rules
diff --git a/tests/auto/states/states.pro b/tests/auto/states/states.pro
index e24dbb94..75d3caa4 100644
--- a/tests/auto/states/states.pro
+++ b/tests/auto/states/states.pro
@@ -1,4 +1,4 @@
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 TARGET = states
diff --git a/tests/auto/timemanager/timemanager.pro b/tests/auto/timemanager/timemanager.pro
index d8d26188..53b331c1 100644
--- a/tests/auto/timemanager/timemanager.pro
+++ b/tests/auto/timemanager/timemanager.pro
@@ -1,6 +1,6 @@
 TARGET = testtimemanager
 
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 SOURCES += testtimemanager.cpp
diff --git a/tests/auto/versioning/versioning.pro b/tests/auto/versioning/versioning.pro
index 46af3e26..6eda7219 100644
--- a/tests/auto/versioning/versioning.pro
+++ b/tests/auto/versioning/versioning.pro
@@ -1,6 +1,6 @@
 TARGET = testversioning
 
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 DEFINES += TESTS_SOURCE_DIR=\\\"$$top_srcdir/tests/auto/\\\"
diff --git a/tests/auto/webserver/webserver.pro b/tests/auto/webserver/webserver.pro
index 8d905544..fe8bce8f 100644
--- a/tests/auto/webserver/webserver.pro
+++ b/tests/auto/webserver/webserver.pro
@@ -1,4 +1,4 @@
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 QT += xml
diff --git a/tests/auto/websocketserver/websocketserver.pro b/tests/auto/websocketserver/websocketserver.pro
index 281a146d..222f3a32 100644
--- a/tests/auto/websocketserver/websocketserver.pro
+++ b/tests/auto/websocketserver/websocketserver.pro
@@ -1,4 +1,4 @@
-include(../../../guh.pri)
+include(../../../nymea.pri)
 include(../autotests.pri)
 
 QT += websockets