diff --git a/libguh-core/OpenSSL/OpenSSLConnection.cpp b/libnymea-core/OpenSSL/OpenSSLConnection.cpp
similarity index 100%
rename from libguh-core/OpenSSL/OpenSSLConnection.cpp
rename to libnymea-core/OpenSSL/OpenSSLConnection.cpp
diff --git a/libguh-core/OpenSSL/OpenSSLConnection.hpp b/libnymea-core/OpenSSL/OpenSSLConnection.hpp
similarity index 100%
rename from libguh-core/OpenSSL/OpenSSLConnection.hpp
rename to libnymea-core/OpenSSL/OpenSSLConnection.hpp
diff --git a/libguh-core/awsconnector.cpp b/libnymea-core/awsconnector.cpp
similarity index 100%
rename from libguh-core/awsconnector.cpp
rename to libnymea-core/awsconnector.cpp
diff --git a/libguh-core/awsconnector.h b/libnymea-core/awsconnector.h
similarity index 100%
rename from libguh-core/awsconnector.h
rename to libnymea-core/awsconnector.h
diff --git a/libguh-core/bluetoothserver.cpp b/libnymea-core/bluetoothserver.cpp
similarity index 100%
rename from libguh-core/bluetoothserver.cpp
rename to libnymea-core/bluetoothserver.cpp
diff --git a/libguh-core/bluetoothserver.h b/libnymea-core/bluetoothserver.h
similarity index 100%
rename from libguh-core/bluetoothserver.h
rename to libnymea-core/bluetoothserver.h
diff --git a/libguh-core/certificategenerator.cpp b/libnymea-core/certificategenerator.cpp
similarity index 100%
rename from libguh-core/certificategenerator.cpp
rename to libnymea-core/certificategenerator.cpp
diff --git a/libguh-core/certificategenerator.h b/libnymea-core/certificategenerator.h
similarity index 100%
rename from libguh-core/certificategenerator.h
rename to libnymea-core/certificategenerator.h
diff --git a/libguh-core/cloudmanager.cpp b/libnymea-core/cloudmanager.cpp
similarity index 100%
rename from libguh-core/cloudmanager.cpp
rename to libnymea-core/cloudmanager.cpp
diff --git a/libguh-core/cloudmanager.h b/libnymea-core/cloudmanager.h
similarity index 100%
rename from libguh-core/cloudmanager.h
rename to libnymea-core/cloudmanager.h
diff --git a/libguh-core/cloudnotifications.cpp b/libnymea-core/cloudnotifications.cpp
similarity index 100%
rename from libguh-core/cloudnotifications.cpp
rename to libnymea-core/cloudnotifications.cpp
diff --git a/libguh-core/cloudnotifications.h b/libnymea-core/cloudnotifications.h
similarity index 100%
rename from libguh-core/cloudnotifications.h
rename to libnymea-core/cloudnotifications.h
diff --git a/libguh-core/debugserverhandler.cpp b/libnymea-core/debugserverhandler.cpp
similarity index 100%
rename from libguh-core/debugserverhandler.cpp
rename to libnymea-core/debugserverhandler.cpp
diff --git a/libguh-core/debugserverhandler.h b/libnymea-core/debugserverhandler.h
similarity index 100%
rename from libguh-core/debugserverhandler.h
rename to libnymea-core/debugserverhandler.h
diff --git a/libguh-core/guhconfiguration.cpp b/libnymea-core/guhconfiguration.cpp
similarity index 100%
rename from libguh-core/guhconfiguration.cpp
rename to libnymea-core/guhconfiguration.cpp
diff --git a/libguh-core/guhconfiguration.h b/libnymea-core/guhconfiguration.h
similarity index 100%
rename from libguh-core/guhconfiguration.h
rename to libnymea-core/guhconfiguration.h
diff --git a/libguh-core/guhcore.cpp b/libnymea-core/guhcore.cpp
similarity index 100%
rename from libguh-core/guhcore.cpp
rename to libnymea-core/guhcore.cpp
diff --git a/libguh-core/guhcore.h b/libnymea-core/guhcore.h
similarity index 100%
rename from libguh-core/guhcore.h
rename to libnymea-core/guhcore.h
diff --git a/libguh-core/guhdbusservice.cpp b/libnymea-core/guhdbusservice.cpp
similarity index 100%
rename from libguh-core/guhdbusservice.cpp
rename to libnymea-core/guhdbusservice.cpp
diff --git a/libguh-core/guhdbusservice.h b/libnymea-core/guhdbusservice.h
similarity index 100%
rename from libguh-core/guhdbusservice.h
rename to libnymea-core/guhdbusservice.h
diff --git a/libguh-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.cpp b/libnymea-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.cpp
similarity index 100%
rename from libguh-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.cpp
rename to libnymea-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.cpp
diff --git a/libguh-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.h b/libnymea-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.h
similarity index 100%
rename from libguh-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.h
rename to libnymea-core/hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.h
diff --git a/libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.cpp b/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.cpp
similarity index 100%
rename from libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.cpp
rename to libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.cpp
diff --git a/libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.h b/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.h
similarity index 100%
rename from libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.h
rename to libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.h
diff --git a/libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.cpp b/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.cpp
similarity index 100%
rename from libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.cpp
rename to libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.cpp
diff --git a/libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.h b/libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.h
similarity index 100%
rename from libguh-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.h
rename to libnymea-core/hardware/bluetoothlowenergy/bluetoothlowenergymanagerimplementation.h
diff --git a/libguh-core/hardware/network/avahi/qt-watch.cpp b/libnymea-core/hardware/network/avahi/qt-watch.cpp
similarity index 100%
rename from libguh-core/hardware/network/avahi/qt-watch.cpp
rename to libnymea-core/hardware/network/avahi/qt-watch.cpp
diff --git a/libguh-core/hardware/network/avahi/qt-watch.h b/libnymea-core/hardware/network/avahi/qt-watch.h
similarity index 100%
rename from libguh-core/hardware/network/avahi/qt-watch.h
rename to libnymea-core/hardware/network/avahi/qt-watch.h
diff --git a/libguh-core/hardware/network/avahi/qtavahiclient.cpp b/libnymea-core/hardware/network/avahi/qtavahiclient.cpp
similarity index 100%
rename from libguh-core/hardware/network/avahi/qtavahiclient.cpp
rename to libnymea-core/hardware/network/avahi/qtavahiclient.cpp
diff --git a/libguh-core/hardware/network/avahi/qtavahiclient.h b/libnymea-core/hardware/network/avahi/qtavahiclient.h
similarity index 100%
rename from libguh-core/hardware/network/avahi/qtavahiclient.h
rename to libnymea-core/hardware/network/avahi/qtavahiclient.h
diff --git a/libguh-core/hardware/network/avahi/qtavahiservice.cpp b/libnymea-core/hardware/network/avahi/qtavahiservice.cpp
similarity index 100%
rename from libguh-core/hardware/network/avahi/qtavahiservice.cpp
rename to libnymea-core/hardware/network/avahi/qtavahiservice.cpp
diff --git a/libguh-core/hardware/network/avahi/qtavahiservice.h b/libnymea-core/hardware/network/avahi/qtavahiservice.h
similarity index 100%
rename from libguh-core/hardware/network/avahi/qtavahiservice.h
rename to libnymea-core/hardware/network/avahi/qtavahiservice.h
diff --git a/libguh-core/hardware/network/avahi/qtavahiservice_p.cpp b/libnymea-core/hardware/network/avahi/qtavahiservice_p.cpp
similarity index 100%
rename from libguh-core/hardware/network/avahi/qtavahiservice_p.cpp
rename to libnymea-core/hardware/network/avahi/qtavahiservice_p.cpp
diff --git a/libguh-core/hardware/network/avahi/qtavahiservice_p.h b/libnymea-core/hardware/network/avahi/qtavahiservice_p.h
similarity index 100%
rename from libguh-core/hardware/network/avahi/qtavahiservice_p.h
rename to libnymea-core/hardware/network/avahi/qtavahiservice_p.h
diff --git a/libguh-core/hardware/network/avahi/qtavahiservicebrowserimplementation.cpp b/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation.cpp
similarity index 100%
rename from libguh-core/hardware/network/avahi/qtavahiservicebrowserimplementation.cpp
rename to libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation.cpp
diff --git a/libguh-core/hardware/network/avahi/qtavahiservicebrowserimplementation.h b/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation.h
similarity index 100%
rename from libguh-core/hardware/network/avahi/qtavahiservicebrowserimplementation.h
rename to libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation.h
diff --git a/libguh-core/hardware/network/avahi/qtavahiservicebrowserimplementation_p.cpp b/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation_p.cpp
similarity index 100%
rename from libguh-core/hardware/network/avahi/qtavahiservicebrowserimplementation_p.cpp
rename to libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation_p.cpp
diff --git a/libguh-core/hardware/network/avahi/qtavahiservicebrowserimplementation_p.h b/libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation_p.h
similarity index 100%
rename from libguh-core/hardware/network/avahi/qtavahiservicebrowserimplementation_p.h
rename to libnymea-core/hardware/network/avahi/qtavahiservicebrowserimplementation_p.h
diff --git a/libguh-core/hardware/network/networkaccessmanagerimpl.cpp b/libnymea-core/hardware/network/networkaccessmanagerimpl.cpp
similarity index 100%
rename from libguh-core/hardware/network/networkaccessmanagerimpl.cpp
rename to libnymea-core/hardware/network/networkaccessmanagerimpl.cpp
diff --git a/libguh-core/hardware/network/networkaccessmanagerimpl.h b/libnymea-core/hardware/network/networkaccessmanagerimpl.h
similarity index 100%
rename from libguh-core/hardware/network/networkaccessmanagerimpl.h
rename to libnymea-core/hardware/network/networkaccessmanagerimpl.h
diff --git a/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp b/libnymea-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp
similarity index 100%
rename from libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp
rename to libnymea-core/hardware/network/upnp/upnpdiscoveryimplementation.cpp
diff --git a/libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.h b/libnymea-core/hardware/network/upnp/upnpdiscoveryimplementation.h
similarity index 100%
rename from libguh-core/hardware/network/upnp/upnpdiscoveryimplementation.h
rename to libnymea-core/hardware/network/upnp/upnpdiscoveryimplementation.h
diff --git a/libguh-core/hardware/network/upnp/upnpdiscoveryreplyimplementation.cpp b/libnymea-core/hardware/network/upnp/upnpdiscoveryreplyimplementation.cpp
similarity index 100%
rename from libguh-core/hardware/network/upnp/upnpdiscoveryreplyimplementation.cpp
rename to libnymea-core/hardware/network/upnp/upnpdiscoveryreplyimplementation.cpp
diff --git a/libguh-core/hardware/network/upnp/upnpdiscoveryreplyimplementation.h b/libnymea-core/hardware/network/upnp/upnpdiscoveryreplyimplementation.h
similarity index 100%
rename from libguh-core/hardware/network/upnp/upnpdiscoveryreplyimplementation.h
rename to libnymea-core/hardware/network/upnp/upnpdiscoveryreplyimplementation.h
diff --git a/libguh-core/hardware/network/upnp/upnpdiscoveryrequest.cpp b/libnymea-core/hardware/network/upnp/upnpdiscoveryrequest.cpp
similarity index 100%
rename from libguh-core/hardware/network/upnp/upnpdiscoveryrequest.cpp
rename to libnymea-core/hardware/network/upnp/upnpdiscoveryrequest.cpp
diff --git a/libguh-core/hardware/network/upnp/upnpdiscoveryrequest.h b/libnymea-core/hardware/network/upnp/upnpdiscoveryrequest.h
similarity index 100%
rename from libguh-core/hardware/network/upnp/upnpdiscoveryrequest.h
rename to libnymea-core/hardware/network/upnp/upnpdiscoveryrequest.h
diff --git a/libguh-core/hardware/plugintimermanagerimplementation.cpp b/libnymea-core/hardware/plugintimermanagerimplementation.cpp
similarity index 100%
rename from libguh-core/hardware/plugintimermanagerimplementation.cpp
rename to libnymea-core/hardware/plugintimermanagerimplementation.cpp
diff --git a/libguh-core/hardware/plugintimermanagerimplementation.h b/libnymea-core/hardware/plugintimermanagerimplementation.h
similarity index 100%
rename from libguh-core/hardware/plugintimermanagerimplementation.h
rename to libnymea-core/hardware/plugintimermanagerimplementation.h
diff --git a/libguh-core/hardware/radio433/radio433brennenstuhl.cpp b/libnymea-core/hardware/radio433/radio433brennenstuhl.cpp
similarity index 100%
rename from libguh-core/hardware/radio433/radio433brennenstuhl.cpp
rename to libnymea-core/hardware/radio433/radio433brennenstuhl.cpp
diff --git a/libguh-core/hardware/radio433/radio433brennenstuhl.h b/libnymea-core/hardware/radio433/radio433brennenstuhl.h
similarity index 100%
rename from libguh-core/hardware/radio433/radio433brennenstuhl.h
rename to libnymea-core/hardware/radio433/radio433brennenstuhl.h
diff --git a/libguh-core/hardware/radio433/radio433brennenstuhlgateway.cpp b/libnymea-core/hardware/radio433/radio433brennenstuhlgateway.cpp
similarity index 100%
rename from libguh-core/hardware/radio433/radio433brennenstuhlgateway.cpp
rename to libnymea-core/hardware/radio433/radio433brennenstuhlgateway.cpp
diff --git a/libguh-core/hardware/radio433/radio433brennenstuhlgateway.h b/libnymea-core/hardware/radio433/radio433brennenstuhlgateway.h
similarity index 100%
rename from libguh-core/hardware/radio433/radio433brennenstuhlgateway.h
rename to libnymea-core/hardware/radio433/radio433brennenstuhlgateway.h
diff --git a/libguh-core/hardware/radio433/radio433transmitter.cpp b/libnymea-core/hardware/radio433/radio433transmitter.cpp
similarity index 100%
rename from libguh-core/hardware/radio433/radio433transmitter.cpp
rename to libnymea-core/hardware/radio433/radio433transmitter.cpp
diff --git a/libguh-core/hardware/radio433/radio433transmitter.h b/libnymea-core/hardware/radio433/radio433transmitter.h
similarity index 100%
rename from libguh-core/hardware/radio433/radio433transmitter.h
rename to libnymea-core/hardware/radio433/radio433transmitter.h
diff --git a/libguh-core/hardwaremanagerdbusservice.cpp b/libnymea-core/hardwaremanagerdbusservice.cpp
similarity index 100%
rename from libguh-core/hardwaremanagerdbusservice.cpp
rename to libnymea-core/hardwaremanagerdbusservice.cpp
diff --git a/libguh-core/hardwaremanagerdbusservice.h b/libnymea-core/hardwaremanagerdbusservice.h
similarity index 100%
rename from libguh-core/hardwaremanagerdbusservice.h
rename to libnymea-core/hardwaremanagerdbusservice.h
diff --git a/libguh-core/hardwaremanagerimplementation.cpp b/libnymea-core/hardwaremanagerimplementation.cpp
similarity index 100%
rename from libguh-core/hardwaremanagerimplementation.cpp
rename to libnymea-core/hardwaremanagerimplementation.cpp
diff --git a/libguh-core/hardwaremanagerimplementation.h b/libnymea-core/hardwaremanagerimplementation.h
similarity index 100%
rename from libguh-core/hardwaremanagerimplementation.h
rename to libnymea-core/hardwaremanagerimplementation.h
diff --git a/libguh-core/httpreply.cpp b/libnymea-core/httpreply.cpp
similarity index 100%
rename from libguh-core/httpreply.cpp
rename to libnymea-core/httpreply.cpp
diff --git a/libguh-core/httpreply.h b/libnymea-core/httpreply.h
similarity index 100%
rename from libguh-core/httpreply.h
rename to libnymea-core/httpreply.h
diff --git a/libguh-core/httprequest.cpp b/libnymea-core/httprequest.cpp
similarity index 100%
rename from libguh-core/httprequest.cpp
rename to libnymea-core/httprequest.cpp
diff --git a/libguh-core/httprequest.h b/libnymea-core/httprequest.h
similarity index 100%
rename from libguh-core/httprequest.h
rename to libnymea-core/httprequest.h
diff --git a/libguh-core/janusconnector.cpp b/libnymea-core/janusconnector.cpp
similarity index 100%
rename from libguh-core/janusconnector.cpp
rename to libnymea-core/janusconnector.cpp
diff --git a/libguh-core/janusconnector.h b/libnymea-core/janusconnector.h
similarity index 100%
rename from libguh-core/janusconnector.h
rename to libnymea-core/janusconnector.h
diff --git a/libguh-core/jsonrpc/actionhandler.cpp b/libnymea-core/jsonrpc/actionhandler.cpp
similarity index 100%
rename from libguh-core/jsonrpc/actionhandler.cpp
rename to libnymea-core/jsonrpc/actionhandler.cpp
diff --git a/libguh-core/jsonrpc/actionhandler.h b/libnymea-core/jsonrpc/actionhandler.h
similarity index 100%
rename from libguh-core/jsonrpc/actionhandler.h
rename to libnymea-core/jsonrpc/actionhandler.h
diff --git a/libguh-core/jsonrpc/configurationhandler.cpp b/libnymea-core/jsonrpc/configurationhandler.cpp
similarity index 100%
rename from libguh-core/jsonrpc/configurationhandler.cpp
rename to libnymea-core/jsonrpc/configurationhandler.cpp
diff --git a/libguh-core/jsonrpc/configurationhandler.h b/libnymea-core/jsonrpc/configurationhandler.h
similarity index 100%
rename from libguh-core/jsonrpc/configurationhandler.h
rename to libnymea-core/jsonrpc/configurationhandler.h
diff --git a/libguh-core/jsonrpc/devicehandler.cpp b/libnymea-core/jsonrpc/devicehandler.cpp
similarity index 100%
rename from libguh-core/jsonrpc/devicehandler.cpp
rename to libnymea-core/jsonrpc/devicehandler.cpp
diff --git a/libguh-core/jsonrpc/devicehandler.h b/libnymea-core/jsonrpc/devicehandler.h
similarity index 100%
rename from libguh-core/jsonrpc/devicehandler.h
rename to libnymea-core/jsonrpc/devicehandler.h
diff --git a/libguh-core/jsonrpc/eventhandler.cpp b/libnymea-core/jsonrpc/eventhandler.cpp
similarity index 100%
rename from libguh-core/jsonrpc/eventhandler.cpp
rename to libnymea-core/jsonrpc/eventhandler.cpp
diff --git a/libguh-core/jsonrpc/eventhandler.h b/libnymea-core/jsonrpc/eventhandler.h
similarity index 100%
rename from libguh-core/jsonrpc/eventhandler.h
rename to libnymea-core/jsonrpc/eventhandler.h
diff --git a/libguh-core/jsonrpc/jsonhandler.cpp b/libnymea-core/jsonrpc/jsonhandler.cpp
similarity index 100%
rename from libguh-core/jsonrpc/jsonhandler.cpp
rename to libnymea-core/jsonrpc/jsonhandler.cpp
diff --git a/libguh-core/jsonrpc/jsonhandler.h b/libnymea-core/jsonrpc/jsonhandler.h
similarity index 100%
rename from libguh-core/jsonrpc/jsonhandler.h
rename to libnymea-core/jsonrpc/jsonhandler.h
diff --git a/libguh-core/jsonrpc/jsonrpcserver.cpp b/libnymea-core/jsonrpc/jsonrpcserver.cpp
similarity index 100%
rename from libguh-core/jsonrpc/jsonrpcserver.cpp
rename to libnymea-core/jsonrpc/jsonrpcserver.cpp
diff --git a/libguh-core/jsonrpc/jsonrpcserver.h b/libnymea-core/jsonrpc/jsonrpcserver.h
similarity index 100%
rename from libguh-core/jsonrpc/jsonrpcserver.h
rename to libnymea-core/jsonrpc/jsonrpcserver.h
diff --git a/libguh-core/jsonrpc/jsontypes.cpp b/libnymea-core/jsonrpc/jsontypes.cpp
similarity index 100%
rename from libguh-core/jsonrpc/jsontypes.cpp
rename to libnymea-core/jsonrpc/jsontypes.cpp
diff --git a/libguh-core/jsonrpc/jsontypes.h b/libnymea-core/jsonrpc/jsontypes.h
similarity index 100%
rename from libguh-core/jsonrpc/jsontypes.h
rename to libnymea-core/jsonrpc/jsontypes.h
diff --git a/libguh-core/jsonrpc/logginghandler.cpp b/libnymea-core/jsonrpc/logginghandler.cpp
similarity index 100%
rename from libguh-core/jsonrpc/logginghandler.cpp
rename to libnymea-core/jsonrpc/logginghandler.cpp
diff --git a/libguh-core/jsonrpc/logginghandler.h b/libnymea-core/jsonrpc/logginghandler.h
similarity index 100%
rename from libguh-core/jsonrpc/logginghandler.h
rename to libnymea-core/jsonrpc/logginghandler.h
diff --git a/libguh-core/jsonrpc/networkmanagerhandler.cpp b/libnymea-core/jsonrpc/networkmanagerhandler.cpp
similarity index 100%
rename from libguh-core/jsonrpc/networkmanagerhandler.cpp
rename to libnymea-core/jsonrpc/networkmanagerhandler.cpp
diff --git a/libguh-core/jsonrpc/networkmanagerhandler.h b/libnymea-core/jsonrpc/networkmanagerhandler.h
similarity index 100%
rename from libguh-core/jsonrpc/networkmanagerhandler.h
rename to libnymea-core/jsonrpc/networkmanagerhandler.h
diff --git a/libguh-core/jsonrpc/ruleshandler.cpp b/libnymea-core/jsonrpc/ruleshandler.cpp
similarity index 100%
rename from libguh-core/jsonrpc/ruleshandler.cpp
rename to libnymea-core/jsonrpc/ruleshandler.cpp
diff --git a/libguh-core/jsonrpc/ruleshandler.h b/libnymea-core/jsonrpc/ruleshandler.h
similarity index 100%
rename from libguh-core/jsonrpc/ruleshandler.h
rename to libnymea-core/jsonrpc/ruleshandler.h
diff --git a/libguh-core/jsonrpc/statehandler.cpp b/libnymea-core/jsonrpc/statehandler.cpp
similarity index 100%
rename from libguh-core/jsonrpc/statehandler.cpp
rename to libnymea-core/jsonrpc/statehandler.cpp
diff --git a/libguh-core/jsonrpc/statehandler.h b/libnymea-core/jsonrpc/statehandler.h
similarity index 100%
rename from libguh-core/jsonrpc/statehandler.h
rename to libnymea-core/jsonrpc/statehandler.h
diff --git a/libguh-core/libguh-core.pro b/libnymea-core/libnymea-core.pro
similarity index 99%
rename from libguh-core/libguh-core.pro
rename to libnymea-core/libnymea-core.pro
index 28a3863e..bbd31969 100644
--- a/libguh-core/libguh-core.pro
+++ b/libnymea-core/libnymea-core.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-TARGET = guh-core
+TARGET = nymea-core
 
 include(../nymea.pri)
 
