diff --git a/data/debug-interface/warning.svg b/data/debug-interface/warning.svg
index ab70a256..44a24287 100644
--- a/data/debug-interface/warning.svg
+++ b/data/debug-interface/warning.svg
@@ -56,7 +56,7 @@
         </dc:creator>
         <dc:publisher>
           <cc:Agent>
-            <dc:title>guh GmbH</dc:title>
+            <dc:title>nymea GmbH</dc:title>
           </cc:Agent>
         </dc:publisher>
         <dc:description>Warning icon for the debug interface</dc:description>
diff --git a/doc/config.qdocconf b/doc/config.qdocconf
index 4c24d1f3..02b31fe1 100644
--- a/doc/config.qdocconf
+++ b/doc/config.qdocconf
@@ -5,7 +5,7 @@ description = Developer documentation!
 
 dita.metadata.default.author      = Simon Stürz
 dita.metadata.default.permissions = all
-dita.metadata.default.publisher   = guh GmbH
+dita.metadata.default.publisher   = nymea GmbH
 dita.metadata.default.copyryear = 2019
 dita.metadata.default.copyrholder = Simon Stürz
 dita.metadata.default.audience = programmer
diff --git a/doc/html-template.qdocconf b/doc/html-template.qdocconf
index 418ac44d..2cd6ddb7 100644
--- a/doc/html-template.qdocconf
+++ b/doc/html-template.qdocconf
@@ -47,7 +47,7 @@ HTML.footer = \
     "</div>\n" \
     "<div class=\"footer\">\n" \
     "  <p>\n" \
-    "    <acronym title=\"Copyright\">&copy;</acronym> 2013-2019 guh GmbH. All rights reserved.  <a href=\"license.html\">License</a>"\n \
+    "    <acronym title=\"Copyright\">&copy;</acronym> 2013-2019 nymea GmbH. All rights reserved.  <a href=\"license.html\">License</a>"\n \
     "  </p>\n" \
     "</div>\n"
 
diff --git a/libnymea-core/certificategenerator.cpp b/libnymea-core/certificategenerator.cpp
index 6cacdf4a..1882690a 100644
--- a/libnymea-core/certificategenerator.cpp
+++ b/libnymea-core/certificategenerator.cpp
@@ -67,7 +67,7 @@ void CertificateGenerator::generate(const QString &certificateFilename, const QS
     X509_NAME_add_entry_by_txt(name, "E", MBSTRING_ASC, (unsigned char *)"nymea", -1, -1, 0);
     X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, (unsigned char *)"nymea.io", -1, -1, 0);
     X509_NAME_add_entry_by_txt(name, "OU", MBSTRING_ASC, (unsigned char *)"home", -1, -1, 0);
-    X509_NAME_add_entry_by_txt(name, "O", MBSTRING_ASC, (unsigned char *)"guh GmbH", -1, -1, 0);
+    X509_NAME_add_entry_by_txt(name, "O", MBSTRING_ASC, (unsigned char *)"nymea GmbH", -1, -1, 0);
     X509_NAME_add_entry_by_txt(name, "L", MBSTRING_ASC, (unsigned char *)"Vienna", -1, -1, 0);
     X509_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC, (unsigned char *)"AT", -1, -1, 0);
     X509_set_issuer_name(x509, name);
diff --git a/libnymea-core/debugserverhandler.cpp b/libnymea-core/debugserverhandler.cpp
index 2b71eb95..5622fee8 100644
--- a/libnymea-core/debugserverhandler.cpp
+++ b/libnymea-core/debugserverhandler.cpp
@@ -1840,7 +1840,7 @@ QByteArray DebugServerHandler::createDebugXmlDocument()
     // Footer
     writer.writeStartElement("div");
     writer.writeAttribute("class", "footer");
