diff --git a/libnymea-core/libnymea-core.pro b/libnymea-core/libnymea-core.pro
index 0ff1ead3..562095ed 100644
--- a/libnymea-core/libnymea-core.pro
+++ b/libnymea-core/libnymea-core.pro
@@ -75,7 +75,7 @@ HEADERS += nymeacore.h \
     OpenSSL/OpenSSLConnection.hpp \
     janusconnector.h \
     pushbuttondbusservice.h \
-    guhdbusservice.h \
+    nymeadbusservice.h \
     hardwaremanagerimplementation.h \
     hardware/plugintimermanagerimplementation.h \
     hardware/radio433/radio433brennenstuhl.h \
@@ -154,7 +154,7 @@ SOURCES += nymeacore.cpp \
     OpenSSL/OpenSSLConnection.cpp \
     janusconnector.cpp \
     pushbuttondbusservice.cpp \
-    guhdbusservice.cpp \
+    nymeadbusservice.cpp \
     hardwaremanagerimplementation.cpp \
     hardware/plugintimermanagerimplementation.cpp \
     hardware/radio433/radio433brennenstuhl.cpp \
diff --git a/libnymea-core/guhdbusservice.cpp b/libnymea-core/nymeadbusservice.cpp
similarity index 86%
rename from libnymea-core/guhdbusservice.cpp
rename to libnymea-core/nymeadbusservice.cpp
index 88f9e7f6..e077ad96 100644
--- a/libnymea-core/guhdbusservice.cpp
+++ b/libnymea-core/nymeadbusservice.cpp
@@ -19,15 +19,15 @@
  *                                                                         *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "guhdbusservice.h"
+#include "nymeadbusservice.h"
 #include "usermanager.h"
 #include "loggingcategories.h"
 
 namespace guhserver {
 
-QDBusConnection GuhDBusService::s_connection = QDBusConnection::systemBus();
+QDBusConnection NymeaDBusService::s_connection = QDBusConnection::systemBus();
 
-GuhDBusService::GuhDBusService(const QString &objectPath, UserManager *parent) : QObject(parent)
+NymeaDBusService::NymeaDBusService(const QString &objectPath, UserManager *parent) : QObject(parent)
 {
     bool status = s_connection.registerService("io.guh.nymead");
     if (!status) {
@@ -42,17 +42,17 @@ GuhDBusService::GuhDBusService(const QString &objectPath, UserManager *parent) :
     m_isValid = true;
 }
 
-bool GuhDBusService::isValid()
+bool NymeaDBusService::isValid()
 {
     return m_isValid;
 }
 
-QDBusConnection GuhDBusService::connection() const
+QDBusConnection NymeaDBusService::connection() const
 {
     return s_connection;
 }
 
-void GuhDBusService::setBusType(QDBusConnection::BusType busType)
+void NymeaDBusService::setBusType(QDBusConnection::BusType busType)
 {
     if (busType == QDBusConnection::SessionBus) {
         s_connection = QDBusConnection::sessionBus();
diff --git a/libnymea-core/guhdbusservice.h b/libnymea-core/nymeadbusservice.h
similarity index 89%
rename from libnymea-core/guhdbusservice.h
rename to libnymea-core/nymeadbusservice.h
index b3557cda..256260ae 100644
--- a/libnymea-core/guhdbusservice.h
+++ b/libnymea-core/nymeadbusservice.h
@@ -19,8 +19,8 @@
  *                                                                         *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef GUHDBUSSERVICE_H
-#define GUHDBUSSERVICE_H
+#ifndef NYMEADBUSSERVICE_H
+#define NYMEADBUSSERVICE_H
 
 #include <QObject>
 #include <QDBusConnection>
@@ -31,13 +31,13 @@ namespace guhserver {
 
 class UserManager;
 
-class GuhDBusService : public QObject, public QDBusContext
+class NymeaDBusService : public QObject, public QDBusContext
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "io.guh.nymead")
 
 public:
-    explicit GuhDBusService(const QString &objectPath, UserManager *parent = nullptr);
+    explicit NymeaDBusService(const QString &objectPath, UserManager *parent = nullptr);
 
     static void setBusType(QDBusConnection::BusType busType);
 
@@ -54,4 +54,4 @@ private:
 
 }
 
-#endif // GUHDBUSSERVICE_H
+#endif // NYMEADBUSSERVICE_H
diff --git a/libnymea-core/pushbuttondbusservice.cpp b/libnymea-core/pushbuttondbusservice.cpp
index c35da40b..ba30621f 100644
--- a/libnymea-core/pushbuttondbusservice.cpp
+++ b/libnymea-core/pushbuttondbusservice.cpp
@@ -28,7 +28,7 @@
 
 namespace guhserver {
 
-PushButtonDBusService::PushButtonDBusService(const QString &objectPath, UserManager *parent) : GuhDBusService(objectPath, parent),
+PushButtonDBusService::PushButtonDBusService(const QString &objectPath, UserManager *parent) : NymeaDBusService(objectPath, parent),
     m_userManager(parent)
 {
     if (!isValid()) {
diff --git a/libnymea-core/pushbuttondbusservice.h b/libnymea-core/pushbuttondbusservice.h
index fa169198..d7218c9d 100644
--- a/libnymea-core/pushbuttondbusservice.h
+++ b/libnymea-core/pushbuttondbusservice.h
@@ -25,11 +25,11 @@
 #include <QDBusObjectPath>
 
 #include "usermanager.h"
-#include "guhdbusservice.h"
+#include "nymeadbusservice.h"
 
 namespace guhserver {
 
-class PushButtonDBusService : public GuhDBusService
+class PushButtonDBusService : public NymeaDBusService
 {
     Q_OBJECT
 public:
diff --git a/server/main.cpp b/server/main.cpp
index 601414a1..4905ef1b 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -38,7 +38,7 @@
 #include "nymeacore.h"
 #include "guhservice.h"
 #include "nymeasettings.h"
-#include "guhdbusservice.h"
+#include "nymeadbusservice.h"
 #include "guhapplication.h"
 #include "loggingcategories.h"
 
@@ -243,7 +243,7 @@ int main(int argc, char *argv[])
     QLoggingCategory::installFilter(loggingCategoryFilter);
 
     if (parser.isSet(dbusOption)) {
-        GuhDBusService::setBusType(QDBusConnection::SessionBus);
+        NymeaDBusService::setBusType(QDBusConnection::SessionBus);
     }
 
     bool startForeground = parser.isSet(foregroundOption);