diff --git a/libguh-core/logging/logengine.cpp b/libnymea-core/logging/logengine.cpp
similarity index 100%
rename from libguh-core/logging/logengine.cpp
rename to libnymea-core/logging/logengine.cpp
diff --git a/libguh-core/logging/logengine.h b/libnymea-core/logging/logengine.h
similarity index 100%
rename from libguh-core/logging/logengine.h
rename to libnymea-core/logging/logengine.h
diff --git a/libguh-core/logging/logentry.cpp b/libnymea-core/logging/logentry.cpp
similarity index 100%
rename from libguh-core/logging/logentry.cpp
rename to libnymea-core/logging/logentry.cpp
diff --git a/libguh-core/logging/logentry.h b/libnymea-core/logging/logentry.h
similarity index 100%
rename from libguh-core/logging/logentry.h
rename to libnymea-core/logging/logentry.h
diff --git a/libguh-core/logging/logfilter.cpp b/libnymea-core/logging/logfilter.cpp
similarity index 100%
rename from libguh-core/logging/logfilter.cpp
rename to libnymea-core/logging/logfilter.cpp
diff --git a/libguh-core/logging/logfilter.h b/libnymea-core/logging/logfilter.h
similarity index 100%
rename from libguh-core/logging/logfilter.h
rename to libnymea-core/logging/logfilter.h
diff --git a/libguh-core/logging/logging.h b/libnymea-core/logging/logging.h
similarity index 100%
rename from libguh-core/logging/logging.h
rename to libnymea-core/logging/logging.h
diff --git a/libguh-core/logging/logsource.cpp b/libnymea-core/logging/logsource.cpp
similarity index 100%
rename from libguh-core/logging/logsource.cpp
rename to libnymea-core/logging/logsource.cpp
diff --git a/libguh-core/logging/logsource.h b/libnymea-core/logging/logsource.h
similarity index 100%
rename from libguh-core/logging/logsource.h
rename to libnymea-core/logging/logsource.h
diff --git a/libguh-core/logging/logvaluetool.cpp b/libnymea-core/logging/logvaluetool.cpp
similarity index 100%
rename from libguh-core/logging/logvaluetool.cpp
rename to libnymea-core/logging/logvaluetool.cpp
diff --git a/libguh-core/logging/logvaluetool.h b/libnymea-core/logging/logvaluetool.h
similarity index 100%
rename from libguh-core/logging/logvaluetool.h
rename to libnymea-core/logging/logvaluetool.h
diff --git a/libguh-core/mocktcpserver.cpp b/libnymea-core/mocktcpserver.cpp
similarity index 100%
rename from libguh-core/mocktcpserver.cpp
rename to libnymea-core/mocktcpserver.cpp
diff --git a/libguh-core/mocktcpserver.h b/libnymea-core/mocktcpserver.h
similarity index 100%
rename from libguh-core/mocktcpserver.h
rename to libnymea-core/mocktcpserver.h
diff --git a/libguh-core/networkmanager/dbus-interfaces.h b/libnymea-core/networkmanager/dbus-interfaces.h
similarity index 100%
rename from libguh-core/networkmanager/dbus-interfaces.h
rename to libnymea-core/networkmanager/dbus-interfaces.h
diff --git a/libguh-core/networkmanager/networkconnection.cpp b/libnymea-core/networkmanager/networkconnection.cpp
similarity index 100%
rename from libguh-core/networkmanager/networkconnection.cpp
rename to libnymea-core/networkmanager/networkconnection.cpp
diff --git a/libguh-core/networkmanager/networkconnection.h b/libnymea-core/networkmanager/networkconnection.h
similarity index 100%
rename from libguh-core/networkmanager/networkconnection.h
rename to libnymea-core/networkmanager/networkconnection.h
diff --git a/libguh-core/networkmanager/networkdevice.cpp b/libnymea-core/networkmanager/networkdevice.cpp
similarity index 100%
rename from libguh-core/networkmanager/networkdevice.cpp
rename to libnymea-core/networkmanager/networkdevice.cpp
diff --git a/libguh-core/networkmanager/networkdevice.h b/libnymea-core/networkmanager/networkdevice.h
similarity index 100%
rename from libguh-core/networkmanager/networkdevice.h
rename to libnymea-core/networkmanager/networkdevice.h
diff --git a/libguh-core/networkmanager/networkmanager.cpp b/libnymea-core/networkmanager/networkmanager.cpp
similarity index 100%
rename from libguh-core/networkmanager/networkmanager.cpp
rename to libnymea-core/networkmanager/networkmanager.cpp
diff --git a/libguh-core/networkmanager/networkmanager.h b/libnymea-core/networkmanager/networkmanager.h
similarity index 100%
rename from libguh-core/networkmanager/networkmanager.h
rename to libnymea-core/networkmanager/networkmanager.h
diff --git a/libguh-core/networkmanager/networksettings.cpp b/libnymea-core/networkmanager/networksettings.cpp
similarity index 100%
rename from libguh-core/networkmanager/networksettings.cpp
rename to libnymea-core/networkmanager/networksettings.cpp
diff --git a/libguh-core/networkmanager/networksettings.h b/libnymea-core/networkmanager/networksettings.h
similarity index 100%
rename from libguh-core/networkmanager/networksettings.h
rename to libnymea-core/networkmanager/networksettings.h
diff --git a/libguh-core/networkmanager/wirednetworkdevice.cpp b/libnymea-core/networkmanager/wirednetworkdevice.cpp
similarity index 100%
rename from libguh-core/networkmanager/wirednetworkdevice.cpp
rename to libnymea-core/networkmanager/wirednetworkdevice.cpp
diff --git a/libguh-core/networkmanager/wirednetworkdevice.h b/libnymea-core/networkmanager/wirednetworkdevice.h
similarity index 100%
rename from libguh-core/networkmanager/wirednetworkdevice.h
rename to libnymea-core/networkmanager/wirednetworkdevice.h
diff --git a/libguh-core/networkmanager/wirelessaccesspoint.cpp b/libnymea-core/networkmanager/wirelessaccesspoint.cpp
similarity index 100%
rename from libguh-core/networkmanager/wirelessaccesspoint.cpp
rename to libnymea-core/networkmanager/wirelessaccesspoint.cpp
diff --git a/libguh-core/networkmanager/wirelessaccesspoint.h b/libnymea-core/networkmanager/wirelessaccesspoint.h
similarity index 100%
rename from libguh-core/networkmanager/wirelessaccesspoint.h
rename to libnymea-core/networkmanager/wirelessaccesspoint.h
diff --git a/libguh-core/networkmanager/wirelessnetworkdevice.cpp b/libnymea-core/networkmanager/wirelessnetworkdevice.cpp
similarity index 100%
rename from libguh-core/networkmanager/wirelessnetworkdevice.cpp
rename to libnymea-core/networkmanager/wirelessnetworkdevice.cpp
diff --git a/libguh-core/networkmanager/wirelessnetworkdevice.h b/libnymea-core/networkmanager/wirelessnetworkdevice.h
similarity index 100%
rename from libguh-core/networkmanager/wirelessnetworkdevice.h
rename to libnymea-core/networkmanager/wirelessnetworkdevice.h
diff --git a/libguh-core/pushbuttondbusservice.cpp b/libnymea-core/pushbuttondbusservice.cpp
similarity index 100%
rename from libguh-core/pushbuttondbusservice.cpp
rename to libnymea-core/pushbuttondbusservice.cpp
diff --git a/libguh-core/pushbuttondbusservice.h b/libnymea-core/pushbuttondbusservice.h
similarity index 100%
rename from libguh-core/pushbuttondbusservice.h
rename to libnymea-core/pushbuttondbusservice.h
diff --git a/libguh-core/rest/deviceclassesresource.cpp b/libnymea-core/rest/deviceclassesresource.cpp
similarity index 100%
rename from libguh-core/rest/deviceclassesresource.cpp
rename to libnymea-core/rest/deviceclassesresource.cpp
diff --git a/libguh-core/rest/deviceclassesresource.h b/libnymea-core/rest/deviceclassesresource.h
similarity index 100%
rename from libguh-core/rest/deviceclassesresource.h
rename to libnymea-core/rest/deviceclassesresource.h
diff --git a/libguh-core/rest/devicesresource.cpp b/libnymea-core/rest/devicesresource.cpp
similarity index 100%
rename from libguh-core/rest/devicesresource.cpp
rename to libnymea-core/rest/devicesresource.cpp
diff --git a/libguh-core/rest/devicesresource.h b/libnymea-core/rest/devicesresource.h
similarity index 100%
rename from libguh-core/rest/devicesresource.h
rename to libnymea-core/rest/devicesresource.h
diff --git a/libguh-core/rest/logsresource.cpp b/libnymea-core/rest/logsresource.cpp
similarity index 100%
rename from libguh-core/rest/logsresource.cpp
rename to libnymea-core/rest/logsresource.cpp
diff --git a/libguh-core/rest/logsresource.h b/libnymea-core/rest/logsresource.h
similarity index 100%
rename from libguh-core/rest/logsresource.h
rename to libnymea-core/rest/logsresource.h
diff --git a/libguh-core/rest/pluginsresource.cpp b/libnymea-core/rest/pluginsresource.cpp
similarity index 100%
rename from libguh-core/rest/pluginsresource.cpp
rename to libnymea-core/rest/pluginsresource.cpp
diff --git a/libguh-core/rest/pluginsresource.h b/libnymea-core/rest/pluginsresource.h
similarity index 100%
rename from libguh-core/rest/pluginsresource.h
rename to libnymea-core/rest/pluginsresource.h
diff --git a/libguh-core/rest/restresource.cpp b/libnymea-core/rest/restresource.cpp
similarity index 100%
rename from libguh-core/rest/restresource.cpp
rename to libnymea-core/rest/restresource.cpp
diff --git a/libguh-core/rest/restresource.h b/libnymea-core/rest/restresource.h
similarity index 100%
rename from libguh-core/rest/restresource.h
rename to libnymea-core/rest/restresource.h
diff --git a/libguh-core/rest/restserver.cpp b/libnymea-core/rest/restserver.cpp
similarity index 100%
rename from libguh-core/rest/restserver.cpp
rename to libnymea-core/rest/restserver.cpp
diff --git a/libguh-core/rest/restserver.h b/libnymea-core/rest/restserver.h
similarity index 100%
rename from libguh-core/rest/restserver.h
rename to libnymea-core/rest/restserver.h
diff --git a/libguh-core/rest/rulesresource.cpp b/libnymea-core/rest/rulesresource.cpp
similarity index 100%
rename from libguh-core/rest/rulesresource.cpp
rename to libnymea-core/rest/rulesresource.cpp
diff --git a/libguh-core/rest/rulesresource.h b/libnymea-core/rest/rulesresource.h
similarity index 100%
rename from libguh-core/rest/rulesresource.h
rename to libnymea-core/rest/rulesresource.h
diff --git a/libguh-core/rest/vendorsresource.cpp b/libnymea-core/rest/vendorsresource.cpp
similarity index 100%
rename from libguh-core/rest/vendorsresource.cpp
rename to libnymea-core/rest/vendorsresource.cpp
diff --git a/libguh-core/rest/vendorsresource.h b/libnymea-core/rest/vendorsresource.h
similarity index 100%
rename from libguh-core/rest/vendorsresource.h
rename to libnymea-core/rest/vendorsresource.h
diff --git a/libguh-core/rule.cpp b/libnymea-core/rule.cpp
similarity index 100%
rename from libguh-core/rule.cpp
rename to libnymea-core/rule.cpp
diff --git a/libguh-core/rule.h b/libnymea-core/rule.h
similarity index 100%
rename from libguh-core/rule.h
rename to libnymea-core/rule.h
diff --git a/libguh-core/ruleengine.cpp b/libnymea-core/ruleengine.cpp
similarity index 100%
rename from libguh-core/ruleengine.cpp
rename to libnymea-core/ruleengine.cpp
diff --git a/libguh-core/ruleengine.h b/libnymea-core/ruleengine.h
similarity index 100%
rename from libguh-core/ruleengine.h
rename to libnymea-core/ruleengine.h
diff --git a/libguh-core/servermanager.cpp b/libnymea-core/servermanager.cpp
similarity index 100%
rename from libguh-core/servermanager.cpp
rename to libnymea-core/servermanager.cpp
diff --git a/libguh-core/servermanager.h b/libnymea-core/servermanager.h
similarity index 100%
rename from libguh-core/servermanager.h
rename to libnymea-core/servermanager.h
diff --git a/libguh-core/stateevaluator.cpp b/libnymea-core/stateevaluator.cpp
similarity index 100%
rename from libguh-core/stateevaluator.cpp
rename to libnymea-core/stateevaluator.cpp
diff --git a/libguh-core/stateevaluator.h b/libnymea-core/stateevaluator.h
similarity index 100%
rename from libguh-core/stateevaluator.h
rename to libnymea-core/stateevaluator.h
diff --git a/libguh-core/tcpserver.cpp b/libnymea-core/tcpserver.cpp
similarity index 100%
rename from libguh-core/tcpserver.cpp
rename to libnymea-core/tcpserver.cpp
diff --git a/libguh-core/tcpserver.h b/libnymea-core/tcpserver.h
similarity index 100%
rename from libguh-core/tcpserver.h
rename to libnymea-core/tcpserver.h
diff --git a/libguh-core/time/calendaritem.cpp b/libnymea-core/time/calendaritem.cpp
similarity index 100%
rename from libguh-core/time/calendaritem.cpp
rename to libnymea-core/time/calendaritem.cpp
diff --git a/libguh-core/time/calendaritem.h b/libnymea-core/time/calendaritem.h
similarity index 100%
rename from libguh-core/time/calendaritem.h
rename to libnymea-core/time/calendaritem.h
diff --git a/libguh-core/time/repeatingoption.cpp b/libnymea-core/time/repeatingoption.cpp
similarity index 100%
rename from libguh-core/time/repeatingoption.cpp
rename to libnymea-core/time/repeatingoption.cpp
diff --git a/libguh-core/time/repeatingoption.h b/libnymea-core/time/repeatingoption.h
similarity index 100%
rename from libguh-core/time/repeatingoption.h
rename to libnymea-core/time/repeatingoption.h
diff --git a/libguh-core/time/timedescriptor.cpp b/libnymea-core/time/timedescriptor.cpp
similarity index 100%
rename from libguh-core/time/timedescriptor.cpp
rename to libnymea-core/time/timedescriptor.cpp
diff --git a/libguh-core/time/timedescriptor.h b/libnymea-core/time/timedescriptor.h
similarity index 100%
rename from libguh-core/time/timedescriptor.h
rename to libnymea-core/time/timedescriptor.h
diff --git a/libguh-core/time/timeeventitem.cpp b/libnymea-core/time/timeeventitem.cpp
similarity index 100%
rename from libguh-core/time/timeeventitem.cpp
rename to libnymea-core/time/timeeventitem.cpp
diff --git a/libguh-core/time/timeeventitem.h b/libnymea-core/time/timeeventitem.h
similarity index 100%
rename from libguh-core/time/timeeventitem.h
rename to libnymea-core/time/timeeventitem.h
diff --git a/libguh-core/time/timemanager.cpp b/libnymea-core/time/timemanager.cpp
similarity index 100%
rename from libguh-core/time/timemanager.cpp
rename to libnymea-core/time/timemanager.cpp
diff --git a/libguh-core/time/timemanager.h b/libnymea-core/time/timemanager.h
similarity index 100%
rename from libguh-core/time/timemanager.h
rename to libnymea-core/time/timemanager.h
diff --git a/libguh-core/tokeninfo.cpp b/libnymea-core/tokeninfo.cpp
similarity index 100%
rename from libguh-core/tokeninfo.cpp
rename to libnymea-core/tokeninfo.cpp
diff --git a/libguh-core/tokeninfo.h b/libnymea-core/tokeninfo.h
similarity index 100%
rename from libguh-core/tokeninfo.h
rename to libnymea-core/tokeninfo.h
diff --git a/libguh-core/transportinterface.cpp b/libnymea-core/transportinterface.cpp
similarity index 100%
rename from libguh-core/transportinterface.cpp
rename to libnymea-core/transportinterface.cpp
diff --git a/libguh-core/transportinterface.h b/libnymea-core/transportinterface.h
similarity index 100%
rename from libguh-core/transportinterface.h
rename to libnymea-core/transportinterface.h
diff --git a/libguh-core/usermanager.cpp b/libnymea-core/usermanager.cpp
similarity index 100%
rename from libguh-core/usermanager.cpp
rename to libnymea-core/usermanager.cpp
diff --git a/libguh-core/usermanager.h b/libnymea-core/usermanager.h
similarity index 100%
rename from libguh-core/usermanager.h
rename to libnymea-core/usermanager.h
diff --git a/libguh-core/webserver.cpp b/libnymea-core/webserver.cpp
similarity index 100%
rename from libguh-core/webserver.cpp
rename to libnymea-core/webserver.cpp
diff --git a/libguh-core/webserver.h b/libnymea-core/webserver.h
similarity index 100%
rename from libguh-core/webserver.h
rename to libnymea-core/webserver.h
diff --git a/libguh-core/websocketserver.cpp b/libnymea-core/websocketserver.cpp
similarity index 100%
rename from libguh-core/websocketserver.cpp
rename to libnymea-core/websocketserver.cpp
diff --git a/libguh-core/websocketserver.h b/libnymea-core/websocketserver.h
similarity index 100%
rename from libguh-core/websocketserver.h
rename to libnymea-core/websocketserver.h
diff --git a/libnymea/plugin/deviceplugin.h b/libnymea/plugin/deviceplugin.h
index 3d615fe3..c70cb0bd 100644
--- a/libnymea/plugin/deviceplugin.h
+++ b/libnymea/plugin/deviceplugin.h
@@ -120,7 +120,7 @@ private:
     QPair<bool, DeviceClass::DeviceIcon> loadAndVerifyDeviceIcon(const QString &deviceIcon) const;
 
     // FIXME: This is expensive because it will open all the files.
