diff --git a/server/main.cpp b/server/main.cpp
index e889e2fc..92ac3330 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -39,7 +39,7 @@
 #include "nymeaservice.h"
 #include "nymeasettings.h"
 #include "nymeadbusservice.h"
-#include "guhapplication.h"
+#include "nymeaapplication.h"
 #include "loggingcategories.h"
 
 static QHash<QString, bool> s_loggingFilters;
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
 {
     qInstallMessageHandler(consoleLogHandler);
 
-    GuhApplication application(argc, argv);
+    NymeaApplication application(argc, argv);
     application.setOrganizationName("nymea");
     application.setApplicationName("nymead");
     application.setApplicationVersion(NYMEA_VERSION_STRING);
diff --git a/server/guhapplication.cpp b/server/nymeaapplication.cpp
similarity index 94%
rename from server/guhapplication.cpp
rename to server/nymeaapplication.cpp
index 1338aa5d..ee8d5c9e 100644
--- a/server/guhapplication.cpp
+++ b/server/nymeaapplication.cpp
@@ -19,13 +19,13 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*!
-    \class guhserver::GuhApplication
+    \class guhserver::NymeaApplication
     \brief Application class of the guh server.
 
     \ingroup core
     \inmodule server
 
-    The \l{GuhApplication} is a subclass of the \{http://doc.qt.io/qt-5/qcoreapplication.html}{QCoreApplication}
+    The \l{NymeaApplication} is a subclass of the \{http://doc.qt.io/qt-5/qcoreapplication.html}{QCoreApplication}
     and is responsable to catch system signals like SIGQUIT, SIGINT, SIGTERM, SIGHUP, SIGSEGV. This class
     will provide a backtrace on a segmentation fault (SIGSEGV).
 
@@ -33,7 +33,7 @@
     \sa NymeaService
 */
 
-#include "guhapplication.h"
+#include "nymeaapplication.h"
 #include "loggingcategories.h"
 #include "nymeacore.h"
 
@@ -178,7 +178,7 @@ static void catchUnixSignals(const std::vector<int>& quitSignals, const std::vec
                 break;
             default:
                 qCCritical(dcApplication()) << "Fuck this shit. I'm out...";
-                GuhApplication::quit();
+                NymeaApplication::quit();
                 break;
             }
             s_shutdownCounter++;
@@ -195,7 +195,7 @@ static void catchUnixSignals(const std::vector<int>& quitSignals, const std::vec
         if (s_multipleShutdownDetected)
             qCDebug(dcApplication) << "Ok, ok, I'm done! :)";
 
-        GuhApplication::quit();
+        NymeaApplication::quit();
     };
 
     // all these signals will be ignored.
@@ -207,8 +207,8 @@ static void catchUnixSignals(const std::vector<int>& quitSignals, const std::vec
 }
 
 
-/*! Constructs a GuhApplication with the given argument count \a argc and argument vector \a argv. */
-GuhApplication::GuhApplication(int &argc, char **argv) :
+/*! Constructs a NymeaApplication with the given argument count \a argc and argument vector \a argv. */
+NymeaApplication::NymeaApplication(int &argc, char **argv) :
     QCoreApplication(argc, argv)
 {
     catchUnixSignals({SIGQUIT, SIGINT, SIGTERM, SIGHUP, SIGSEGV});
diff --git a/server/guhapplication.h b/server/nymeaapplication.h
similarity index 89%
rename from server/guhapplication.h
rename to server/nymeaapplication.h
index 78f0f219..0263d5b1 100644
--- a/server/guhapplication.h
+++ b/server/nymeaapplication.h
@@ -18,8 +18,8 @@
  *                                                                         *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef GUHAPPLICATION_H
-#define GUHAPPLICATION_H
+#ifndef NYMEAAPPLICATION_H
+#define NYMEAAPPLICATION_H
 
 #include <QObject>
 #include <QSocketNotifier>
@@ -27,11 +27,11 @@
 
 namespace guhserver {
 
-class GuhApplication : public QCoreApplication
+class NymeaApplication : public QCoreApplication
 {
 public:
-    GuhApplication(int &argc, char **argv);
+    NymeaApplication(int &argc, char **argv);
 };
 
 }
-#endif // GUHAPPLICATION_H
+#endif // NYMEAAPPLICATION_H
diff --git a/server/server.pro b/server/server.pro
index c8be0548..3159616d 100644
--- a/server/server.pro
+++ b/server/server.pro
@@ -19,9 +19,9 @@ include(qtservice/qtservice.pri)
 
 SOURCES += main.cpp \
     nymeaservice.cpp \
-    guhapplication.cpp
+    nymeaapplication.cpp
 
 HEADERS += \
     nymeaservice.h \
-    guhapplication.h
+    nymeaapplication.h