diff --git a/debian/control b/debian/control
index d7527087..a46e6198 100644
--- a/debian/control
+++ b/debian/control
@@ -460,21 +460,21 @@ Description: nymea.io plugin for TCP commander
  With the powerful rule engine you are able to connect any device available
  in the system and create individual scenes and behaviors for your environment.
  .
- This package will install the nymea.io plugin for TCP commander
+ This package will install the nymea.io plugin for the TCP commander
 
-Package: guh-plugin-httpcommander
+Package: nymea-plugin-httpcommander
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         guh-plugins-translations,
-Description: guh.io plugin for HTTP commander
- The guh daemon is a plugin based IoT (Internet of Things) server. The
+         nymea-plugins-translations,
+Description: nymea.io plugin for HTTP commander
+ The nymea daemon is a plugin based IoT (Internet of Things) server. The
  server works like a translator for devices, things and services and
  allows them to interact.
  With the powerful rule engine you are able to connect any device available
  in the system and create individual scenes and behaviors for your environment.
  .
- This package will install the guh.io plugin for HTTP commander
+ This package will install the nymea.io plugin for the HTPP commander
 
 
 Package: nymea-plugin-simulation
diff --git a/debian/guh-plugin-httpcommander.install.in b/debian/guh-plugin-httpcommander.install.in
deleted file mode 100644
index 710316ae..00000000
--- a/debian/guh-plugin-httpcommander.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginhttpcommander.so
diff --git a/debian/nymea-plugin-httpcommander.install.in b/debian/nymea-plugin-httpcommander.install.in
new file mode 100644
index 00000000..74e4374a
--- /dev/null
+++ b/debian/nymea-plugin-httpcommander.install.in
@@ -0,0 +1 @@
+usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_devicepluginhttpcommander.so
diff --git a/httpcommander/devicepluginhttpcommander.h b/httpcommander/devicepluginhttpcommander.h
index d9453ae1..26023ed9 100644
--- a/httpcommander/devicepluginhttpcommander.h
+++ b/httpcommander/devicepluginhttpcommander.h
@@ -21,8 +21,8 @@
  *                                                                         *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#ifndef DEVICEPLUGINDHTTPCOMMANDER_H
-#define DEVICEPLUGINDHTTPCOMMANDER_H
+#ifndef DEVICEPLUGINHTTPCOMMANDER_H
+#define DEVICEPLUGINHTTPCOMMANDER_H
 
 #include "plugin/deviceplugin.h"
 #include "devicemanager.h"
diff --git a/httpcommander/devicepluginhttpcommander.json b/httpcommander/devicepluginhttpcommander.json
index e400bc87..121f70d3 100644
--- a/httpcommander/devicepluginhttpcommander.json
+++ b/httpcommander/devicepluginhttpcommander.json
@@ -22,7 +22,7 @@
                         {
                             "id": "020f672e-cc9a-4b74-92dd-a92a93ab1d23",
                             "name": "url",
-                            "displayName": "URL or IPv4 address",
+                            "displayName": "Address",
                             "type": "QString",
                             "inputType": "None",
                             "defaultValue": "https://nymea.io"
@@ -30,7 +30,7 @@
                         {
                             "id": "37830ea8-2249-46e6-aaca-12164928a81a",
                             "name": "port",
-                            "displayName": "port",
+                            "displayName": "Port",
                             "type": "int",
                             "defaultValue": "443"
                         }
@@ -84,7 +84,7 @@
                         {
                             "id": "1a3fcb23-931b-4ba1-b134-c49b656c76f7",
                             "name": "url",
-                            "displayName": "URL or IPv4 address",
+                            "displayName": "Address",
                             "type": "QString",
                             "inputType": "None",
                             "defaultValue": "https://nymea.io"
diff --git a/httpcommander/translations/en_US.ts b/httpcommander/translations/4e62670c-6268-4487-8dff-cccca498731a-en_US.ts
similarity index 92%
rename from httpcommander/translations/en_US.ts
rename to httpcommander/translations/4e62670c-6268-4487-8dff-cccca498731a-en_US.ts
index 6401616d..f7f66d85 100644
--- a/httpcommander/translations/en_US.ts
+++ b/httpcommander/translations/4e62670c-6268-4487-8dff-cccca498731a-en_US.ts
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1">
-</TS>
+</TS>
\ No newline at end of file
diff --git a/httpcommander/translations/de_DE.ts b/httpcommander/translations/de_DE.ts
deleted file mode 100644
index 1552582e..00000000
--- a/httpcommander/translations/de_DE.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="de_DE">
-</TS>