-    writer.writeTextElement("p", QString("Copyright %1 %2 guh GmbH.").arg(QChar(0xA9)).arg(COPYRIGHT_YEAR_STRING));
+    writer.writeTextElement("p", QString("Copyright %1 %2 nymea GmbH.").arg(QChar(0xA9)).arg(COPYRIGHT_YEAR_STRING));
     //: The footer license note of the debug interface
     writer.writeTextElement("p", tr("Released under the GNU GENERAL PUBLIC LICENSE Version 2."));
     writer.writeEndElement(); // div footer
@@ -1915,7 +1915,7 @@ QByteArray DebugServerHandler::createErrorXmlDocument(HttpReply::HttpStatusCode
     // Footer
     writer.writeStartElement("div");
     writer.writeAttribute("class", "footer");
-    writer.writeTextElement("p", QString("Copyright %1 %2 guh GmbH.").arg(QChar(0xA9)).arg(COPYRIGHT_YEAR_STRING));
+    writer.writeTextElement("p", QString("Copyright %1 %2 nymea GmbH.").arg(QChar(0xA9)).arg(COPYRIGHT_YEAR_STRING));
     writer.writeTextElement("p", tr("Released under the GNU GENERAL PUBLIC LICENSE Version 2."));
     writer.writeEndElement(); // div footer
 
diff --git a/libnymea-core/servermanager.cpp b/libnymea-core/servermanager.cpp
index c2406080..e6a21c53 100644
--- a/libnymea-core/servermanager.cpp
+++ b/libnymea-core/servermanager.cpp
@@ -311,7 +311,7 @@ bool ServerManager::registerZeroConfService(const ServerConfiguration &configura
     QHash<QString, QString> txt;
     txt.insert("jsonrpcVersion", JSON_PROTOCOL_VERSION);
     txt.insert("serverVersion", NYMEA_VERSION_STRING);
-    txt.insert("manufacturer", "guh GmbH");
+    txt.insert("manufacturer", "nymea GmbH");
     txt.insert("uuid", NymeaCore::instance()->configuration()->serverUuid().toString());
     txt.insert("name", NymeaCore::instance()->configuration()->serverName());
     txt.insert("sslEnabled", configuration.sslEnabled ? "true" : "false");
diff --git a/libnymea-core/servers/webserver.cpp b/libnymea-core/servers/webserver.cpp
index 8243ce44..534d7d56 100644
--- a/libnymea-core/servers/webserver.cpp
+++ b/libnymea-core/servers/webserver.cpp
@@ -616,8 +616,8 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address)
     writer.writeTextElement("presentationURL", presentationUrl);
     writer.writeTextElement("deviceType", "urn:schemas-upnp-org:device:Basic:1");
     writer.writeTextElement("friendlyName", NymeaCore::instance()->configuration()->serverName());
-    writer.writeTextElement("manufacturer", "guh GmbH");
-    writer.writeTextElement("manufacturerURL", "http://guh.io");
+    writer.writeTextElement("manufacturer", "nymea GmbH");
+    writer.writeTextElement("manufacturerURL", "http://nymea.io");
     writer.writeTextElement("modelDescription", "IoT server");
     writer.writeTextElement("modelName", "nymead");
     writer.writeTextElement("modelNumber", NYMEA_VERSION_STRING);
diff --git a/server/main.cpp b/server/main.cpp
index d9f1a39e..17429c66 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
                                                                           "device available in the system and create individual scenes and behaviors \n"
                                                                           "for your environment.\n\n");
 
-    applicationDescription.append(QString("nymead %1 %2 %3 guh GmbH\n"
+    applicationDescription.append(QString("nymead %1 %2 %3 nymea GmbH\n"
                                           "Released under the GNU GENERAL PUBLIC LICENSE Version 2.\n\n"
                                           "API version: %4\n").arg(NYMEA_VERSION_STRING).arg(QChar(0xA9)).arg(COPYRIGHT_YEAR_STRING).arg(JSON_PROTOCOL_VERSION));