-    // Once DeviceManager is in libguh-core this should probably be there too.
+    // Once DeviceManager is in libnymea-core this should probably be there too.
     // I didn't want to add even more dependencies on the devicemanager into here, so reading the list here for now.
     static Interfaces allInterfaces();
     static Interface loadInterface(const QString &name);
diff --git a/nymea.pro b/nymea.pro
index 960c5f33..454d68c9 100644
--- a/nymea.pro
+++ b/nymea.pro
@@ -2,12 +2,12 @@ include(nymea.pri)
 
 TEMPLATE=subdirs
 
-SUBDIRS += libnymea libguh-core server plugins
+SUBDIRS += libnymea libnymea-core server plugins
 
-libguh-core.depends = libnymea
-server.depends = libnymea libguh-core plugins
+libnymea-core.depends = libnymea
+server.depends = libnymea libnymea-core plugins
 plugins.depends = libnymea
-tests.depends = libnymea libguh-core
+tests.depends = libnymea libnymea-core
 
 doc.depends = FORCE
 # Note: some how extraimages in qdocconf did not the trick
@@ -18,7 +18,7 @@ doc.commands += cd $$top_srcdir/doc; qdoc config.qdocconf; cp -r images/* html/i
 licensecheck.commands = $$top_srcdir/tests/auto/checklicenseheaders.sh $$top_srcdir
 
 test.depends = licensecheck
-test.commands = LD_LIBRARY_PATH=$$top_builddir/libguh-core:$$top_builddir/libnymea make check
+test.commands = LD_LIBRARY_PATH=$$top_builddir/libnymea-core:$$top_builddir/libnymea make check
 
 # Translations:
 # make lupdate to update .ts files
diff --git a/server/server.pro b/server/server.pro
index 200666f3..b81a3078 100644
--- a/server/server.pro
+++ b/server/server.pro
@@ -3,14 +3,16 @@ include(../nymea.pri)
 TARGET = guhd
 TEMPLATE = app
 
-INCLUDEPATH += ../libnymea ../libguh-core
+INCLUDEPATH += ../libnymea ../libnymea-core
 
 target.path = /usr/bin
 INSTALLS += target
 
 QT *= sql xml websockets bluetooth dbus network
 
-LIBS += -L$$top_builddir/libnymea/ -lnymea -L$$top_builddir/libguh-core -lguh-core -lssl -lcrypto -laws-iot-sdk-cpp
+LIBS += -L$$top_builddir/libnymea/ -lnymea \
+        -L$$top_builddir/libnymea-core -lnymea-core \
+        -lssl -lcrypto -laws-iot-sdk-cpp
 
 # Server files
 include(qtservice/qtservice.pri)
diff --git a/tests/auto/autotests.pri b/tests/auto/autotests.pri
index c7702a49..5b4140d8 100644
--- a/tests/auto/autotests.pri
+++ b/tests/auto/autotests.pri
@@ -2,11 +2,13 @@ QT += testlib network sql
 CONFIG += testcase
 
 INCLUDEPATH += $$top_srcdir/libnymea \
-               $$top_srcdir/libguh-core \
+               $$top_srcdir/libnymea-core \
                $$top_srcdir/tests/auto/
 
-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
+LIBS += -L$$top_builddir/libnymea/ -lnymea \
+        -L$$top_builddir/libnymea-core/ -lnymea-core \
+        -L$$top_builddir/plugins/mock/ \
+        -lssl -lcrypto -laws-iot-sdk-cpp -lavahi-common -lavahi-client
 
 SOURCES += ../guhtestbase.cpp \