diff --git a/libnymea-app-core/connection/awsclient.cpp b/libnymea-app-core/connection/awsclient.cpp
index 38cbe172..2892f3b1 100644
--- a/libnymea-app-core/connection/awsclient.cpp
+++ b/libnymea-app-core/connection/awsclient.cpp
@@ -70,7 +70,7 @@ AWSClient::AWSClient(QObject *parent) : QObject(parent),
     config.certificateVendorId = "d399290a-0599-4895-b4c3-34d2bdb579f4";
     config.mqttEndpoint = "a2d0ba9572wepp-ats.iot.eu-west-1.amazonaws.com";
     config.region = "eu-west-1";
-    config.apiEndpoint = "api-cloud.guh.io";
+    config.apiEndpoint = "api-cloud.nymea.io";
     config.pushNotificationSystem = pushSystem;
     m_configs.insert("Community", config);
 
@@ -83,7 +83,7 @@ AWSClient::AWSClient(QObject *parent) : QObject(parent),
     config.certificateVendorId = "testVendor001";
     config.mqttEndpoint = "a2addxakg5juii-ats.iot.eu-west-1.amazonaws.com";
     config.region = "eu-west-1";
-    config.apiEndpoint = "testapi-cloud.guh.io";
+    config.apiEndpoint = "testapi-cloud.nymea.io";
     config.pushNotificationSystem = pushSystem;
     m_configs.insert("Testing", config);
 
@@ -97,7 +97,7 @@ AWSClient::AWSClient(QObject *parent) : QObject(parent),
     config.certificateVendorId = "";
     config.mqttEndpoint = "a27q7a2x15m8h3-ats.iot.eu-west-1.amazonaws.com";
     config.region = "eu-west-1";
-    config.apiEndpoint = "api-cloud.guh.io";
+    config.apiEndpoint = "api-cloud.nymea.io";
     config.pushNotificationSystem = pushSystem;
     m_configs.insert("Marantec", config);
 
diff --git a/nymea-app/ui/appsettings/AboutPage.qml b/nymea-app/ui/appsettings/AboutPage.qml
index 037d96b6..e6cb16a2 100644
--- a/nymea-app/ui/appsettings/AboutPage.qml
+++ b/nymea-app/ui/appsettings/AboutPage.qml
@@ -21,7 +21,7 @@ Page {
             id: imprint
             width: parent.width
             title: app.appName
-            githubLink: "https://github.com/guh/nymea-app"
+            githubLink: "https://github.com/nymea/nymea-app"
 
             NymeaListItemDelegate {
                 Layout.fillWidth: true
diff --git a/nymea-app/ui/components/Imprint.qml b/nymea-app/ui/components/Imprint.qml
index 1d381a0f..9044fdae 100644
--- a/nymea-app/ui/components/Imprint.qml
+++ b/nymea-app/ui/components/Imprint.qml
@@ -69,7 +69,7 @@ Item {
             Layout.rightMargin: app.margins
             wrapMode: Text.WordWrap
             font.bold: true
-            text: "Copyright (C) 2019 guh GmbH"
+            text: "Copyright (C) 2019 nymea GmbH"
         }
 
         Label {
@@ -77,7 +77,7 @@ Item {
             Layout.leftMargin: app.margins
             Layout.rightMargin: app.margins
             wrapMode: Text.WordWrap
-            text: qsTr("nymea is a registered trademark of guh GmbH.")
+            text: qsTr("nymea is a registered trademark of nymea GmbH.")
         }
 
         Label {
diff --git a/nymea-app/ui/system/AboutNymeaPage.qml b/nymea-app/ui/system/AboutNymeaPage.qml
index 6a40cd9e..4171eecc 100644
--- a/nymea-app/ui/system/AboutNymeaPage.qml
+++ b/nymea-app/ui/system/AboutNymeaPage.qml
@@ -20,7 +20,7 @@ Page {
             id: imprint
             width: parent.width
             title: qsTr("%1:core").arg(app.systemName)
-            githubLink: "https://github.com/guh/nymea"
+            githubLink: "https://github.com/nymea/nymea"
 
             NymeaListItemDelegate {
                 Layout.fillWidth: true