diff --git a/mock-api/old_server.js b/mock-api/old_server.js
index 6a5c0f0e0..5e4aeca7c 100644
--- a/mock-api/old_server.js
+++ b/mock-api/old_server.js
@@ -687,7 +687,7 @@ const emsesp_devicedata_1 = {
       v: 'std prog',
       u: 0,
       id: '00dhw program',
-      c: 'wwprogmode',
+      c: 'dhw/progmode',
       l: ['std prog', 'own prog']
     },
     {
@@ -761,7 +761,7 @@ const emsesp_devicedata_1 = {
       v: '01.01.2019-12.01.2019',
       u: 0,
       id: '00dhw vacation dates',
-      c: 'wwvacations',
+      c: 'dhw/vacations',
       h: 'dd.mm.yyyy-dd.mm.yyyy'
     },
     {
@@ -1397,7 +1397,7 @@ const emsesp_devicedata_3 = {
       v: 47,
       u: 1,
       id: '00dhw selected temperature',
-      c: 'wwseltemp',
+      c: 'dhw/seltemp',
       m: 0,
       x: 254,
       s: 1
@@ -1418,7 +1418,7 @@ const emsesp_devicedata_3 = {
       v: 40,
       u: 2,
       id: '00dhw flow temperature offset',
-      c: 'wwflowtempoffset',
+      c: 'dhw/flowtempoffset',
       m: 0,
       x: 100,
       s: 1
@@ -1439,7 +1439,7 @@ const emsesp_devicedata_3 = {
       v: -5,
       u: 2,
       id: '00dhw hysteresis on temperature',
-      c: 'wwhyston',
+      c: 'dhw/hyston',
       m: -126,
       x: 126,
       s: 1
@@ -1448,7 +1448,7 @@ const emsesp_devicedata_3 = {
       v: -1,
       u: 2,
       id: '00dhw hysteresis off temperature',
-      c: 'wwhystoff',
+      c: 'dhw/hystoff',
       m: -126,
       x: 126,
       s: 1
@@ -1457,7 +1457,7 @@ const emsesp_devicedata_3 = {
       v: 70,
       u: 1,
       id: '00dhw disinfection temperature',
-      c: 'wwdisinfectiontemp',
+      c: 'dhw/disinfectiontemp',
       m: 0,
       x: 254,
       s: 1
@@ -1495,21 +1495,21 @@ const emsesp_devicedata_3 = {
       v: 'on',
       u: 0,
       id: '00dhw activated',
-      c: 'wwactivated',
+      c: 'dhw/activated',
       l: ['off', 'on']
     },
     {
       v: 'off',
       u: 0,
       id: '00dhw one time charging',
-      c: 'wwonetime',
+      c: 'dhw/onetime',
       l: ['off', 'on']
     },
     {
       v: 'off',
       u: 0,
       id: '00dhw disinfecting',
-      c: 'wwdisinfecting',
+      c: 'dhw/disinfecting',
       l: ['off', 'on']
     },
     {
@@ -1722,7 +1722,7 @@ const emsesp_devicedata_6 = {
       v: 37,
       u: 1,
       id: '00dhw minimum temperature',
-      c: 'wwmintemp',
+      c: 'dhw/mintemp',
       m: 0,
       x: 254,
       s: 1
@@ -1818,12 +1818,12 @@ const emsesp_devicedata_7 = {
     { v: 'manual', u: 0, id: '00maintenance scheduled', c: 'maintenance', l: ['off', 'time', 'date', 'manual'] },
     { v: 6000, u: 7, id: '00time to next maintenance', c: 'maintenancetime' },
     { v: '01.01.2012', u: 0, id: '00next maintenance date', c: 'maintenancedate', h: 'dd.mm.yyyy' },
-    { v: 'on', u: 0, id: '00dhw turn on/off', c: 'wwtapactivated', l: ['off', 'on'] },
+    { v: 'on', u: 0, id: '00dhw turn on/off', c: 'tapactivated', l: ['off', 'on'] },
     { v: 62, u: 1, id: '00dhw set temperature' },
-    { v: 60, u: 1, id: '00dhw selected temperature', c: 'wwseltemp' },
+    { v: 60, u: 1, id: '00dhw selected temperature', c: 'dhw/seltemp' },
     { v: 'flow', u: 0, id: '00dhw type' },
     { v: 'hot', u: 0, id: '00dhw comfort', c: 'dhw/comfort', l: ['hot', 'eco', 'intelligent'] },
-    { v: 40, u: 2, id: '00dhw flow temperature offset', c: 'wwflowtempoffset' },
+    { v: 40, u: 2, id: '00dhw flow temperature offset', c: 'dhw/flowtempoffset' },
     { v: 100, u: 3, id: '00dhw max power', c: 'dhw/maxpower' },
     { v: 'off', u: 0, id: '00dhw circulation pump available', c: 'dhw/circpump', l: ['off', 'on'] },
     { v: '3-way valve', u: 0, id: '00dhw charging type' },
@@ -1841,9 +1841,9 @@ const emsesp_devicedata_7 = {
     { v: 47.3, u: 1, id: '00dhw current intern temperature' },
     { v: 0, u: 4, id: '00dhw current tap water flow' },
     { v: 47.3, u: 1, id: '00dhw storage intern temperature' },
-    { v: 'on', u: 0, id: '00dhw activated', c: 'wwactivated', l: ['off', 'on'] },
-    { v: 'off', u: 0, id: '00dhw one time charging', c: 'wwonetime', l: ['off', 'on'] },
-    { v: 'off', u: 0, id: '00dhw disinfecting', c: 'wwdisinfecting', l: ['off', 'on'] },
+    { v: 'on', u: 0, id: '00dhw activated', c: 'dhw/activated', l: ['off', 'on'] },
+    { v: 'off', u: 0, id: '00dhw one time charging', c: 'dhw/onetime', l: ['off', 'on'] },
+    { v: 'off', u: 0, id: '00dhw disinfecting', c: 'dhw/disinfecting', l: ['off', 'on'] },
     { v: 'off', u: 0, id: '00dhw charging' },
     { v: 'off', u: 0, id: '00dhw recharging' },
     { v: 'on', u: 0, id: '00dhw temperature ok' },
@@ -2019,16 +2019,16 @@ const emsesp_deviceentities_7 = [
   { v: 'manual', n: 'maintenance scheduled', id: 'maintenance', m: 0, w: false },
   { v: 6000, n: 'time to next maintenance', id: 'maintenancetime', m: 0, w: false },
   { v: '01.01.2012', n: 'next maintenance date', id: 'maintenancedate', m: 0, w: false },
-  { v: true, n: 'dhw turn on/off', id: 'wwtapactivated', m: 0, w: false },
-  { v: 62, n: 'dhw set temperature', id: 'wwsettemp', m: 0, w: false },
-  { v: 60, n: 'dhw selected temperature', id: 'wwseltemp', m: 0, w: true },
-  { n: 'dhw selected lower temperature', id: 'wwseltemplow', m: 2 },
-  { n: 'dhw selected temperature for off', id: 'wwseltempoff', m: 2 },
-  { n: 'dhw single charge temperature', id: 'wwseltempsingle', m: 2 },
-  { v: 'flow', n: 'dhw type', id: 'wwtype', m: 0, w: false },
+  { v: true, n: 'dhw turn on/off', id: 'dhw/tapactivated', m: 0, w: false },
+  { v: 62, n: 'dhw set temperature', id: 'dhw/settemp', m: 0, w: false },
+  { v: 60, n: 'dhw selected temperature', id: 'dhw/seltemp', m: 0, w: true },
+  { n: 'dhw selected lower temperature', id: 'dhw/seltemplow', m: 2 },
+  { n: 'dhw selected temperature for off', id: 'dhw/seltempoff', m: 2 },
+  { n: 'dhw single charge temperature', id: 'dhw/seltempsingle', m: 2 },
+  { v: 'flow', n: 'dhw type', id: 'dhw/type', m: 0, w: false },
   { v: 'hot', n: 'dhw comfort', id: 'dhw/comfort', m: 0, w: false },
-  { v: 40, n: 'dhw flow temperature offset', id: 'wwflowtempoffset', m: 0, w: false },
-  { v: 100, n: 'dhw max power', id: 'wwmaxpower', m: 0, w: false },
+  { v: 40, n: 'dhw flow temperature offset', id: 'dhw/flowtempoffset', m: 0, w: false },
+  { v: 100, n: 'dhw max power', id: 'dhw/maxpower', m: 0, w: false },
   { v: false, n: 'dhw circulation pump available', id: 'dhw/circpump', m: 0, w: false },
   { v: '3-way valve', n: 'dhw charging type', id: 'dhw/chargetype', m: 0, w: false },
   { v: -5, n: 'dhw hysteresis on temperature', id: 'dhw/hyston', m: 0, w: false },
diff --git a/src/shower.cpp b/src/shower.cpp
index 4d83c837d..6ee2b240a 100644
--- a/src/shower.cpp
+++ b/src/shower.cpp
@@ -141,7 +141,7 @@ void Shower::loop() {
 // turn off hot water to send a shot of cold
 void Shower::shower_alert_start() {
     LOG_DEBUG("Shower Alert started");
-    (void)Command::call(EMSdevice::DeviceType::BOILER, "wwtapactivated", "false");
+    (void)Command::call(EMSdevice::DeviceType::BOILER, "dhw/tapactivated", "false");
     doing_cold_shot_   = true;
     force_coldshot     = false;
     alert_timer_start_ = uuid::get_uptime(); // timer starts now
@@ -151,7 +151,7 @@ void Shower::shower_alert_start() {
 void Shower::shower_alert_stop() {
     if (doing_cold_shot_) {
         LOG_DEBUG("Shower Alert stopped");
-        (void)Command::call(EMSdevice::DeviceType::BOILER, "wwtapactivated", "true");
+        (void)Command::call(EMSdevice::DeviceType::BOILER, "dhw/tapactivated", "true");
         doing_cold_shot_ = false;
         force_coldshot   = false;
     }
diff --git a/src/test/test.cpp b/src/test/test.cpp
index 77ea432bd..71dc3a2bc 100644
--- a/src/test/test.cpp
+++ b/src/test/test.cpp
@@ -680,7 +680,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         test("boiler");
 
         // device type, command, data
-        Command::call(EMSdevice::DeviceType::BOILER, "wwtapactivated", "false");
+        Command::call(EMSdevice::DeviceType::BOILER, "tapactivated", "false");
         ok = true;
     }
 
diff --git a/test/api_test.http b/test/api_test.http
index e5e9e506d..6efb8626a 100755
--- a/test/api_test.http
+++ b/test/api_test.http
@@ -44,7 +44,7 @@ Authorization: Bearer {{token}}
 
 {
     "device" : "boiler",
-    "entity" : "wwtapactivated",
+    "entity" : "dhw/tapactivated",
     "value" : "on"
 }