diff --git a/libnymea-core/time/timemanager.cpp b/libnymea-core/time/timemanager.cpp
index 345eba92..df034f45 100644
--- a/libnymea-core/time/timemanager.cpp
+++ b/libnymea-core/time/timemanager.cpp
@@ -48,13 +48,13 @@ TimeManager::TimeManager(const QByteArray &timeZone, QObject *parent) :
 
     setTimeZone(timeZone);
 
-    m_guhTimer = new QTimer(this);
-    m_guhTimer->setInterval(1000);
-    m_guhTimer->setSingleShot(false);
+    m_nymeaTimer = new QTimer(this);
+    m_nymeaTimer->setInterval(1000);
+    m_nymeaTimer->setSingleShot(false);
 
-    connect(m_guhTimer, &QTimer::timeout, this, &TimeManager::guhTimeout);
+    connect(m_nymeaTimer, &QTimer::timeout, this, &TimeManager::nymeaTimeout);
 
-    m_guhTimer->start();
+    m_nymeaTimer->start();
 }
 
 /*! Returns the time zone of this \l{TimeManager}. */
@@ -111,23 +111,23 @@ void TimeManager::stopTimer()
 {
     qCWarning(dcTimeManager()) << "TimeManager timer stopped. You should only see this in tests.";
     // Stop clock (used for testing)
-    m_guhTimer->stop();
+    m_nymeaTimer->stop();
 }
 
 void TimeManager::setTime(const QDateTime &dateTime)
 {
     qCWarning(dcTimeManager()) << "TimeManager time changed" << dateTime.toString("dd.MM.yyyy hh:mm:ss") << "You should only see this in tests.";
-    // This method will only be called for testing to set the guhIO intern time
+    // This method will only be called for testing to set the internal time
     emit tick();
     emit dateTimeChanged(dateTime);
 }
 
-void TimeManager::guhTimeout()
+void TimeManager::nymeaTimeout()
 {
     // tick for deviceManager
     emit tick();
 
-    // Minute based guh time
+    // Minute based nymea time
     QDateTime utcDateTime = QDateTime::currentDateTimeUtc();
     if (m_dateTime.time().minute() != utcDateTime.toTimeZone(m_timeZone).time().minute()) {
         m_dateTime = utcDateTime;
diff --git a/libnymea-core/time/timemanager.h b/libnymea-core/time/timemanager.h
index 67fabeb2..24bd7614 100644
--- a/libnymea-core/time/timemanager.h
+++ b/libnymea-core/time/timemanager.h
@@ -49,14 +49,14 @@ public:
 private:
     QTimeZone m_timeZone;
     QDateTime m_dateTime;
-    QTimer *m_guhTimer;
+    QTimer *m_nymeaTimer;
 
 signals:
     void tick();
     void dateTimeChanged(const QDateTime &dateTime);
 
 private slots:
-    void guhTimeout();
+    void nymeaTimeout();
 
 };
 
diff --git a/libnymea/devicemanager.cpp b/libnymea/devicemanager.cpp
index 370785de..0625e67f 100644
--- a/libnymea/devicemanager.cpp
+++ b/libnymea/devicemanager.cpp
@@ -995,7 +995,7 @@ DeviceManager::DeviceError DeviceManager::executeAction(const Action &action)
     return DeviceErrorDeviceNotFound;
 }
 
-/*! Centralized time tick for the GuhTimer resource. Ticks every second. */
+/*! Centralized time tick for the NymeaTimer resource. Ticks every second. */
 void DeviceManager::timeTick()
 {