diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
index 9fa642937..97047f74f 100644
--- a/CHANGELOG_LATEST.md
+++ b/CHANGELOG_LATEST.md
@@ -21,10 +21,11 @@
 - Added scripts for OTA (scripts/upload.py and upload_cli.py) [#1738](https://github.com/emsesp/EMS-ESP32/issues/1738)
 - timeout for remote thermostat emulation [#1680](https://github.com/emsesp/EMS-ESP32/discussions/1680), [#1774](https://github.com/emsesp/EMS-ESP32/issues/1774)
 - CR120 thermostat as own model() [#1779](https://github.com/emsesp/EMS-ESP32/discussions/1779)
-- Modules - external linkable module library [#1778](https://github.com/emsesp/EMS-ESP32/issues/1778)
-- Scheduler onChange and Conditions [#1806](https://github.com/emsesp/EMS-ESP32/issues/1806)
+- modules - external linkable module library [#1778](https://github.com/emsesp/EMS-ESP32/issues/1778)
+- scheduler onChange and Conditions [#1806](https://github.com/emsesp/EMS-ESP32/issues/1806)
 - make remote control timeout editable [#1774](https://github.com/emsesp/EMS-ESP32/issues/1774)
 - added extra pump characteristics (mode and pressure for EMS+) by @SLTKA [#1802](https://github.com/emsesp/EMS-ESP32/pull/1802)
+- allow device name to be customized [#1174](https://github.com/emsesp/EMS-ESP32/issues/1174)
 
 ## Fixed
 
diff --git a/interface/package.json b/interface/package.json
index 62c205e82..e2fc7d328 100644
--- a/interface/package.json
+++ b/interface/package.json
@@ -47,7 +47,7 @@
     "react-router-dom": "^6.24.0",
     "react-toastify": "^10.0.5",
     "typesafe-i18n": "^5.26.2",
-    "typescript": "^5.5.2"
+    "typescript": "^5.5.3"
   },
   "devDependencies": {
     "@babel/core": "^7.24.7",
@@ -59,12 +59,12 @@
     "concurrently": "^8.2.2",
     "eslint": "^9.6.0",
     "eslint-config-prettier": "^9.1.0",
-    "preact": "^10.22.0",
+    "preact": "^10.22.1",
     "prettier": "^3.3.2",
     "rollup-plugin-visualizer": "^5.12.0",
     "terser": "^5.31.1",
-    "typescript-eslint": "^7.14.1",
-    "vite": "^5.3.2",
+    "typescript-eslint": "^7.15.0",
+    "vite": "^5.3.3",
     "vite-plugin-imagemin": "^0.6.1",
     "vite-tsconfig-paths": "^4.3.2"
   },
diff --git a/interface/src/i18n/de/index.ts b/interface/src/i18n/de/index.ts
index b04338932..9627a017d 100644
--- a/interface/src/i18n/de/index.ts
+++ b/interface/src/i18n/de/index.ts
@@ -331,7 +331,8 @@ const de: Translation = {
   MODULES: 'Module', // TODO translate
   MODULES_UPDATED: 'Modules updated', // TODO translate
   MODULES_DESCRIPTION: 'Click on the Module to activate or de-activate EMS-ESP library modules', // TODO translate
-  MODULES_NONE: 'No external modules detected' // TODO translate
+  MODULES_NONE: 'No external modules detected', // TODO translate
+  RENAME: 'Rename' // TODO translate
 };
 
 export default de;
diff --git a/interface/src/i18n/en/index.ts b/interface/src/i18n/en/index.ts
index d996e5c06..3846441bf 100644
--- a/interface/src/i18n/en/index.ts
+++ b/interface/src/i18n/en/index.ts
@@ -331,7 +331,8 @@ const en: Translation = {
   MODULES: 'Modules',
   MODULES_UPDATED: 'Modules updated',
   MODULES_DESCRIPTION: 'Click on the Module to activate or de-activate EMS-ESP library modules',
-  MODULES_NONE: 'No external modules detected'
+  MODULES_NONE: 'No external modules detected',
+  RENAME: 'Rename'
 };
 
 export default en;
diff --git a/interface/src/i18n/fr/index.ts b/interface/src/i18n/fr/index.ts
index 0e1d46f37..fb4e0de39 100644
--- a/interface/src/i18n/fr/index.ts
+++ b/interface/src/i18n/fr/index.ts
@@ -331,7 +331,8 @@ const fr: Translation = {
   MODULES: 'Module', // TODO translate
   MODULES_UPDATED: 'Modules updated', // TODO translate
   MODULES_DESCRIPTION: 'Click on the Module to activate or de-activate EMS-ESP library modules', // TODO translate
-  MODULES_NONE: 'No external modules detected' // TODO translate
+  MODULES_NONE: 'No external modules detected', // TODO translate
+  RENAME: 'Rename' // TODO translate
 };
 
 export default fr;
diff --git a/interface/src/i18n/it/index.ts b/interface/src/i18n/it/index.ts
index eae77f1a2..124e76a04 100644
--- a/interface/src/i18n/it/index.ts
+++ b/interface/src/i18n/it/index.ts
@@ -331,7 +331,8 @@ const it: Translation = {
   MODULES: 'Module', // TODO translate
   MODULES_UPDATED: 'Modules updated', // TODO translate
   MODULES_DESCRIPTION: 'Click on the Module to activate or de-activate EMS-ESP library modules', // TODO translate
-  MODULES_NONE: 'No external modules detected' // TODO translate
+  MODULES_NONE: 'No external modules detected', // TODO translate
+  RENAME: 'Rename' // TODO translate  
 };
 
 export default it;
diff --git a/interface/src/i18n/nl/index.ts b/interface/src/i18n/nl/index.ts
index 6b2c1a00d..02d2e5ea5 100644
--- a/interface/src/i18n/nl/index.ts
+++ b/interface/src/i18n/nl/index.ts
@@ -331,7 +331,8 @@ const nl: Translation = {
   MODULES: 'Module',
   MODULES_UPDATED: 'Modules geüpdatet', 
   MODULES_DESCRIPTION: 'Klik op de module om EMS-ESP library modules te activeren of te deactiveren',
-  MODULES_NONE: 'Geen externe modules gedetecteerd'
+  MODULES_NONE: 'Geen externe modules gedetecteerd',
+  RENAME: 'Hernoemen'
 };
 
 export default nl;
diff --git a/interface/src/i18n/no/index.ts b/interface/src/i18n/no/index.ts
index 025cb91a8..2d053ebe7 100644
--- a/interface/src/i18n/no/index.ts
+++ b/interface/src/i18n/no/index.ts
@@ -331,7 +331,8 @@ const no: Translation = {
   MODULES: 'Module', // TODO translate
   MODULES_UPDATED: 'Modules updated', // TODO translate
   MODULES_DESCRIPTION: 'Click on the Module to activate or de-activate EMS-ESP library modules', // TODO translate
-  MODULES_NONE: 'No external modules detected' // TODO translate
+  MODULES_NONE: 'No external modules detected', // TODO translate
+  RENAME: 'Rename' // TODO translate 
 };
 
 export default no;
diff --git a/interface/src/i18n/pl/index.ts b/interface/src/i18n/pl/index.ts
index 6896051fe..b367ebce9 100644
--- a/interface/src/i18n/pl/index.ts
+++ b/interface/src/i18n/pl/index.ts
@@ -331,7 +331,8 @@ const pl: BaseTranslation = {
   MODULES: 'Module', // TODO translate
   MODULES_UPDATED: 'Modules updated', // TODO translate
   MODULES_DESCRIPTION: 'Click on the Module to activate or de-activate EMS-ESP library modules', // TODO translate
-  MODULES_NONE: 'No external modules detected' // TODO translate
+  MODULES_NONE: 'No external modules detected', // TODO translate
+  RENAME: 'Rename' // TODO translate 
 };
 
 export default pl;
diff --git a/interface/src/i18n/sk/index.ts b/interface/src/i18n/sk/index.ts
index 43ae4ac38..cd83f5893 100644
--- a/interface/src/i18n/sk/index.ts
+++ b/interface/src/i18n/sk/index.ts
@@ -331,7 +331,7 @@ const sk: Translation = {
   MODULES: 'Module', // TODO translate
   MODULES_UPDATED: 'Modules updated', // TODO translate
   MODULES_DESCRIPTION: 'Click on the Module to activate or de-activate EMS-ESP library modules', // TODO translate
-  MODULES_NONE: 'No external modules detected' // TODO translate
+  MODULES_NONE: 'No external modules detected', // TODO translate
+  RENAME: 'Rename' // TODO translate 
 };
-
 export default sk;
diff --git a/interface/src/i18n/sv/index.ts b/interface/src/i18n/sv/index.ts
index ca9952708..6977ee6c7 100644
--- a/interface/src/i18n/sv/index.ts
+++ b/interface/src/i18n/sv/index.ts
@@ -331,7 +331,8 @@ const sv: Translation = {
   MODULES: 'Module', // TODO translate
   MODULES_UPDATED: 'Modules updated', // TODO translate
   MODULES_DESCRIPTION: 'Click on the Module to activate or de-activate EMS-ESP library modules', // TODO translate
-  MODULES_NONE: 'No external modules detected' // TODO translate
+  MODULES_NONE: 'No external modules detected', // TODO translate
+  RENAME: 'Rename' // TODO translate 
 };
 
 export default sv;
diff --git a/interface/src/i18n/tr/index.ts b/interface/src/i18n/tr/index.ts
index 44ab06c5d..9b95cf8d8 100644
--- a/interface/src/i18n/tr/index.ts
+++ b/interface/src/i18n/tr/index.ts
@@ -331,7 +331,8 @@ const tr: Translation = {
   MODULES: 'Module', // TODO translate
   MODULES_UPDATED: 'Modules updated', // TODO translate
   MODULES_DESCRIPTION: 'Click on the Module to activate or de-activate EMS-ESP library modules', // TODO translate
-  MODULES_NONE: 'No external modules detected' // TODO translate
+  MODULES_NONE: 'No external modules detected', // TODO translate
+  RENAME: 'Rename' // TODO translate 
 };
 
 export default tr;
diff --git a/interface/src/project/Customization.tsx b/interface/src/project/Customization.tsx
index 9293cad7c..be34f04bf 100644
--- a/interface/src/project/Customization.tsx
+++ b/interface/src/project/Customization.tsx
@@ -4,7 +4,9 @@ import { useBlocker, useLocation } from 'react-router-dom';
 import { toast } from 'react-toastify';
 
 import CancelIcon from '@mui/icons-material/Cancel';
+import EditIcon from '@mui/icons-material/Edit';
 import PowerSettingsNewIcon from '@mui/icons-material/PowerSettingsNew';
+import SaveIcon from '@mui/icons-material/Save';
 import SearchIcon from '@mui/icons-material/Search';
 import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore';
 import WarningIcon from '@mui/icons-material/Warning';
@@ -71,21 +73,31 @@ const Customization: FC = () => {
   const [search, setSearch] = useState('');
   const [selectedDeviceEntity, setSelectedDeviceEntity] = useState<DeviceEntity>();
   const [dialogOpen, setDialogOpen] = useState<boolean>(false);
+  const [rename, setRename] = useState<boolean>(false);
 
   useLayoutTitle(LL.CUSTOMIZATIONS());
 
   // fetch devices first
-  const { data: devices } = useRequest(EMSESP.readDevices);
+  const { data: devices, send: fetchDevices } = useRequest(EMSESP.readDevices);
 
   const [selectedDevice, setSelectedDevice] = useState<number>(
     Number(useLocation().state) || -1
   );
+  const [selectedDeviceTypeNameURL, setSelectedDeviceTypeNameURL] =
+    useState<string>(''); // needed for API URL
   const [selectedDeviceName, setSelectedDeviceName] = useState<string>('');
 
   const { send: resetCustomizations } = useRequest(EMSESP.resetCustomizations(), {
     immediate: false
   });
 
+  const { send: writeDeviceName } = useRequest(
+    (data: { id: number; name: string }) => EMSESP.writeDeviceName(data),
+    {
+      immediate: false
+    }
+  );
+
   const { send: writeCustomizationEntities } = useRequest(
     (data: { id: number; entity_ids: string[] }) =>
       EMSESP.writeCustomizationEntities(data),
@@ -223,9 +235,10 @@ const Customization: FC = () => {
       const id = devices.devices.findIndex((d) => d.i === selectedDevice);
       if (id === -1) {
         setSelectedDevice(-1);
-        setSelectedDeviceName('');
+        setSelectedDeviceTypeNameURL('');
       } else {
-        setSelectedDeviceName(devices.devices[id].tn || '');
+        setSelectedDeviceTypeNameURL(devices.devices[id].url || '');
+        setSelectedDeviceName(devices.devices[id].s);
         setNumChanges(0);
         setRestartNeeded(false);
       }
@@ -388,31 +401,87 @@ const Customization: FC = () => {
     }
   };
 
+  const renameDevice = async () => {
+    await writeDeviceName({ id: selectedDevice, name: selectedDeviceName })
+      .then(() => {
+        toast.success(LL.UPDATED_OF(LL.NAME(1)));
+      })
+      .catch(() => {
+        toast.error(LL.UPDATE_OF(LL.NAME(1)) + ' ' + LL.FAILED(1));
+      })
+      .finally(async () => {
+        setRename(false);
+        await fetchDevices();
+      });
+  };
+
   const renderDeviceList = () => (
     <>
       <Box mb={1} color="warning.main">
         <Typography variant="body2">{LL.CUSTOMIZATIONS_HELP_1()}.</Typography>
       </Box>
-      <TextField
-        name="device"
-        label={LL.EMS_DEVICE()}
-        variant="outlined"
-        fullWidth
-        value={selectedDevice}
-        disabled={numChanges !== 0}
-        onChange={(e) => setSelectedDevice(parseInt(e.target.value))}
-        margin="normal"
-        select
-      >
-        <MenuItem disabled key={-1} value={-1}>
-          {LL.SELECT_DEVICE()}...
-        </MenuItem>
-        {devices.devices.map((device: DeviceShort) => (
-          <MenuItem key={device.i} value={device.i}>
-            {device.s}
-          </MenuItem>
-        ))}
-      </TextField>
+      <Box display="flex" flexWrap="wrap" alignItems="center" gap={2}>
+        {rename ? (
+          <TextField
+            name="device"
+            label={LL.EMS_DEVICE()}
+            fullWidth
+            variant="outlined"
+            value={selectedDeviceName}
+            onChange={(e) => setSelectedDeviceName(e.target.value)}
+            margin="normal"
+          />
+        ) : (
+          <TextField
+            name="device"
+            label={LL.EMS_DEVICE()}
+            variant="outlined"
+            value={selectedDevice}
+            disabled={numChanges !== 0}
+            onChange={(e) => setSelectedDevice(parseInt(e.target.value))}
+            margin="normal"
+            style={{ minWidth: '50%' }}
+            select
+          >
+            <MenuItem disabled key={-1} value={-1}>
+              {LL.SELECT_DEVICE()}...
+            </MenuItem>
+            {devices.devices.map((device: DeviceShort) => (
+              <MenuItem key={device.i} value={device.i}>
+                {device.s}&nbsp;({device.tn})
+              </MenuItem>
+            ))}
+          </TextField>
+        )}
+        {selectedDevice !== -1 &&
+          (rename ? (
+            <ButtonRow>
+              <Button
+                startIcon={<SaveIcon />}
+                variant="contained"
+                onClick={() => renameDevice()}
+              >
+                {LL.UPDATE()}
+              </Button>
+              <Button
+                startIcon={<CancelIcon />}
+                variant="outlined"
+                color="secondary"
+                onClick={() => setRename(false)}
+              >
+                {LL.CANCEL()}
+              </Button>
+            </ButtonRow>
+          ) : (
+            <Button
+              startIcon={<EditIcon />}
+              variant="outlined"
+              onClick={() => setRename(true)}
+            >
+              {LL.RENAME()}
+            </Button>
+          ))}
+      </Box>
     </>
   );
 
@@ -545,7 +614,7 @@ const Customization: FC = () => {
                       {formatName(de, false)}&nbsp;(
                       <Link
                         target="_blank"
-                        href={APIURL + selectedDeviceName + '/' + de.id}
+                        href={APIURL + selectedDeviceTypeNameURL + '/' + de.id}
                       >
                         {de.id}
                       </Link>
@@ -600,7 +669,7 @@ const Customization: FC = () => {
   const renderContent = () => (
     <>
       {devices && renderDeviceList()}
-      {selectedDevice !== -1 && renderDeviceData()}
+      {selectedDevice !== -1 && !rename && renderDeviceData()}
       {restartNeeded && (
         <MessageBox my={2} level="warning" message={LL.RESTART_TEXT(0)}>
           <Button
diff --git a/interface/src/project/Devices.tsx b/interface/src/project/Devices.tsx
index 3af36dc59..a744e35b8 100644
--- a/interface/src/project/Devices.tsx
+++ b/interface/src/project/Devices.tsx
@@ -646,8 +646,8 @@ const Devices: FC = () => {
       >
         <Box sx={{ border: '1px solid #177ac9' }}>
           <Typography noWrap variant="subtitle1" color="warning.main" sx={{ ml: 1 }}>
-            {coreData.devices[deviceIndex].tn}&nbsp;&#124;&nbsp;
-            {coreData.devices[deviceIndex].n}
+            {coreData.devices[deviceIndex].n}&nbsp;(
+            {coreData.devices[deviceIndex].tn})
           </Typography>
 
           <Grid container justifyContent="space-between">
diff --git a/interface/src/project/Modules.tsx b/interface/src/project/Modules.tsx
index 1ed80cdde..a715e2c3c 100644
--- a/interface/src/project/Modules.tsx
+++ b/interface/src/project/Modules.tsx
@@ -169,7 +169,6 @@ const Modules: FC = () => {
 
     const colorStatus = (status: number) => {
       if (status === 1) {
-        // TODO translate
         return <div style={{ color: 'red' }}>Pending Activation</div>;
       }
       return <div style={{ color: '#00FF7F' }}>Activated</div>;
@@ -191,10 +190,8 @@ const Modules: FC = () => {
                 <HeaderRow>
                   <HeaderCell />
                   <HeaderCell>{LL.NAME(0)}</HeaderCell>
-                  {/* TODO translate */}
                   <HeaderCell>Author</HeaderCell>
                   <HeaderCell>{LL.VERSION()}</HeaderCell>
-                  {/* TODO translate */}
                   <HeaderCell>Message</HeaderCell>
                   <HeaderCell>{LL.STATUS_OF('')}</HeaderCell>
                 </HeaderRow>
diff --git a/interface/src/project/ModulesDialog.tsx b/interface/src/project/ModulesDialog.tsx
index 1d5bb6fef..570c9ab14 100644
--- a/interface/src/project/ModulesDialog.tsx
+++ b/interface/src/project/ModulesDialog.tsx
@@ -66,7 +66,6 @@ const ModulesDialog = ({
                 name="enabled"
               />
             }
-            // TODO translate
             label="Enabled"
           />
         </Grid>
diff --git a/interface/src/project/api.ts b/interface/src/project/api.ts
index 70438d854..7f123c7b6 100644
--- a/interface/src/project/api.ts
+++ b/interface/src/project/api.ts
@@ -24,7 +24,7 @@ export const readCoreData = () => alovaInstance.Get<CoreData>(`/rest/coreData`);
 export const readDeviceData = (id: number) =>
   alovaInstance.Get<DeviceData>('/rest/deviceData', {
     // alovaInstance.Get<DeviceData>(`/rest/deviceData/${id}`, {
-    params: { id }, // TODO replace later with id
+    params: { id },
     responseType: 'arraybuffer' // uses msgpack
   });
 export const writeDeviceValue = (data: { id: number; c: string; v: unknown }) =>
@@ -66,7 +66,7 @@ export const getSchedule = () => alovaInstance.Get('/rest/getSchedule');
 export const readDeviceEntities = (id: number) =>
   // alovaInstance.Get<DeviceEntity[]>(`/rest/deviceEntities/${id}`, {
   alovaInstance.Get<DeviceEntity[]>(`/rest/deviceEntities`, {
-    params: { id }, // TODO replace later with id
+    params: { id },
     responseType: 'arraybuffer',
     transformData(data) {
       return (data as DeviceEntity[]).map((de: DeviceEntity) => ({
@@ -85,6 +85,8 @@ export const writeCustomizationEntities = (data: {
   id: number;
   entity_ids: string[];
 }) => alovaInstance.Post('/rest/customizationEntities', data);
+export const writeDeviceName = (data: { id: number; name: string }) =>
+  alovaInstance.Post('/rest/writeDeviceName', data);
 
 // SettingsScheduler
 export const readSchedule = () =>
diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts
index 06319facb..82e5f55e8 100644
--- a/interface/src/project/types.ts
+++ b/interface/src/project/types.ts
@@ -113,7 +113,8 @@ export interface DeviceShort {
   p?: number; // productid
   s: string; // shortname
   t?: number; // device type id
-  tn?: string; // device type internal name
+  tn?: string; // device type internal name (translated)
+  url?: string; // lowercase type name used in API URL
 }
 
 export interface Devices {
diff --git a/interface/yarn.lock b/interface/yarn.lock
index f07968f2b..d6f3305a2 100644
--- a/interface/yarn.lock
+++ b/interface/yarn.lock
@@ -1861,15 +1861,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:7.14.1":
-  version: 7.14.1
-  resolution: "@typescript-eslint/eslint-plugin@npm:7.14.1"
+"@typescript-eslint/eslint-plugin@npm:7.15.0":
+  version: 7.15.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:7.15.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:7.14.1"
-    "@typescript-eslint/type-utils": "npm:7.14.1"
-    "@typescript-eslint/utils": "npm:7.14.1"
-    "@typescript-eslint/visitor-keys": "npm:7.14.1"
+    "@typescript-eslint/scope-manager": "npm:7.15.0"
+    "@typescript-eslint/type-utils": "npm:7.15.0"
+    "@typescript-eslint/utils": "npm:7.15.0"
+    "@typescript-eslint/visitor-keys": "npm:7.15.0"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.3.1"
     natural-compare: "npm:^1.4.0"
@@ -1880,44 +1880,44 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/7c2b9b98a38d78326b0ff7348fe001203eda10817ca7834a7a01f492ae7c2508469bbafaa933208d6459f8ff6685277685983cf6f6843e556a6ab2aa5c05080c
+  checksum: 10c0/7ed4ef8355cb60f02ed603673ef749928a001931c534960d1f3f9f9b8092f4abd7ec1e80a33b4c38efb6e8e66c902583bd56a4c4d6ccbd870677a40680a7d1f5
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:7.14.1":
-  version: 7.14.1
-  resolution: "@typescript-eslint/parser@npm:7.14.1"
+"@typescript-eslint/parser@npm:7.15.0":
+  version: 7.15.0
+  resolution: "@typescript-eslint/parser@npm:7.15.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:7.14.1"
-    "@typescript-eslint/types": "npm:7.14.1"
-    "@typescript-eslint/typescript-estree": "npm:7.14.1"
-    "@typescript-eslint/visitor-keys": "npm:7.14.1"
+    "@typescript-eslint/scope-manager": "npm:7.15.0"
+    "@typescript-eslint/types": "npm:7.15.0"
+    "@typescript-eslint/typescript-estree": "npm:7.15.0"
+    "@typescript-eslint/visitor-keys": "npm:7.15.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/db3169d4852685cfb27db741c557f58a3e52104bfacc7621beb7c94ec36ac2a08d4e410ac86745db52f482fbfc87e99fa0a26c1d7a10d37a215cce85e1661f0e
+  checksum: 10c0/8dcad9b84e2cbf89afea97ee7f690f91b487eed21d01997126f98cb7dd56d3b6c98c7ecbdbeda35904af521c4ed746c47887e908f8a1e2148d47c05b491d7b9d
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:7.14.1":
-  version: 7.14.1
-  resolution: "@typescript-eslint/scope-manager@npm:7.14.1"
+"@typescript-eslint/scope-manager@npm:7.15.0":
+  version: 7.15.0
+  resolution: "@typescript-eslint/scope-manager@npm:7.15.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.14.1"
-    "@typescript-eslint/visitor-keys": "npm:7.14.1"
-  checksum: 10c0/f8c05a0d6f8de4cc19b90a4da308817c66e53f36f7ec48f6cc23e93c7399bc418643d8135933aaf5fc013199cbef0e1ea4223f5147db5ca401b239eaf087011e
+    "@typescript-eslint/types": "npm:7.15.0"
+    "@typescript-eslint/visitor-keys": "npm:7.15.0"
+  checksum: 10c0/781ec31a07ab7f0bdfb07dd271ef6553aa98f8492f1b3a67c65d178c94d590f4fd2e0916450f2446f1da2fbe007f3454c360ccb25f4d69612f782eb499f400ab
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:7.14.1":
-  version: 7.14.1
-  resolution: "@typescript-eslint/type-utils@npm:7.14.1"
+"@typescript-eslint/type-utils@npm:7.15.0":
+  version: 7.15.0
+  resolution: "@typescript-eslint/type-utils@npm:7.15.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:7.14.1"
-    "@typescript-eslint/utils": "npm:7.14.1"
+    "@typescript-eslint/typescript-estree": "npm:7.15.0"
+    "@typescript-eslint/utils": "npm:7.15.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.3.0"
   peerDependencies:
@@ -1925,23 +1925,23 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/bd1c4a8db6273e24156fb10da2cbeb52b4eb03f819da193d4b6bd5a95db3b5524c6fe00d088308d8855b9ae60a3b82afa3a06e89982a09a8573561da960758fd
+  checksum: 10c0/06189eb05d741f05977bbc029c6ac46edd566e0136f2f2c22429fd5f2be1224e2d9135b7021bc686871bfaec9c05a5c9990a321762d3abd06e457486956326ba
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:7.14.1":
-  version: 7.14.1
-  resolution: "@typescript-eslint/types@npm:7.14.1"
-  checksum: 10c0/5b7bda83c47a9b386482e63447c6b0ed7bd4e82eb43f11a180c6e2f3d2e7a2828f57bcbed82196ad761c49e363cccf4c81a89f1fc976e9f5f0a79dcc928fa2d2
+"@typescript-eslint/types@npm:7.15.0":
+  version: 7.15.0
+  resolution: "@typescript-eslint/types@npm:7.15.0"
+  checksum: 10c0/935387b21d9fdff65de86f6350cdda1f0614e269324f3a4f0a2ca1b0d72ef4b1d40c7de2f3a20a6f8c83edca6507bfbac3168c860625859e59fc455c80392bed
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:7.14.1":
-  version: 7.14.1
-  resolution: "@typescript-eslint/typescript-estree@npm:7.14.1"
+"@typescript-eslint/typescript-estree@npm:7.15.0":
+  version: 7.15.0
+  resolution: "@typescript-eslint/typescript-estree@npm:7.15.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.14.1"
-    "@typescript-eslint/visitor-keys": "npm:7.14.1"
+    "@typescript-eslint/types": "npm:7.15.0"
+    "@typescript-eslint/visitor-keys": "npm:7.15.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -1951,31 +1951,31 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/a8da9bcc4de3334a225424946abd99374de05c42098455419224bc0f46bb1b66115f8bd6ae268461294b90943ed4a407bcd255c0fa60eb76ba4cdc5fc7c20855
+  checksum: 10c0/0d6e61cb36c4612147ceea796c2bdbb65fca59170d9d768cff314146c5564253a058cbcb9e251722cd76c92a90c257e1210a69f8d4377c8002f211c574d18d24
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:7.14.1":
-  version: 7.14.1
-  resolution: "@typescript-eslint/utils@npm:7.14.1"
+"@typescript-eslint/utils@npm:7.15.0":
+  version: 7.15.0
+  resolution: "@typescript-eslint/utils@npm:7.15.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@typescript-eslint/scope-manager": "npm:7.14.1"
-    "@typescript-eslint/types": "npm:7.14.1"
-    "@typescript-eslint/typescript-estree": "npm:7.14.1"
+    "@typescript-eslint/scope-manager": "npm:7.15.0"
+    "@typescript-eslint/types": "npm:7.15.0"
+    "@typescript-eslint/typescript-estree": "npm:7.15.0"
   peerDependencies:
     eslint: ^8.56.0
-  checksum: 10c0/c7f635a3c2c6c085e1d51a52088e55cad9d7e1257b1f60378e5eeb6eb0871db027d42747e9ef60a2f557cf9dd68b2ce014d488d795db8f771506290b164b0e5a
+  checksum: 10c0/26aced17976cee0aa39a79201f68b384bbce1dc96e1c70d0e5f790e1e5655b1b1ddb2afd9eaf3fce9a48c0fb69daecd37a99fdbcdbf1cb58c65ae89ecac88a2c
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:7.14.1":
-  version: 7.14.1
-  resolution: "@typescript-eslint/visitor-keys@npm:7.14.1"
+"@typescript-eslint/visitor-keys@npm:7.15.0":
+  version: 7.15.0
+  resolution: "@typescript-eslint/visitor-keys@npm:7.15.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.14.1"
+    "@typescript-eslint/types": "npm:7.15.0"
     eslint-visitor-keys: "npm:^3.4.3"
-  checksum: 10c0/39ac489990fcfdcee442f27658431a0eb44ccf694f701a45df2a108c47cea9582e0955bff0d449047549149385f72895a5d7e6c1622ece1fe32594b7cecb85f3
+  checksum: 10c0/7509f01c8cd2126a38213bc735a77aa7e976340af0d664be5b2ccd01b8211724b2ea129e33bfd32fe5feac848b7b68ca55bb533f6ccfeec1d2f26a91240489b9
   languageName: node
   linkType: hard
 
@@ -2010,7 +2010,7 @@ __metadata:
     jwt-decode: "npm:^4.0.0"
     lodash-es: "npm:^4.17.21"
     mime-types: "npm:^2.1.35"
-    preact: "npm:^10.22.0"
+    preact: "npm:^10.22.1"
     prettier: "npm:^3.3.2"
     react: "npm:latest"
     react-dom: "npm:latest"
@@ -2021,9 +2021,9 @@ __metadata:
     rollup-plugin-visualizer: "npm:^5.12.0"
     terser: "npm:^5.31.1"
     typesafe-i18n: "npm:^5.26.2"
-    typescript: "npm:^5.5.2"
-    typescript-eslint: "npm:^7.14.1"
-    vite: "npm:^5.3.2"
+    typescript: "npm:^5.5.3"
+    typescript-eslint: "npm:^7.15.0"
+    vite: "npm:^5.3.3"
     vite-plugin-imagemin: "npm:^0.6.1"
     vite-tsconfig-paths: "npm:^4.3.2"
   languageName: unknown
@@ -5879,6 +5879,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"picocolors@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "picocolors@npm:1.0.1"
+  checksum: 10c0/c63cdad2bf812ef0d66c8db29583802355d4ca67b9285d846f390cc15c2f6ccb94e8cb7eb6a6e97fc5990a6d3ad4ae42d86c84d3146e667c739a4234ed50d400
+  languageName: node
+  linkType: hard
+
 "picomatch@npm:^2.2.2, picomatch@npm:^2.3.1":
   version: 2.3.1
   resolution: "picomatch@npm:2.3.1"
@@ -5936,21 +5943,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.4.38":
-  version: 8.4.38
-  resolution: "postcss@npm:8.4.38"
+"postcss@npm:^8.4.39":
+  version: 8.4.39
+  resolution: "postcss@npm:8.4.39"
   dependencies:
     nanoid: "npm:^3.3.7"
-    picocolors: "npm:^1.0.0"
+    picocolors: "npm:^1.0.1"
     source-map-js: "npm:^1.2.0"
-  checksum: 10c0/955407b8f70cf0c14acf35dab3615899a2a60a26718a63c848cf3c29f2467b0533991b985a2b994430d890bd7ec2b1963e36352b0774a19143b5f591540f7c06
+  checksum: 10c0/16f5ac3c4e32ee76d1582b3c0dcf1a1fdb91334a45ad755eeb881ccc50318fb8d64047de4f1601ac96e30061df203f0f2e2edbdc0bfc49b9c57bc9fb9bedaea3
   languageName: node
   linkType: hard
 
-"preact@npm:^10.22.0":
-  version: 10.22.0
-  resolution: "preact@npm:10.22.0"
-  checksum: 10c0/dc5466c5968c56997e917580c00983cec2f6486a89ea9ba29f1bb88dcfd2f9ff67c8d561a69a1b3acdab17f2bb36b311fef0c348b62e89c332d00c674f7871f0
+"preact@npm:^10.22.1":
+  version: 10.22.1
+  resolution: "preact@npm:10.22.1"
+  checksum: 10c0/9163b97d6fc0ce6b945ed77695d00c4fa07e317d0723e7b9d10c748153d30596abab8b26861ae45591e47bff25515da91406ce7f1c9e66cd9cac7e7f6c927930
   languageName: node
   linkType: hard
 
@@ -7160,39 +7167,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript-eslint@npm:^7.14.1":
-  version: 7.14.1
-  resolution: "typescript-eslint@npm:7.14.1"
+"typescript-eslint@npm:^7.15.0":
+  version: 7.15.0
+  resolution: "typescript-eslint@npm:7.15.0"
   dependencies:
-    "@typescript-eslint/eslint-plugin": "npm:7.14.1"
-    "@typescript-eslint/parser": "npm:7.14.1"
-    "@typescript-eslint/utils": "npm:7.14.1"
+    "@typescript-eslint/eslint-plugin": "npm:7.15.0"
+    "@typescript-eslint/parser": "npm:7.15.0"
+    "@typescript-eslint/utils": "npm:7.15.0"
   peerDependencies:
     eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/93439aa50a814a2d7e117c7d9b54982292986e3c090950961d13dcb07b804ae31e43300e094fd5d27d1208c1647ebbb95fda4bc89163b1c0b2e36e8a777a6800
+  checksum: 10c0/98293831f7557831b80143b0e717d2a61dca289d637ef464da524880fab2ea62fb61dd952707c571719914c1565942504db2b4ccfe7178a48971e69f270c1abc
   languageName: node
   linkType: hard
 
-"typescript@npm:^5.5.2":
-  version: 5.5.2
-  resolution: "typescript@npm:5.5.2"
+"typescript@npm:^5.5.3":
+  version: 5.5.3
+  resolution: "typescript@npm:5.5.3"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/8ca39b27b5f9bd7f32db795045933ab5247897660627251e8254180b792a395bf061ea7231947d5d7ffa5cb4cc771970fd4ef543275f9b559f08c9325cccfce3
+  checksum: 10c0/f52c71ccbc7080b034b9d3b72051d563601a4815bf3e39ded188e6ce60813f75dbedf11ad15dd4d32a12996a9ed8c7155b46c93a9b9c9bad1049766fe614bbdd
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A^5.5.2#optional!builtin<compat/typescript>":
-  version: 5.5.2
-  resolution: "typescript@patch:typescript@npm%3A5.5.2#optional!builtin<compat/typescript>::version=5.5.2&hash=b45daf"
+"typescript@patch:typescript@npm%3A^5.5.3#optional!builtin<compat/typescript>":
+  version: 5.5.3
+  resolution: "typescript@patch:typescript@npm%3A5.5.3#optional!builtin<compat/typescript>::version=5.5.3&hash=b45daf"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/6721ac8933a70c252d7b640b345792e103d881811ff660355617c1836526dbb71c2044e2e77a8823fb3570b469f33276875a4cab6d3c4de4ae7d7ee1c3074ae4
+  checksum: 10c0/5a437c416251334deeaf29897157032311f3f126547cfdc4b133768b606cb0e62bcee733bb97cf74c42fe7268801aea1392d8e40988cdef112e9546eba4c03c5
   languageName: node
   linkType: hard
 
@@ -7361,13 +7368,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^5.3.2":
-  version: 5.3.2
-  resolution: "vite@npm:5.3.2"
+"vite@npm:^5.3.3":
+  version: 5.3.3
+  resolution: "vite@npm:5.3.3"
   dependencies:
     esbuild: "npm:^0.21.3"
     fsevents: "npm:~2.3.3"
-    postcss: "npm:^8.4.38"
+    postcss: "npm:^8.4.39"
     rollup: "npm:^4.13.0"
   peerDependencies:
     "@types/node": ^18.0.0 || >=20.0.0
@@ -7397,7 +7404,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 10c0/3ed576d18c6c008ae92be68f9c79bf7556dae10978a3e8b4c4b42199424755e5c99836e6d4f81fb8b533b957d7f4e351abc60b8a93f4c4b5eb9890b5b6450926
+  checksum: 10c0/a796872e1d11875d994615cd00da185c80eeb7753034d35c096050bf3c269c02004070cf623c5fe2a4a90ea2f12488e6f9d13933ec810f117f1b931e1b5e3385
   languageName: node
   linkType: hard
 
diff --git a/lib_standalone/ArduinoJson.h b/lib_standalone/ArduinoJson.h
index 91dd096f4..c8d330e42 100644
--- a/lib_standalone/ArduinoJson.h
+++ b/lib_standalone/ArduinoJson.h
@@ -4076,7 +4076,7 @@ template <typename T, typename Enable = void>
 struct Comparer;
 template <typename T>
 struct Comparer<T, enable_if_t<IsString<T>::value>> : ComparerBase {
-    T rhs; // TODO: store adapted string?
+    T rhs;
     explicit Comparer(T value)
         : rhs(value) {
     }
@@ -5143,7 +5143,7 @@ class StringBuilder {
             append(*s++);
     }
     void append(const char * s, size_t n) {
-        while (n-- > 0) // TODO: memcpy
+        while (n-- > 0)
             append(*s++);
     }
     void append(char c) {
diff --git a/mock-api/rest_server.ts b/mock-api/rest_server.ts
index 1cbb623b6..8ab02df4a 100644
--- a/mock-api/rest_server.ts
+++ b/mock-api/rest_server.ts
@@ -428,6 +428,7 @@ const EMSESP_DEVICEENTITIES_ENDPOINT2 = REST_ENDPOINT_ROOT + 'deviceEntities/:id
 
 const EMSESP_BOARDPROFILE_ENDPOINT = REST_ENDPOINT_ROOT + 'boardProfile';
 const EMSESP_WRITE_DEVICEVALUE_ENDPOINT = REST_ENDPOINT_ROOT + 'writeDeviceValue';
+const EMSESP_WRITE_DEVICENAME_ENDPOINT = REST_ENDPOINT_ROOT + 'writeDeviceName';
 const EMSESP_WRITE_TEMPSENSOR_ENDPOINT = REST_ENDPOINT_ROOT + 'writeTemperatureSensor';
 const EMSESP_WRITE_ANALOGSENSOR_ENDPOINT = REST_ENDPOINT_ROOT + 'writeAnalogSensor';
 const EMSESP_CUSTOMIZATION_ENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'customizationEntities';
@@ -480,20 +481,20 @@ const emsesp_info = {
   Devices: [
     {
       type: 'Boiler',
-      name: 'Nefit GBx72/Trendline/Cerapur/Greenstar Si/27i (DeviceID:0x08 ProductID:123, Version:06.01)',
+      name: 'Nefit Trendline HRC30 (DeviceID:0x08 ProductID:123, Version:06.01)',
       handlers:
         '0x10 0x11 0xC2 0x14 0x15 0x1C 0x18 0x19 0x1A 0x35 0x16 0x33 0x34 0x26 0x2A 0xD1 0xE3 0xE4 0xE5 0xE6 0xE9 0xEA'
     },
     {
       type: 'Thermostat',
-      name: 'RC20/Moduline 300 (DeviceID:0x17, ProductID:77, Version:03.03)',
+      name: 'RC20 (DeviceID:0x17, ProductID:77, Version:03.03)',
       handlers: '0xA3 0x06 0xA2 0x12 0x91 0xA8'
     }
   ]
 };
 
 const emsesp_allvalues = {
-  'Boiler Nefit GBx72/Trendline/Cerapur/Greenstar Si (DeviceID:0x08, ProductID:123, Version:06.01)': {
+  'Boiler Nefit Trendline HRC30 (DeviceID:0x08, ProductID:123, Version:06.01)': {
     'force heating off': 'off',
     'heating active': 'off',
     'tapwater active': 'off',
@@ -569,7 +570,7 @@ const emsesp_allvalues = {
     'energy heating': 2532.94,
     'dhw energy': 555.75
   },
-  'Thermostat RC20/Moduline 300 (DeviceID:0x17, ProductID:77, Version:03.03)': {
+  'Thermostat RC20 (DeviceID:0x17, ProductID:77, Version:03.03)': {
     'date/time': '10.12.2023 13:49',
     'hc1 how hot lounge should be': 19,
     'hc1 current room temp': 19.5,
@@ -638,23 +639,68 @@ let settings = {
 const emsesp_devices = {
   devices: [
     {
-      i: 7,
-      s: 'Boiler (GBx72/Trendline/Cerapur/Greenstar Si/27i)',
-      t: 4,
-      tn: 'boiler'
+      i: 2,
+      s: 'RC20',
+      t: 5,
+      tn: 'Thermostat',
+      url: 'thermostat'
     },
     {
-      i: 2,
-      s: 'Thermostat (RC20/Moduline 300)',
+      i: 3,
+      s: 'GB125',
       t: 5,
-      tn: 'thermostat'
+      tn: 'Boiler',
+      url: 'boiler'
     },
     {
       i: 4,
-      s: 'Thermostat (RC100/Moduline 1000/1010)',
+      s: 'Moduline 1000',
       t: 5,
-      tn: 'thermostat'
-    }
+      tn: 'Thermostat',
+      url: 'thermostat'
+    },
+    {
+      i: 5,
+      s: 'MM10',
+      t: 7,
+      tn: 'Mixer Module',
+      url: 'mixer'
+    },
+    {
+      i: 6,
+      s: 'SM10',
+      t: 8,
+      tn: 'Solar Module',
+      url: 'solar'
+    },
+    {
+      i: 7,
+      s: 'Trendline HRC30',
+      t: 4,
+      tn: 'Boiler',
+      url: 'boiler'
+    },
+    {
+      i: 8,
+      s: 'Bosch Compress 7000i AW Heat Pump',
+      t: 5,
+      tn: 'Boiler',
+      url: 'boiler'
+    },
+    {
+      i: 9,
+      s: 'RC100H',
+      t: 6,
+      tn: 'Thermostat',
+      url: 'thermostat'
+    },
+    {
+      i: 10,
+      s: 'RC310',
+      t: 6,
+      tn: 'Thermostat',
+      url: 'thermostat'
+    },
   ]
 };
 
@@ -668,8 +714,7 @@ const emsesp_coredata = {
       t: 5,
       tn: 'Boiler',
       b: 'Nefit',
-      n: 'GBx72/Trendline/Cerapur/Greenstar Si/27i',
-      // n: 'Enviline/Compress 6000AW/Hybrid 3000-7000iAW/SupraEco/Geo 5xx/WLW196i/WSW196i',
+      n: 'Nefit Trendline HRC30',
       d: 8,
       p: 123,
       v: '06.01',
@@ -680,7 +725,7 @@ const emsesp_coredata = {
       t: 5,
       tn: 'Boiler',
       b: 'Buderus',
-      n: 'GB125/GB135/MC10',
+      n: 'GB125',
       d: 8,
       p: 123,
       v: '06.01',
@@ -702,7 +747,7 @@ const emsesp_coredata = {
       t: 6,
       tn: 'Thermostat',
       b: '',
-      n: 'RC20/Moduline 300',
+      n: 'RC20',
       d: 23,
       p: 77,
       v: '03.03',
@@ -712,8 +757,8 @@ const emsesp_coredata = {
       id: 4,
       t: 6,
       tn: 'Thermostat',
-      b: 'Buderus',
-      n: 'RC100/Moduline 1000/1010',
+      b: 'Nefit',
+      n: 'Moduline 1000',
       d: 16,
       p: 165,
       v: '04.01',
@@ -741,6 +786,39 @@ const emsesp_coredata = {
       v: '01.02',
       e: 22
     },
+    {
+      "id": 8,
+      "tn": "Boiler",
+      "t": 5,
+      "b": "",
+      "n": "Bosch Compress 7000i AW Heat Pump",
+      "d": 8,
+      "p": 172,
+      "v": "01.20",
+      "e": 152
+    },
+    {
+      "id": 9,
+      "tn": "Thermostat",
+      "t": 6,
+      "b": "",
+      "n": "RC100H",
+      "d": 56,
+      "p": 200,
+      "v": "40.07",
+      "e": 4
+    },
+    {
+      "id": 10,
+      "tn": "Thermostat",
+      "t": 6,
+      "b": "",
+      "n": "RC310",
+      "d": 16,
+      "p": 158,
+      "v": "73.03",
+      "e": 63
+    },
     {
       id: 99,
       t: 4,
@@ -786,12 +864,12 @@ const activity = {
 };
 
 // Dashboard data
-// 1 - RC35 thermo
-// 2 - RC20 thermo
+// 1 - RC35 thermostat
+// 2 - RC20 thermostat
 // 3 - Buderus GB125 boiler
-// 4 - RC100 thermostat
-// 5 - Mixer MM10
-// 6 - Solar SM10
+// 4 - Moduline 1000 thermostat
+// 5 - MM10 mixer
+// 6 - SM10 solar
 // 7 - Nefit Trendline boiler
 // 99 - Custom
 
@@ -2049,6 +2127,1687 @@ const emsesp_devicedata_7 = {
   ]
 };
 
+const emsesp_devicedata_8 = {
+  "data": [
+    {
+      "v": "",
+      "u": 0,
+      "id": "00reset",
+      "c": "reset",
+      "l": [
+        "-",
+        "maintenance",
+        "error",
+        "history",
+        "message"
+      ]
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00force heating off",
+      "c": "heatingoff",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00heating active"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00tapwater active"
+    },
+    {
+      "v": 19,
+      "u": 1,
+      "id": "00selected flow temperature",
+      "c": "selflowtemp",
+      "m": 0,
+      "x": 90,
+      "s": "1"
+    },
+    {
+      "v": 0,
+      "u": 3,
+      "id": "00heating pump modulation"
+    },
+    {
+      "v": 30.299999237060547,
+      "u": 1,
+      "id": "00outside temperature"
+    },
+    {
+      "v": 18.700000762939453,
+      "u": 1,
+      "id": "00current flow temperature"
+    },
+    {
+      "v": 21.399999618530273,
+      "u": 1,
+      "id": "00return temperature"
+    },
+    {
+      "v": 18.700000762939453,
+      "u": 1,
+      "id": "00low loss header"
+    },
+    {
+      "v": "on",
+      "u": 0,
+      "id": "00heating activated",
+      "c": "heatingactivated",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": 85,
+      "u": 1,
+      "id": "00heating temperature",
+      "c": "heatingtemp",
+      "m": 0,
+      "x": 90,
+      "s": "1"
+    },
+    {
+      "v": "on",
+      "u": 0,
+      "id": "00heating pump"
+    },
+    {
+      "v": 44,
+      "u": 3,
+      "id": "00burner selected max power",
+      "c": "selburnpow",
+      "m": 0,
+      "x": 254,
+      "s": "1"
+    },
+    {
+      "v": 45,
+      "u": 3,
+      "id": "00burner current power"
+    },
+    {
+      "v": 0,
+      "u": 0,
+      "id": "00burner starts"
+    },
+    {
+      "v": 0,
+      "u": 8,
+      "id": "00total burner operating time"
+    },
+    {
+      "v": 0,
+      "u": 8,
+      "id": "00burner stage 2 operating time"
+    },
+    {
+      "v": 0,
+      "u": 8,
+      "id": "00total heat operating time"
+    },
+    {
+      "v": 0,
+      "u": 0,
+      "id": "00burner starts heating"
+    },
+    {
+      "v": 764598,
+      "u": 8,
+      "id": "00total UBA operating time"
+    },
+    {
+      "v": "A01(5453) 01.06.2023 09:23 - 01.06.2023 09:31",
+      "u": 0,
+      "id": "00last error code"
+    },
+    {
+      "v": " 0H",
+      "u": 0,
+      "id": "00service code"
+    },
+    {
+      "v": 203,
+      "u": 0,
+      "id": "00service code number"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00emergency operation",
+      "c": "emergencyops",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": 0,
+      "u": 1,
+      "id": "00emergency temperature",
+      "c": "emergencytemp",
+      "m": 0,
+      "x": 70,
+      "s": "1"
+    },
+    {
+      "v": 763575,
+      "u": 8,
+      "id": "00heatpump total uptime"
+    },
+    {
+      "v": 309983,
+      "u": 8,
+      "id": "00total operating time heat"
+    },
+    {
+      "v": 203673,
+      "u": 8,
+      "id": "00operating time compressor heating"
+    },
+    {
+      "v": 29682,
+      "u": 8,
+      "id": "00operating time compressor cooling"
+    },
+    {
+      "v": 76627,
+      "u": 8,
+      "id": "00dhw operating time compressor"
+    },
+    {
+      "v": 0,
+      "u": 8,
+      "id": "00operating time compressor pool"
+    },
+    {
+      "v": 2054,
+      "u": 0,
+      "id": "00total compressor control starts"
+    },
+    {
+      "v": 1287,
+      "u": 0,
+      "id": "00heating control starts"
+    },
+    {
+      "v": 160,
+      "u": 0,
+      "id": "00cooling control starts"
+    },
+    {
+      "v": 607,
+      "u": 0,
+      "id": "00dhw control starts2"
+    },
+    {
+      "v": 0,
+      "u": 0,
+      "id": "00pool control starts"
+    },
+    {
+      "v": 5368,
+      "u": 5,
+      "id": "00total energy consumption"
+    },
+    {
+      "v": 5336,
+      "u": 5,
+      "id": "00total energy consumption compressor"
+    },
+    {
+      "v": 2977,
+      "u": 5,
+      "id": "00energy consumption compressor heating"
+    },
+    {
+      "v": 2047,
+      "u": 5,
+      "id": "00dhw energy consumption compressor"
+    },
+    {
+      "v": 295,
+      "u": 5,
+      "id": "00energy consumption compressor cooling"
+    },
+    {
+      "v": 0,
+      "u": 5,
+      "id": "00energy consumption compressor pool"
+    },
+    {
+      "v": 32,
+      "u": 5,
+      "id": "00total aux elec. heater energy consumption"
+    },
+    {
+      "v": 0,
+      "u": 5,
+      "id": "00aux elec. heater energy consumption heating"
+    },
+    {
+      "v": 32,
+      "u": 5,
+      "id": "00dhw aux elec. heater energy consumption"
+    },
+    {
+      "v": 0,
+      "u": 5,
+      "id": "00aux elec. heater energy consumption pool"
+    },
+    {
+      "v": 19052,
+      "u": 5,
+      "id": "00total energy supplied"
+    },
+    {
+      "v": 11053,
+      "u": 5,
+      "id": "00total energy supplied heating"
+    },
+    {
+      "v": 5978,
+      "u": 5,
+      "id": "00dhw total energy warm supplied"
+    },
+    {
+      "v": 2019,
+      "u": 5,
+      "id": "00total energy supplied cooling"
+    },
+    {
+      "v": 0,
+      "u": 5,
+      "id": "00total energy supplied pool"
+    },
+    {
+      "v": 4.5,
+      "u": 11,
+      "id": "00compressor power output"
+    },
+    {
+      "v": 100,
+      "u": 3,
+      "id": "00compressor max power",
+      "c": "hpmaxpower",
+      "m": 0,
+      "x": 100,
+      "s": "1"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00hp compressor"
+    },
+    {
+      "v": "cooling",
+      "u": 0,
+      "id": "00compressor activity"
+    },
+    {
+      "v": 0,
+      "u": 3,
+      "id": "00brine pump speed"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00switch valve"
+    },
+    {
+      "v": 45,
+      "u": 3,
+      "id": "00compressor speed"
+    },
+    {
+      "v": 33,
+      "u": 3,
+      "id": "00circulation pump speed"
+    },
+    {
+      "v": 0,
+      "u": 1,
+      "id": "00brine in/evaporator"
+    },
+    {
+      "v": 0,
+      "u": 1,
+      "id": "00brine out/condenser"
+    },
+    {
+      "v": 21.399999618530273,
+      "u": 1,
+      "id": "00heat carrier return (TC0)"
+    },
+    {
+      "v": 17.5,
+      "u": 1,
+      "id": "00heat carrier forward (TC1)"
+    },
+    {
+      "v": 18,
+      "u": 1,
+      "id": "00condenser temperature (TC3)"
+    },
+    {
+      "v": 51.599998474121094,
+      "u": 1,
+      "id": "00compressor temperature (TR1)"
+    },
+    {
+      "v": 14.600000381469727,
+      "u": 1,
+      "id": "00refrigerant temperature liquid side (condenser output) (TR3)"
+    },
+    {
+      "v": 37,
+      "u": 1,
+      "id": "00evaporator inlet temperature (TR4)"
+    },
+    {
+      "v": 20.200000762939453,
+      "u": 1,
+      "id": "00compressor inlet temperature (TR5)"
+    },
+    {
+      "v": 54.599998474121094,
+      "u": 1,
+      "id": "00compressor outlet temperature (TR6)"
+    },
+    {
+      "v": 29.600000381469727,
+      "u": 1,
+      "id": "00air inlet temperature (TL2)"
+    },
+    {
+      "v": 13.899999618530273,
+      "u": 1,
+      "id": "00low pressure side temperature (PL1)"
+    },
+    {
+      "v": 37.79999923706055,
+      "u": 1,
+      "id": "00high pressure side temperature (PH1)"
+    },
+    {
+      "v": 25.600000381469727,
+      "u": 1,
+      "id": "00drain pan temp (TA4)"
+    },
+    {
+      "v": 58.5,
+      "u": 1,
+      "id": "00reservoir temp (TW1)"
+    },
+    {
+      "v": 28,
+      "u": 1,
+      "id": "00pool set temperature",
+      "c": "poolsettemp",
+      "m": 0,
+      "x": 127,
+      "s": "0.5"
+    },
+    {
+      "v": "cooling & defrost",
+      "u": 0,
+      "id": "004-way valve (VR4)"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00input 1 state"
+    },
+    {
+      "v": "000000000000000",
+      "u": 0,
+      "id": "00input 1 options",
+      "c": "hpin1opt",
+      "h": "<inv>[<evu1><evu2><evu3><comp><aux><cool><heat><dhw><pv>]"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00input 2 state"
+    },
+    {
+      "v": "000000000000000",
+      "u": 0,
+      "id": "00input 2 options",
+      "c": "hpin2opt",
+      "h": "<inv>[<evu1><evu2><evu3><comp><aux><cool><heat><dhw><pv>]"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00input 3 state"
+    },
+    {
+      "v": "000000000000000",
+      "u": 0,
+      "id": "00input 3 options",
+      "c": "hpin3opt",
+      "h": "<inv>[<evu1><evu2><evu3><comp><aux><cool><heat><dhw><pv>]"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00input 4 state"
+    },
+    {
+      "v": "000000000000",
+      "u": 0,
+      "id": "00input 4 options",
+      "c": "hpin4opt",
+      "h": "<inv>[<comp><aux><cool><heat><dhw><pv>]"
+    },
+    {
+      "v": "6 kW",
+      "u": 0,
+      "id": "00heat limit compressor",
+      "c": "maxheatcomp",
+      "l": [
+        "0 kW",
+        "2 kW",
+        "3 kW",
+        "4 kW",
+        "6 kW",
+        "9 kW"
+      ]
+    },
+    {
+      "v": "9 kW",
+      "u": 0,
+      "id": "00heat limit heating",
+      "c": "maxheatheat",
+      "l": [
+        "0 kW",
+        "2 kW",
+        "3 kW",
+        "4 kW",
+        "6 kW",
+        "9 kW"
+      ]
+    },
+    {
+      "v": "9 kW",
+      "u": 0,
+      "id": "00dhw heat limit",
+      "c": "dhw/maxheat",
+      "l": [
+        "0 kW",
+        "2 kW",
+        "3 kW",
+        "4 kW",
+        "6 kW",
+        "9 kW"
+      ]
+    },
+    {
+      "v": "on",
+      "u": 0,
+      "id": "00manual defrost",
+      "c": "mandefrost",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00cooling only with PV",
+      "c": "pvcooling",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00aux heater only",
+      "c": "auxheateronly",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00disable aux heater",
+      "c": "auxheateroff",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": 0,
+      "u": 3,
+      "id": "00aux heater status"
+    },
+    {
+      "v": 500,
+      "u": 21,
+      "id": "00aux heater on delay",
+      "c": "auxheaterdelay",
+      "m": 10,
+      "x": 1000,
+      "s": "10"
+    },
+    {
+      "v": 0,
+      "u": 22,
+      "id": "00aux heater max limit",
+      "c": "auxmaxlimit",
+      "m": 0,
+      "x": 10,
+      "s": "0.1"
+    },
+    {
+      "v": 0.10000000149011612,
+      "u": 22,
+      "id": "00aux heater limit start",
+      "c": "auxlimitstart",
+      "m": 0,
+      "x": 10,
+      "s": "0.1"
+    },
+    {
+      "v": "eco",
+      "u": 0,
+      "id": "00aux heater mode",
+      "c": "auxheatrmode",
+      "l": [
+        "eco",
+        "comfort"
+      ]
+    },
+    {
+      "v": 0,
+      "u": 21,
+      "id": "00on/off hyst heat",
+      "c": "hphystheat",
+      "m": 0,
+      "x": 1500,
+      "s": "5"
+    },
+    {
+      "v": 0,
+      "u": 21,
+      "id": "00on/off hyst cool",
+      "c": "hphystcool",
+      "m": 0,
+      "x": 1500,
+      "s": "5"
+    },
+    {
+      "v": 1125,
+      "u": 21,
+      "id": "00on/off hyst pool",
+      "c": "hphystpool",
+      "m": 50,
+      "x": 1500,
+      "s": "5"
+    },
+    {
+      "v": "auto",
+      "u": 0,
+      "id": "00silent mode",
+      "c": "silentmode",
+      "l": [
+        "off",
+        "auto",
+        "on"
+      ]
+    },
+    {
+      "v": 1320,
+      "u": 8,
+      "id": "00silent mode from",
+      "c": "silentfrom",
+      "m": 0,
+      "x": 3810,
+      "s": "15"
+    },
+    {
+      "v": 360,
+      "u": 8,
+      "id": "00silent mode to",
+      "c": "silentto",
+      "m": 0,
+      "x": 3810,
+      "s": "15"
+    },
+    {
+      "v": -10,
+      "u": 1,
+      "id": "00min outside temp for silent mode",
+      "c": "mintempsilent",
+      "m": -126,
+      "x": 126,
+      "s": "1"
+    },
+    {
+      "v": -5,
+      "u": 1,
+      "id": "00outside temp parallel mode",
+      "c": "tempparmode",
+      "m": -126,
+      "x": 126,
+      "s": "1"
+    },
+    {
+      "v": 0,
+      "u": 3,
+      "id": "00aux heater mixing valve"
+    },
+    {
+      "v": 7,
+      "u": 22,
+      "id": "00temp diff TC3/TC0 heat",
+      "c": "tempdiffheat",
+      "m": 2,
+      "x": 10,
+      "s": "0.1"
+    },
+    {
+      "v": 3,
+      "u": 22,
+      "id": "00temp diff TC3/TC0 cool",
+      "c": "tempdiffcool",
+      "m": 2,
+      "x": 10,
+      "s": "0.1"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00valve/pump cooling",
+      "c": "vpcooling",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00heating cable",
+      "c": "heatcable",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00VC0 valve",
+      "c": "vc0valve",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00primary heatpump",
+      "c": "primepump",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": 0,
+      "u": 3,
+      "id": "00primary heatpump modulation",
+      "c": "primepumpmod",
+      "m": 0,
+      "x": 100,
+      "s": "1"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "003-way valve",
+      "c": "hp3way",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00el. heater step 1",
+      "c": "elheatstep1",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00el. heater step 2",
+      "c": "elheatstep2",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00el. heater step 3",
+      "c": "elheatstep3",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00condensate reservoir heating (EA0)"
+    },
+    {
+      "v": "auto",
+      "u": 0,
+      "id": "00primary heatpump mode",
+      "c": "hppumpmode",
+      "l": [
+        "auto",
+        "continuous"
+      ]
+    },
+    {
+      "v": "",
+      "u": 0,
+      "id": "00shutdown",
+      "c": "shutdown",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": "on",
+      "u": 0,
+      "id": "00dhw alternating operation",
+      "c": "dhw/alternatingop",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": 35,
+      "u": 8,
+      "id": "00dhw prioritise heating during dhw",
+      "c": "dhw/altopprioheat",
+      "m": 20,
+      "x": 120,
+      "s": "1"
+    },
+    {
+      "v": 45,
+      "u": 8,
+      "id": "00dhw prioritise dhw during heating",
+      "c": "dhw/altopprio",
+      "m": 30,
+      "x": 120,
+      "s": "1"
+    },
+    {
+      "v": 57,
+      "u": 1,
+      "id": "00dhw comfort switch off",
+      "c": "dhw/comfoff",
+      "m": 15,
+      "x": 65,
+      "s": "1"
+    },
+    {
+      "v": 54,
+      "u": 1,
+      "id": "00dhw eco switch off",
+      "c": "dhw/ecooff",
+      "m": 15,
+      "x": 65,
+      "s": "1"
+    },
+    {
+      "v": 50,
+      "u": 1,
+      "id": "00dhw eco+ switch off",
+      "c": "dhw/ecoplusoff",
+      "m": 48,
+      "x": 63,
+      "s": "1"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00dhw circulation pump available during dhw",
+      "c": "dhw/hpcircpump",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": 54,
+      "u": 1,
+      "id": "00dhw set temperature"
+    },
+    {
+      "v": 45,
+      "u": 1,
+      "id": "00dhw selected temperature",
+      "c": "dhw/seltemp",
+      "m": 0,
+      "x": 254,
+      "s": "1"
+    },
+    {
+      "v": 42,
+      "u": 1,
+      "id": "00dhw selected lower temperature",
+      "c": "dhw/seltemplow",
+      "m": 0,
+      "x": 254,
+      "s": "1"
+    },
+    {
+      "v": 65,
+      "u": 1,
+      "id": "00dhw single charge temperature",
+      "c": "dhw/seltempsingle",
+      "m": 0,
+      "x": 254,
+      "s": "1"
+    },
+    {
+      "v": "high comfort",
+      "u": 0,
+      "id": "00dhw comfort mode",
+      "c": "dhw/comfort1",
+      "l": [
+        "high comfort",
+        "eco"
+      ]
+    },
+    {
+      "v": 25,
+      "u": 2,
+      "id": "00dhw flow temperature offset",
+      "c": "dhw/flowtempoffset",
+      "m": 0,
+      "x": 100,
+      "s": "1"
+    },
+    {
+      "v": 56,
+      "u": 1,
+      "id": "00dhw maximum temperature",
+      "c": "dhw/maxtemp",
+      "m": 0,
+      "x": 80,
+      "s": "1"
+    },
+    {
+      "v": "on",
+      "u": 0,
+      "id": "00dhw circulation pump available",
+      "c": "dhw/circpump",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": -2,
+      "u": 2,
+      "id": "00dhw hysteresis on temperature",
+      "c": "dhw/hyston",
+      "m": -126,
+      "x": 126,
+      "s": "1"
+    },
+    {
+      "v": 0,
+      "u": 2,
+      "id": "00dhw hysteresis off temperature",
+      "c": "dhw/hystoff",
+      "m": -126,
+      "x": 126,
+      "s": "1"
+    },
+    {
+      "v": 65,
+      "u": 1,
+      "id": "00dhw disinfection temperature",
+      "c": "dhw/disinfectiontemp",
+      "m": 60,
+      "x": 80,
+      "s": "1"
+    },
+    {
+      "v": "3x3min",
+      "u": 0,
+      "id": "00dhw circulation pump mode",
+      "c": "dhw/circmode",
+      "l": [
+        "off",
+        "1x3min",
+        "2x3min",
+        "3x3min",
+        "4x3min",
+        "5x3min",
+        "6x3min",
+        "continuous"
+      ]
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00dhw circulation active",
+      "c": "dhw/circ",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": 58.70000076293945,
+      "u": 1,
+      "id": "00dhw current intern temperature"
+    },
+    {
+      "v": 58.5,
+      "u": 1,
+      "id": "00dhw current extern temperature"
+    },
+    {
+      "v": 0,
+      "u": 4,
+      "id": "00dhw current tap water flow"
+    },
+    {
+      "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": "off",
+      "u": 0,
+      "id": "00dhw temperature ok"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00dhw 3-way valve active"
+    },
+    {
+      "v": 0,
+      "u": 0,
+      "id": "00dhw starts"
+    },
+    {
+      "v": 0,
+      "u": 8,
+      "id": "00dhw active time"
+    }
+  ]
+
+};
+
+const emsesp_devicedata_9 = {
+  "data": [
+    {
+      "v": 24,
+      "u": 1,
+      "id": "00hc1 room temperature from remote"
+    },
+    {
+      "v": 14,
+      "u": 1,
+      "id": "00hc1 dew point temperature"
+    },
+    {
+      "v": 46,
+      "u": 3,
+      "id": "00hc1 relative air humidity"
+    },
+    {
+      "v": 0,
+      "u": 2,
+      "id": "00hc1 internal temperature offset",
+      "c": "hc1/intoffset",
+      "m": -12,
+      "x": 12,
+      "s": "0.1"
+    }
+  ]
+};
+
+const emsesp_devicedata_10 = {
+  "data": [
+    {
+      "v": "26.06.2024 14:49",
+      "u": 0,
+      "id": "00date/time",
+      "c": "datetime",
+      "h": "NTP | dd.mm.yyyy-hh:mm:ss-day(0-6)-dst(0/1)"
+    },
+    {
+      "v": 0,
+      "u": 2,
+      "id": "00internal temperature offset",
+      "c": "intoffset",
+      "m": -12,
+      "x": 12,
+      "s": "0.1"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00floor drying"
+    },
+    {
+      "v": 30.299999237060547,
+      "u": 1,
+      "id": "00damped outdoor temperature"
+    },
+    {
+      "v": 0,
+      "u": 1,
+      "id": "00floor drying temperature"
+    },
+    {
+      "v": "heavy",
+      "u": 0,
+      "id": "00building type",
+      "c": "building",
+      "l": [
+        "light",
+        "medium",
+        "heavy"
+      ]
+    },
+    {
+      "v": -12,
+      "u": 1,
+      "id": "00minimal external temperature",
+      "c": "minexttemp",
+      "m": -126,
+      "x": 126,
+      "s": "1"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00damping outdoor temperature",
+      "c": "damping",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": 3.299999952316284,
+      "u": 0,
+      "id": "00energy cost ratio",
+      "c": "energycostratio",
+      "m": 0,
+      "x": 20,
+      "s": "0.1"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00enable raise dhw",
+      "c": "pvenabledhw",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": 3,
+      "u": 22,
+      "id": "00raise heating with PV",
+      "c": "pvraiseheat",
+      "m": 0,
+      "x": 5,
+      "s": "1"
+    },
+    {
+      "v": 0,
+      "u": 22,
+      "id": "00lower cooling with PV",
+      "c": "pvlowercool",
+      "m": -5,
+      "x": 0,
+      "s": "1"
+    },
+    {
+      "v": 21,
+      "u": 1,
+      "id": "00hc1 selected room temperature",
+      "c": "hc1/seltemp",
+      "m": 0,
+      "x": 30,
+      "s": "0.5"
+    },
+    {
+      "v": 24,
+      "u": 1,
+      "id": "00hc1 current room temperature"
+    },
+    {
+      "v": "roomTemp",
+      "u": 0,
+      "id": "00hc1 mqtt discovery current room temperature"
+    },
+    {
+      "v": "manual",
+      "u": 0,
+      "id": "00hc1 mode",
+      "c": "hc1/mode",
+      "l": [
+        "manual",
+        "auto"
+      ]
+    },
+    {
+      "v": "comfort",
+      "u": 0,
+      "id": "00hc1 mode type"
+    },
+    {
+      "v": 15,
+      "u": 1,
+      "id": "00hc1 eco temperature",
+      "c": "hc1/ecotemp",
+      "m": 0,
+      "x": 127,
+      "s": "0.5"
+    },
+    {
+      "v": 22.5,
+      "u": 1,
+      "id": "00hc1 manual temperature",
+      "c": "hc1/manualtemp",
+      "m": 0,
+      "x": 127,
+      "s": "0.5"
+    },
+    {
+      "v": 19,
+      "u": 1,
+      "id": "00hc1 comfort temperature",
+      "c": "hc1/comforttemp",
+      "m": 0,
+      "x": 127,
+      "s": "0.5"
+    },
+    {
+      "v": 11,
+      "u": 1,
+      "id": "00hc1 summer temperature",
+      "c": "hc1/summertemp",
+      "m": 10,
+      "x": 30,
+      "s": "1"
+    },
+    {
+      "v": 35,
+      "u": 1,
+      "id": "00hc1 design temperature",
+      "c": "hc1/designtemp",
+      "m": 0,
+      "x": 254,
+      "s": "1"
+    },
+    {
+      "v": 0,
+      "u": 2,
+      "id": "00hc1 offset temperature",
+      "c": "hc1/offsettemp",
+      "m": -126,
+      "x": 126,
+      "s": "1"
+    },
+    {
+      "v": 22,
+      "u": 1,
+      "id": "00hc1 min flow temperature",
+      "c": "hc1/minflowtemp",
+      "m": 0,
+      "x": 254,
+      "s": "1"
+    },
+    {
+      "v": 60,
+      "u": 1,
+      "id": "00hc1 max flow temperature",
+      "c": "hc1/maxflowtemp",
+      "m": 0,
+      "x": 254,
+      "s": "1"
+    },
+    {
+      "v": 0,
+      "u": 2,
+      "id": "00hc1 room influence",
+      "c": "hc1/roominfluence",
+      "m": 0,
+      "x": 254,
+      "s": "1"
+    },
+    {
+      "v": 4,
+      "u": 0,
+      "id": "00hc1 room influence factor",
+      "c": "hc1/roominflfactor",
+      "m": 0,
+      "x": 25,
+      "s": "0.1"
+    },
+    {
+      "v": 0,
+      "u": 2,
+      "id": "00hc1 current room influence"
+    },
+    {
+      "v": "outdoor",
+      "u": 0,
+      "id": "00hc1 nofrost mode",
+      "c": "hc1/nofrostmode",
+      "l": [
+        "room",
+        "outdoor",
+        "room outdoor"
+      ]
+    },
+    {
+      "v": 2,
+      "u": 1,
+      "id": "00hc1 nofrost temperature",
+      "c": "hc1/nofrosttemp",
+      "m": -126,
+      "x": 126,
+      "s": "1"
+    },
+    {
+      "v": 19,
+      "u": 1,
+      "id": "00hc1 target flow temperature"
+    },
+    {
+      "v": "floor",
+      "u": 0,
+      "id": "00hc1 heating type",
+      "c": "hc1/heatingtype",
+      "l": [
+        "off",
+        "radiator",
+        "convector",
+        "floor"
+      ]
+    },
+    {
+      "v": "auto",
+      "u": 0,
+      "id": "00hc1 heatpump operating mode",
+      "c": "hc1/hpoperatingmode",
+      "l": [
+        "off",
+        "auto",
+        "heating",
+        "cooling"
+      ]
+    },
+    {
+      "v": "cooling",
+      "u": 0,
+      "id": "00hc1 heatpump operating state"
+    },
+    {
+      "v": "weather compensated",
+      "u": 0,
+      "id": "00hc1 control mode",
+      "c": "hc1/controlmode",
+      "l": [
+        "weather compensated",
+        "outside basepoint",
+        "n/a",
+        "room",
+        "power",
+        "constant"
+      ]
+    },
+    {
+      "v": "prog 1",
+      "u": 0,
+      "id": "00hc1 program",
+      "c": "hc1/program",
+      "l": [
+        "prog 1",
+        "prog 2"
+      ]
+    },
+    {
+      "v": -1,
+      "u": 1,
+      "id": "00hc1 temporary set temperature automode",
+      "c": "hc1/tempautotemp",
+      "m": -1,
+      "x": 30,
+      "s": "0.5"
+    },
+    {
+      "v": 21,
+      "u": 1,
+      "id": "00hc1 temporary set temperature from remote"
+    },
+    {
+      "v": 0,
+      "u": 3,
+      "id": "00hc1 fast heatup",
+      "c": "hc1/fastheatup",
+      "m": 0,
+      "x": 100,
+      "s": "1"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00hc1 switch-on optimization",
+      "c": "hc1/switchonoptimization",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": "reduce",
+      "u": 0,
+      "id": "00hc1 reduce mode",
+      "c": "hc1/reducemode",
+      "l": [
+        "outdoor",
+        "room",
+        "reduce"
+      ]
+    },
+    {
+      "v": -31,
+      "u": 1,
+      "id": "00hc1 no reduce below temperature",
+      "c": "hc1/noreducetemp",
+      "m": -126,
+      "x": 126,
+      "s": "1"
+    },
+    {
+      "v": 5,
+      "u": 1,
+      "id": "00hc1 off/reduce switch temperature",
+      "c": "hc1/reducetemp",
+      "m": -126,
+      "x": 126,
+      "s": "1"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00hc1 dhw priority",
+      "c": "hc1/dhwprio",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": "on",
+      "u": 0,
+      "id": "00hc1 cooling"
+    },
+    {
+      "v": "heating&cooling",
+      "u": 0,
+      "id": "00hc1 HP Mode",
+      "c": "hc1/hpmode",
+      "l": [
+        "heating",
+        "cooling",
+        "heating&cooling"
+      ]
+    },
+    {
+      "v": 5,
+      "u": 22,
+      "id": "00hc1 dew point offset",
+      "c": "hc1/dewoffset",
+      "m": 2,
+      "x": 10,
+      "s": "1"
+    },
+    {
+      "v": 1,
+      "u": 22,
+      "id": "00hc1 room temp difference",
+      "c": "hc1/roomtempdiff",
+      "m": 0,
+      "x": 254,
+      "s": "1"
+    },
+    {
+      "v": 11,
+      "u": 1,
+      "id": "00hc1 HP min. flow temp.",
+      "c": "hc1/hpminflowtemp",
+      "m": 0,
+      "x": 254,
+      "s": "1"
+    },
+    {
+      "v": "RC100H",
+      "u": 0,
+      "id": "00hc1 control device",
+      "c": "hc1/control",
+      "l": [
+        "RC310",
+        "RC200",
+        "RC100",
+        "RC100H",
+        "TC100"
+      ]
+    },
+    {
+      "v": 1,
+      "u": 7,
+      "id": "00hc1 heat-on delay",
+      "c": "hc1/heatondelay",
+      "m": 1,
+      "x": 48,
+      "s": "1"
+    },
+    {
+      "v": 1,
+      "u": 7,
+      "id": "00hc1 heat-off delay",
+      "c": "hc1/heatoffdelay",
+      "m": 1,
+      "x": 48,
+      "s": "1"
+    },
+    {
+      "v": 1,
+      "u": 22,
+      "id": "00hc1 instant start",
+      "c": "hc1/instantstart",
+      "m": 1,
+      "x": 10,
+      "s": "1"
+    },
+    {
+      "v": "normal",
+      "u": 0,
+      "id": "00dhw mode",
+      "c": "dhw/mode",
+      "l": [
+        "off",
+        "normal",
+        "comfort",
+        "auto",
+        "own prog"
+      ]
+    },
+    {
+      "v": "on",
+      "u": 0,
+      "id": "00dhw circulation pump mode",
+      "c": "dhw/circmode",
+      "l": [
+        "off",
+        "on",
+        "auto",
+        "own prog"
+      ]
+    },
+    {
+      "v": 15,
+      "u": 8,
+      "id": "00dhw charge duration",
+      "c": "dhw/chargeduration",
+      "m": 0,
+      "x": 3810,
+      "s": "15"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00dhw charge",
+      "c": "dhw/charge",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": 0,
+      "u": 1,
+      "id": "00dhw extra"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00dhw disinfecting",
+      "c": "dhw/disinfecting",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": "tu",
+      "u": 0,
+      "id": "00dhw disinfection day",
+      "c": "dhw/disinfectday",
+      "l": [
+        "mo",
+        "tu",
+        "we",
+        "th",
+        "fr",
+        "sa",
+        "su",
+        "all"
+      ]
+    },
+    {
+      "v": 120,
+      "u": 8,
+      "id": "00dhw disinfection time",
+      "c": "dhw/disinfecttime",
+      "m": 0,
+      "x": 1431,
+      "s": "15"
+    },
+    {
+      "v": "off",
+      "u": 0,
+      "id": "00dhw daily heating",
+      "c": "dhw/dailyheating",
+      "l": [
+        "off",
+        "on"
+      ]
+    },
+    {
+      "v": 120,
+      "u": 8,
+      "id": "00dhw daily heating time",
+      "c": "dhw/dailyheattime",
+      "m": 0,
+      "x": 1431,
+      "s": "15"
+    }
+  ]
+}
+
 const emsesp_devicedata_99 = {
   data: [
     {
@@ -2203,9 +3962,6 @@ let emsesp_modules = {
 
 // CUSTOMIZATION
 const emsesp_deviceentities_1 = [{ v: 'dummy value', n: 'dummy name', id: 'dummy', m: 0, w: false }];
-const emsesp_deviceentities_3 = [{ v: 'dummy value', n: 'dummy name', id: 'dummy', m: 0, w: false }];
-const emsesp_deviceentities_5 = [{ v: 'dummy value', n: 'dummy name', id: 'dummy', m: 0, w: false }];
-const emsesp_deviceentities_6 = [{ v: 'dummy value', n: 'dummy name', id: 'dummy', m: 0, w: false }];
 
 const emsesp_deviceentities_2 = [
   {
@@ -2248,6 +4004,35 @@ const emsesp_deviceentities_2 = [
   }
 ];
 
+const emsesp_deviceentities_3 = [{ v: 'dummy value', n: 'dummy name', id: 'dummy', m: 0, w: false }];
+
+const emsesp_deviceentities_4 = [
+  {
+    v: 16,
+    n: 'hc2 selected room temperature',
+    id: 'hc2/seltemp',
+    m: 8,
+    w: true
+  },
+  {
+    v: 18.5,
+    n: 'hc2 current room temperature',
+    id: 'hc2/curtemp',
+    m: 2,
+    w: false
+  },
+  {
+    v: 'off',
+    n: 'hc2 mode',
+    id: 'hc2/mode',
+    m: 2,
+    w: true
+  }
+];
+const emsesp_deviceentities_5 = [{ v: 'dummy value', n: 'dummy name', id: 'dummy', m: 0, w: false }];
+
+const emsesp_deviceentities_6 = [{ v: 'dummy value', n: 'dummy name', id: 'dummy', m: 0, w: false }];
+
 const emsesp_deviceentities_7 = [
   { u: 0, n: '!reset', id: 'reset', m: 8, w: false },
   { v: false, n: 'heating active', id: 'heatingactive', m: 8, w: false },
@@ -2331,29 +4116,13 @@ const emsesp_deviceentities_7 = [
   { v: 102151, n: 'dhw active time', id: 'dhw/workm', m: 0, w: false }
 ];
 
-const emsesp_deviceentities_4 = [
-  {
-    v: 16,
-    n: 'hc2 selected room temperature',
-    id: 'hc2/seltemp',
-    m: 8,
-    w: true
-  },
-  {
-    v: 18.5,
-    n: 'hc2 current room temperature',
-    id: 'hc2/curtemp',
-    m: 2,
-    w: false
-  },
-  {
-    v: 'off',
-    n: 'hc2 mode',
-    id: 'hc2/mode',
-    m: 2,
-    w: true
-  }
-];
+const emsesp_deviceentities_8 = [{ v: 'dummy value', n: 'dummy name', id: 'dummy', m: 0, w: false }];
+
+const emsesp_deviceentities_9 = [{ v: 'dummy value', n: 'dummy name', id: 'dummy', m: 0, w: false }];
+
+const emsesp_deviceentities_10 = [{ v: 'dummy value', n: 'dummy name', id: 'dummy', m: 0, w: false }];
+
+const emsesp_deviceentities_none = [{ v: 'dummy value', n: 'dummy name', id: 'dummy', m: 0, w: false }];
 
 // END DATA
 
@@ -2438,7 +4207,8 @@ router
   .get(VERIFY_AUTHORIZATION_ENDPOINT, () => verify_authentication)
   .post(RESTART_ENDPOINT, () => {
     console.log('restarting...');
-    return status(200);})
+    return status(200);
+  })
   .post(FACTORY_RESET_ENDPOINT, () => status(200))
   .post(SIGN_IN_ENDPOINT, () => signin)
   .get(GENERATE_TOKEN_ENDPOINT, () => generate_token);
@@ -2469,6 +4239,15 @@ function deviceData(id: number) {
   if (id == 7) {
     return new Response(encoder.encode(emsesp_devicedata_7), { headers });
   }
+  if (id == 8) {
+    return new Response(encoder.encode(emsesp_devicedata_8), { headers });
+  }
+  if (id == 9) {
+    return new Response(encoder.encode(emsesp_devicedata_9), { headers });
+  }
+  if (id == 10) {
+    return new Response(encoder.encode(emsesp_devicedata_10), { headers });
+  }
   if (id == 99) {
     return new Response(encoder.encode(emsesp_devicedata_99), { headers });
   }
@@ -2496,10 +4275,21 @@ function deviceEntities(id: number) {
   if (id == 7) {
     return new Response(encoder.encode(emsesp_deviceentities_7), { headers });
   }
+  if (id == 8) {
+    return new Response(encoder.encode(emsesp_deviceentities_8), { headers });
+  }
+  if (id == 9) {
+    return new Response(encoder.encode(emsesp_deviceentities_9), { headers });
+  }
+  if (id == 10) {
+    return new Response(encoder.encode(emsesp_deviceentities_10), { headers });
+  }
+  // not found, return empty
+  return new Response(encoder.encode(emsesp_deviceentities_none), { headers });
 }
 
+// Router starts here...
 router
-
   // EMS-ESP Settings
   .get(EMSESP_SETTINGS_ENDPOINT, () => settings)
   .post(EMSESP_SETTINGS_ENDPOINT, async (request: any) => {
@@ -2510,9 +4300,18 @@ router
   })
 
   // Device Dashboard Data
-  .get(EMSESP_CORE_DATA_ENDPOINT, () => emsesp_coredata)
+  .get(EMSESP_CORE_DATA_ENDPOINT, () => {
+    // sort by type
+    const sorted_devices = emsesp_coredata.devices.sort((a, b) => b.t - a.t);
+    return { connected: true, devices: sorted_devices };
+  })
   .get(EMSESP_SENSOR_DATA_ENDPOINT, () => emsesp_sensordata)
-  .get(EMSESP_DEVICES_ENDPOINT, () => emsesp_devices)
+  .get(EMSESP_DEVICES_ENDPOINT, () => {
+    // sort by type
+    const sorted_devices = emsesp_devices.devices.sort((a, b) => b.t - a.t);
+    return { devices: sorted_devices };
+    
+  })
   .post(EMSESP_SCANDEVICES_ENDPOINT, () => status(200))
 
   .get(EMSESP_DEVICEDATA_ENDPOINT1, (request) =>
@@ -2529,9 +4328,7 @@ router
     const content = await request.json();
     const id = content.id;
     for (const entity of content.entity_ids) {
-      if (id === 7) {
-        updateMask(entity, emsesp_deviceentities_7, emsesp_devicedata_7);
-      } else if (id === 1) {
+      if (id === 1) {
         updateMask(entity, emsesp_deviceentities_1, emsesp_devicedata_1);
       } else if (id === 2) {
         updateMask(entity, emsesp_deviceentities_2, emsesp_devicedata_2);
@@ -2543,6 +4340,14 @@ router
         updateMask(entity, emsesp_deviceentities_5, emsesp_devicedata_5);
       } else if (id === 6) {
         updateMask(entity, emsesp_deviceentities_6, emsesp_devicedata_6);
+      } else if (id === 7) {
+        updateMask(entity, emsesp_deviceentities_7, emsesp_devicedata_7);
+      } else if (id === 8) {
+        updateMask(entity, emsesp_deviceentities_8, emsesp_devicedata_8);
+      } else if (id === 9) {
+        updateMask(entity, emsesp_deviceentities_9, emsesp_devicedata_9);
+      } else if (id === 10) {
+        updateMask(entity, emsesp_deviceentities_9, emsesp_devicedata_10);
       }
     }
     console.log('customization saved', content);
@@ -2551,6 +4356,12 @@ router
   .post(EMSESP_RESET_CUSTOMIZATIONS_ENDPOINT, async (request: any) => {
     return status(200);
   })
+  .post(EMSESP_WRITE_DEVICENAME_ENDPOINT, async (request: any) => {
+    const content = await request.json();
+    const id = content.id;
+    console.log("Renaming device ID " + id + " to " + content.name);
+    return status(200);
+  })
 
   // Scheduler
   .post(EMSESP_SCHEDULE_ENDPOINT, async (request: any) => {
@@ -2576,7 +4387,7 @@ router
     console.log('modules updated', emsesp_modules);
     return status(200);
   })
-  .get(EMSESP_MODULES_ENDPOINT, () => emsesp_modules)  
+  .get(EMSESP_MODULES_ENDPOINT, () => emsesp_modules)
 
   // Custom Entities
   .post(EMSESP_CUSTOMENTITIES_ENDPOINT, async (request: any) => {
@@ -2623,6 +4434,18 @@ router
       objIndex = emsesp_devicedata_7.data.findIndex((obj) => obj.c == command);
       emsesp_devicedata_7.data[objIndex].v = value;
     }
+    if (id === 8) {
+      objIndex = emsesp_devicedata_8.data.findIndex((obj) => obj.c == command);
+      emsesp_devicedata_8.data[objIndex].v = value;
+    }
+    if (id === 9) {
+      objIndex = emsesp_devicedata_9.data.findIndex((obj) => obj.c == command);
+      emsesp_devicedata_9.data[objIndex].v = value;
+    }
+    if (id === 10) {
+      objIndex = emsesp_devicedata_10.data.findIndex((obj) => obj.c == command);
+      emsesp_devicedata_10.data[objIndex].v = value;
+    }
     if (id === 99) {
       // custom entities
       objIndex = emsesp_devicedata_99.data.findIndex((obj) => obj.c == command);
diff --git a/platformio.ini b/platformio.ini
index 358416933..ed41f8169 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -38,6 +38,7 @@ unbuild_flags =
   ${common.core_unbuild_flags}
 
 [espressi32_base]
+; 6.7.0 = Arduino v2.0.16 (based on IDF v4.4.7). See https://github.com/platformio/platform-espressif32/releases/tag/v6.7.0
 platform = espressif32@6.7.0
 framework = arduino
 board_build.filesystem = littlefs
@@ -51,7 +52,9 @@ extra_scripts =
 [espressi32_base_tasmota]
 ;  use Tasmota's library which removes some unused libs (like mbedtsl, so no WiFi_secure.h) and increases available heap
 ;  Tasmota Arduino Core 2.0.17 with IPv6 support, based on IDF 4.4.7
-platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.05.00/platform-espressif32.zip
+; platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.05.00/platform-espressif32.zip
+;  Tasmota Arduino Core 2.0.18 with IPv6 support, based on IDF 4.4.8
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.06.00/platform-espressif32.zip
 ;  Tasmota Arduino Core 3.0.1.240605 based on IDF v5.1.4.240602
 ; platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.06.10/platform-espressif32.zip
 framework = arduino
diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp
index 7242bef1b..3f92b5521 100644
--- a/src/devices/boiler.cpp
+++ b/src/devices/boiler.cpp
@@ -274,8 +274,13 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const
     register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &pumpModMin_, DeviceValueType::UINT8, FL_(pumpModMin), DeviceValueUOM::PERCENT, MAKE_CF_CB(set_min_pump));
     register_device_value(
         DeviceValueTAG::TAG_DEVICE_DATA, &pumpMode_, DeviceValueType::ENUM, FL_(enum_pumpMode), FL_(pumpMode), DeviceValueUOM::NONE, MAKE_CF_CB(set_pumpMode));
-    register_device_value(
-        DeviceValueTAG::TAG_DEVICE_DATA, &pumpCharacter_, DeviceValueType::ENUM, FL_(enum_pumpCharacter), FL_(pumpCharacter), DeviceValueUOM::NONE, MAKE_CF_CB(set_pumpCharacter));
+    register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
+                          &pumpCharacter_,
+                          DeviceValueType::ENUM,
+                          FL_(enum_pumpCharacter),
+                          FL_(pumpCharacter),
+                          DeviceValueUOM::NONE,
+                          MAKE_CF_CB(set_pumpCharacter));
     register_device_value(
         DeviceValueTAG::TAG_DEVICE_DATA, &pumpDelay_, DeviceValueType::UINT8, FL_(pumpDelay), DeviceValueUOM::MINUTES, MAKE_CF_CB(set_pump_delay), 0, 60);
     register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &setFlowTemp_, DeviceValueType::UINT8, FL_(setFlowTemp), DeviceValueUOM::DEGREES);
diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp
index f0c92344b..6b860428f 100644
--- a/src/emsdevice.cpp
+++ b/src/emsdevice.cpp
@@ -292,14 +292,14 @@ uint8_t EMSdevice::decode_brand(uint8_t value) {
 const std::string EMSdevice::to_string() {
     // for devices that haven't been lookup yet, don't show all details
     if (product_id_ == 0) {
-        return std::string(name_) + " (DeviceID:" + Helpers::hextoa(device_id_) + ")";
+        return std::string(name()) + " (DeviceID:" + Helpers::hextoa(device_id_) + ")";
     }
 
     if (brand_ == Brand::NO_BRAND) {
-        return std::string(name_) + " (DeviceID:" + Helpers::hextoa(device_id_) + ", ProductID:" + Helpers::itoa(product_id_) + ", Version:" + version_ + ")";
+        return std::string(name()) + " (DeviceID:" + Helpers::hextoa(device_id_) + ", ProductID:" + Helpers::itoa(product_id_) + ", Version:" + version_ + ")";
     }
 
-    return std::string(brand_to_char()) + " " + name_ + " (DeviceID:" + Helpers::hextoa(device_id_) + ", ProductID:" + Helpers::itoa(product_id_)
+    return std::string(brand_to_char()) + " " + name() + " (DeviceID:" + Helpers::hextoa(device_id_) + ", ProductID:" + Helpers::itoa(product_id_)
            + ", Version:" + version_ + ")";
 }
 
@@ -307,10 +307,10 @@ const std::string EMSdevice::to_string() {
 // translated
 const std::string EMSdevice::to_string_short() {
     if (brand_ == Brand::NO_BRAND) {
-        return std::string(device_type_2_device_name_translated()) + ": " + name_;
+        return std::string(device_type_2_device_name_translated()) + ": " + name();
     }
 
-    return std::string(device_type_2_device_name_translated()) + ": " + brand_to_char() + " " + name_;
+    return std::string(device_type_2_device_name_translated()) + ": " + brand_to_char() + " " + name();
 }
 
 // for each telegram that has the fetch value set (true) do a read request
@@ -1176,7 +1176,7 @@ void EMSdevice::setCustomizationEntity(const std::string & entity_id) {
     }
 }
 
-// populate a string vector with entities that have masks set or have a custom name
+// populate a string vector with entities that have masks set or have a custom entity name
 void EMSdevice::getCustomizationEntities(std::vector<std::string> & entity_ids) {
     for (const auto & dv : devicevalues_) {
         char name[100];
@@ -1215,7 +1215,7 @@ void EMSdevice::getCustomizationEntities(std::vector<std::string> & entity_ids)
 void EMSdevice::dump_value_info() {
     for (auto & dv : devicevalues_) {
         if (dv.fullname != nullptr) {
-            Serial.print(name_);
+            Serial.print(default_name());
             Serial.print(',');
             Serial.print(device_type_name());
             Serial.print(',');
@@ -1782,7 +1782,7 @@ void EMSdevice::mqtt_ha_entity_config_create() {
         if (!dv.has_state(DeviceValueState::DV_HA_CONFIG_CREATED) && dv.has_state(DeviceValueState::DV_ACTIVE)
             && !dv.has_state(DeviceValueState::DV_API_MQTT_EXCLUDE)) {
             // create_device_config is only done once for the EMS device. It can added to any entity, so we take the first
-            if (Mqtt::publish_ha_sensor_config(dv, name(), brand_to_char(), false, create_device_config)) {
+            if (Mqtt::publish_ha_sensor_config(dv, name().c_str(), brand_to_char(), false, create_device_config)) {
                 dv.add_state(DeviceValueState::DV_HA_CONFIG_CREATED);
                 create_device_config = false; // only create the main config once
                 count++;
@@ -1893,4 +1893,12 @@ void EMSdevice::read_command(const uint16_t type_id, const uint8_t offset, const
     EMSESP::send_read_request(type_id, device_id(), offset, length);
 }
 
+// returns either default or custom name
+std::string EMSdevice::name() {
+    if (custom_name_.empty()) {
+        return default_name_;
+    }
+    return custom_name_;
+}
+
 } // namespace emsesp
diff --git a/src/emsdevice.h b/src/emsdevice.h
index d46c197c7..f899f8ee5 100644
--- a/src/emsdevice.h
+++ b/src/emsdevice.h
@@ -34,14 +34,15 @@ class EMSdevice {
     using process_function_p = std::function<void(std::shared_ptr<const Telegram>)>;
 
     // device_type defines which derived class to use, e.g. BOILER, THERMOSTAT etc..
-    EMSdevice(uint8_t device_type, uint8_t device_id, uint8_t product_id, const char * version, const char * name, uint8_t flags, uint8_t brand)
+    EMSdevice(uint8_t device_type, uint8_t device_id, uint8_t product_id, const char * version, const char * default_name, uint8_t flags, uint8_t brand)
         : device_type_(device_type)
         , device_id_(device_id)
         , product_id_(product_id)
-        , name_(name)
+        , default_name_(default_name)
         , flags_(flags)
         , brand_(brand) {
         strlcpy(version_, version, sizeof(version_));
+        custom_name_ = ""; // init custom name to blank
     }
 
     // static functions, used outside the class like in console.cpp, command.cpp, emsesp.cpp, mqtt.cpp
@@ -111,12 +112,18 @@ class EMSdevice {
         return brand_;
     }
 
-    inline void name(const char * name) {
-        name_ = name;
+    // set custom device name
+    inline void custom_name(std::string & custom_name) {
+        custom_name_ = custom_name;
     }
+    std::string name(); // returns either default or custom name if defined
 
-    inline const char * name() const {
-        return name_;
+    // default name
+    inline void default_name(const char * default_name) {
+        default_name_ = default_name;
+    }
+    inline const char * default_name() const {
+        return default_name_;
     }
 
     inline uint8_t unique_id() const {
@@ -479,7 +486,8 @@ class EMSdevice {
     uint8_t      device_id_   = 0;
     uint8_t      product_id_  = 0;
     char         version_[6];
-    const char * name_; // the long name for the EMS model
+    const char * default_name_; // the fixed name the EMS model taken from the device library
+    std::string  custom_name_;  // custom name
     uint8_t      flags_ = 0;
     uint8_t      brand_ = Brand::NO_BRAND;
 
diff --git a/src/emsesp.cpp b/src/emsesp.cpp
index 26f26ec6d..e39be2a0d 100644
--- a/src/emsesp.cpp
+++ b/src/emsesp.cpp
@@ -359,7 +359,7 @@ void EMSESP::dump_all_values(uuid::console::Shell & shell) {
                 // add the device and print out all the entities
                 // for testing the mixer use ... if (device.product_id == 69) {
                 emsdevices.push_back(
-                    EMSFactory::add(device.device_type, device_id, device.product_id, "1.0", device.name, device.flags, EMSdevice::Brand::NO_BRAND));
+                    EMSFactory::add(device.device_type, device_id, device.product_id, "1.0", device.default_name, device.flags, EMSdevice::Brand::NO_BRAND));
                 emsdevices.back()->dump_value_info();
             }
         }
@@ -400,7 +400,7 @@ void EMSESP::dump_all_telegrams(uuid::console::Shell & shell) {
 
                 // add the device and print out all the entities
                 emsdevices.push_back(
-                    EMSFactory::add(device.device_type, device_id, device.product_id, "1.0", device.name, device.flags, EMSdevice::Brand::NO_BRAND));
+                    EMSFactory::add(device.device_type, device_id, device.product_id, "1.0", device.default_name, device.flags, EMSdevice::Brand::NO_BRAND));
                 // add to our vector list
                 emsdevices.back()->dump_telegram_info(telegram_functions_dump);
             }
@@ -1167,17 +1167,20 @@ bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, const
             if (product_id == 0 || emsdevice->product_id() != 0) { // update only with valid product_id
                 return true;
             }
+
             LOG_DEBUG("Updating details for already active deviceID 0x%02X", device_id);
             emsdevice->product_id(product_id);
             emsdevice->version(version);
+
             // only set brand if it doesn't already exist
             if (emsdevice->brand() == EMSdevice::Brand::NO_BRAND) {
                 emsdevice->brand(brand);
             }
-            // find the name and flags in our database
+
+            // find the name and flags in our device library database
             for (const auto & device : device_library_) {
                 if (device.product_id == product_id && device.device_type == emsdevice->device_type()) {
-                    emsdevice->name(device.name);
+                    emsdevice->default_name(device.default_name); // custom name is set later
                     emsdevice->add_flags(device.flags);
                 }
             }
@@ -1192,7 +1195,7 @@ bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, const
         if (device.product_id == product_id) {
             // sometimes boilers share the same productID as controllers
             // so only add boilers if the device_id is 0x08
-            // cascaded boilers with 0x70.., map to heatsources
+            // cascaded boilers with 0x70..., map to heatsources
             if (device.device_type == DeviceType::BOILER) {
                 if (device_id == EMSdevice::EMS_DEVICE_ID_BOILER) {
                     device_p = &device;
@@ -1204,7 +1207,7 @@ bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, const
                     break;
                 }
             } else {
-                // it's not a boiler, but we have a match
+                // it's not a boiler, but we still have a match
                 device_p = &device;
                 break;
             }
@@ -1219,84 +1222,99 @@ bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, const
         return false; // not found
     }
 
-    auto name        = device_p->name;
-    auto device_type = device_p->device_type;
-    auto flags       = device_p->flags;
+    auto default_name = device_p->default_name;
+    auto device_type  = device_p->device_type;
+    auto flags        = device_p->flags;
 
     // check for integrated modules with same product id, but different function (device_id)
+    // and force set the correct device type and hardcoded name
     if (device_type == DeviceType::HEATPUMP) {
         if (device_id == EMSdevice::EMS_DEVICE_ID_MODEM) {
-            device_type = DeviceType::GATEWAY;
-            name        = "WiFi module";
+            device_type  = DeviceType::GATEWAY;
+            default_name = "WiFi module";
         } else if (device_id == EMSdevice::EMS_DEVICE_ID_RFBASE) {
-            device_type = DeviceType::CONNECT;
-            name        = "Wireless sensor base";
+            device_type  = DeviceType::CONNECT;
+            default_name = "Wireless sensor base";
         }
     }
+
     if (device_id >= EMSdevice::EMS_DEVICE_ID_DHW1 && device_id <= EMSdevice::EMS_DEVICE_ID_DHW8) {
         device_type = DeviceType::WATER;
     }
+
     // CR120 have version 22.xx, RC400/CW100 uses version 42.xx, see https://github.com/emsesp/EMS-ESP32/discussions/1779
     if (product_id == 157 && version[0] == '2') {
-        flags = DeviceFlags::EMS_DEVICE_FLAG_CR120;
-        name  = "CR120";
+        flags        = DeviceFlags::EMS_DEVICE_FLAG_CR120;
+        default_name = "CR120";
     }
+
     // empty reply to version, read a generic device from database
     if (product_id == 0) {
         // check for known device IDs
         if (device_id == EMSdevice::EMS_DEVICE_ID_RFSENSOR) {
             // see: https://github.com/emsesp/EMS-ESP32/issues/103#issuecomment-911717342 and https://github.com/emsesp/EMS-ESP32/issues/624
-            name        = "RF room temperature sensor";
-            device_type = DeviceType::THERMOSTAT;
+            default_name = "RF room temperature sensor";
+            device_type  = DeviceType::THERMOSTAT;
         } else if (device_id == EMSdevice::EMS_DEVICE_ID_ROOMTHERMOSTAT || device_id == EMSdevice::EMS_DEVICE_ID_TADO_OLD) {
             // see https://github.com/emsesp/EMS-ESP32/issues/174
-            name        = "Generic thermostat";
-            device_type = DeviceType::THERMOSTAT;
-            flags       = DeviceFlags::EMS_DEVICE_FLAG_RC10 | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE;
+            default_name = "Generic Thermostat";
+            device_type  = DeviceType::THERMOSTAT;
+            flags        = DeviceFlags::EMS_DEVICE_FLAG_RC10 | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE;
         } else if (device_id == EMSdevice::EMS_DEVICE_ID_RS232) {
-            name        = "RS232";
-            device_type = DeviceType::CONNECT;
+            default_name = "RS232";
+            device_type  = DeviceType::CONNECT;
         } else if (device_id == EMSdevice::EMS_DEVICE_ID_TERMINAL) {
-            name        = "Terminal";
-            device_type = DeviceType::CONNECT;
+            default_name = "Terminal";
+            device_type  = DeviceType::CONNECT;
         } else if (device_id == EMSdevice::EMS_DEVICE_ID_SERVICEKEY) {
-            name        = "Service Key";
-            device_type = DeviceType::CONNECT;
+            default_name = "Service Key";
+            device_type  = DeviceType::CONNECT;
         } else if (device_id == EMSdevice::EMS_DEVICE_ID_CASCADE) {
-            name        = "Cascade";
-            device_type = DeviceType::CONNECT;
+            default_name = "Cascade";
+            device_type  = DeviceType::CONNECT;
         } else if (device_id == EMSdevice::EMS_DEVICE_ID_EASYCOM
                    || (device_id >= EMSdevice::EMS_DEVICE_ID_MODEM && device_id <= EMSdevice::EMS_DEVICE_ID_MODEM + 5)) {
             // see https://github.com/emsesp/EMS-ESP/issues/460#issuecomment-709553012
-            name        = "Modem";
-            device_type = DeviceType::CONNECT;
+            default_name = "Modem";
+            device_type  = DeviceType::CONNECT;
         } else if (device_id == EMSdevice::EMS_DEVICE_ID_CONVERTER) {
-            name = "Converter"; // generic
+            default_name = "Converter"; // generic
         } else if (device_id == EMSdevice::EMS_DEVICE_ID_CLOCK) {
-            name        = "Clock"; // generic
-            device_type = DeviceType::CONTROLLER;
+            default_name = "Clock"; // generic
+            device_type  = DeviceType::CONTROLLER;
         } else if (device_id == EMSdevice::EMS_DEVICE_ID_CONTROLLER) {
-            name        = "Generic Controller";
-            device_type = DeviceType::CONTROLLER;
+            default_name = "Generic Controller";
+            device_type  = DeviceType::CONTROLLER;
         } else if (device_id == EMSdevice::EMS_DEVICE_ID_BOILER) {
-            name        = "Generic Boiler";
-            device_type = DeviceType::BOILER;
-            flags       = DeviceFlags::EMS_DEVICE_FLAG_HEATPUMP;
+            default_name = "Generic Boiler";
+            device_type  = DeviceType::BOILER;
+            flags        = DeviceFlags::EMS_DEVICE_FLAG_HEATPUMP;
             LOG_WARNING("Unknown EMS boiler. Using generic profile. Please report on GitHub.");
         } else if (device_id >= 0x68 && device_id <= 0x6F) {
             // test for https://github.com/emsesp/EMS-ESP32/issues/882
-            name        = "Cascaded Controller";
-            device_type = DeviceType::CONTROLLER;
+            default_name = "Cascaded Controller";
+            device_type  = DeviceType::CONTROLLER;
         } else {
             LOG_WARNING("Unrecognized EMS device (device ID 0x%02X, no product ID). Please report on GitHub.", device_id);
             return false;
         }
     }
 
-    LOG_DEBUG("Adding new device %s (deviceID 0x%02X, productID %d, version %s)", name, device_id, product_id, version);
-    emsdevices.push_back(EMSFactory::add(device_type, device_id, product_id, version, name, flags, brand));
+    LOG_DEBUG("Adding new device %s (deviceID 0x%02X, productID %d, version %s)", default_name, device_id, product_id, version);
+    emsdevices.push_back(EMSFactory::add(device_type, device_id, product_id, version, default_name, flags, brand));
 
-    // assign a unique ID. Note that this is not actual unique after a restart as it's dependent on the order that devices are found
+    // see if we have a custom device name in our Customizations list, and if so set it
+    webCustomizationService.read([&](WebCustomization & settings) {
+        for (EntityCustomization e : settings.entityCustomizations) {
+            if ((e.device_id == device_id) && (e.product_id == product_id)) {
+                LOG_DEBUG("Have customizations for %s with deviceID 0x%02X productID %d", e.custom_name.c_str(), device_id, product_id);
+                emsdevices.back()->custom_name(e.custom_name);
+                break;
+            }
+        }
+    });
+
+    // assign a unique ID. Note that this is not actual remain unique after a restart as it's dependent on the order that devices are found
     // can't be 0 otherwise web won't work
     emsdevices.back()->unique_id(++unique_id_count_);
 
@@ -1305,7 +1323,7 @@ bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, const
         return a->device_type() < b->device_type();
     });
 
-    fetch_device_values(device_id); // go and fetch its data
+    fetch_device_values(device_id); // go and fetch its device entity data
 
     // Print to LOG showing we've added a new device
     LOG_INFO("Recognized new %s with deviceID 0x%02X", EMSdevice::device_type_2_device_name(device_type), device_id);
diff --git a/src/emsesp.h b/src/emsesp.h
index bfc83c816..6acaa1215 100644
--- a/src/emsesp.h
+++ b/src/emsesp.h
@@ -252,7 +252,7 @@ class EMSESP {
     struct Device_record {
         uint8_t               product_id;
         EMSdevice::DeviceType device_type;
-        const char *          name;
+        const char *          default_name;
         uint8_t               flags;
     };
     static std::vector<Device_record> device_library_;
diff --git a/src/emsfactory.h b/src/emsfactory.h
index 3117afc84..3636bca60 100644
--- a/src/emsfactory.h
+++ b/src/emsfactory.h
@@ -55,9 +55,9 @@ class EMSFactory {
     }
 
     // Construct derived class returning an unique ptr
-    static auto add(const uint8_t device_type, uint8_t device_id, uint8_t product_id, const char * version, const char * name, uint8_t flags, uint8_t brand)
+    static auto add(const uint8_t device_type, uint8_t device_id, uint8_t product_id, const char * version, const char * default_name, uint8_t flags, uint8_t brand)
         -> std::unique_ptr<EMSdevice> {
-        return std::unique_ptr<EMSdevice>(EMSFactory::makeRaw(device_type, device_id, product_id, version, name, flags, brand));
+        return std::unique_ptr<EMSdevice>(EMSFactory::makeRaw(device_type, device_id, product_id, version, default_name, flags, brand));
     }
 
     virtual auto construct(uint8_t device_type, uint8_t device_id, uint8_t product_id, const char * version, const char * name, uint8_t flags, uint8_t brand) const
diff --git a/src/system.cpp b/src/system.cpp
index 72b3cd78c..ecce25f21 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -1102,6 +1102,7 @@ bool System::check_restore() {
 
 #ifndef EMSESP_STANDALONE
     // see if we have a temp file, if so try and read it
+    // TODO find a nicer way to see if a file exists without reporting an error
     File new_file = LittleFS.open(TEMP_FILENAME_PATH);
     if (new_file) {
         JsonDocument         jsonDocument;
@@ -1556,7 +1557,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output
                 if (emsdevice && (emsdevice->device_type() == device_class.first)) {
                     JsonObject obj    = devices.add<JsonObject>();
                     obj["type"]       = emsdevice->device_type_name(); // non translated name
-                    obj["name"]       = emsdevice->name();
+                    obj["name"]       = emsdevice->name();             // custom name
                     obj["device id"]  = Helpers::hextoa(emsdevice->device_id());
                     obj["product id"] = emsdevice->product_id();
                     obj["version"]    = emsdevice->version();
diff --git a/src/temperaturesensor.cpp b/src/temperaturesensor.cpp
index b9844f676..3b0773e34 100644
--- a/src/temperaturesensor.cpp
+++ b/src/temperaturesensor.cpp
@@ -611,8 +611,8 @@ bool TemperatureSensor::Sensor::apply_customization() {
         auto sensors = settings.sensorCustomizations;
         if (!sensors.empty()) {
             for (const auto & sensor : sensors) {
-                LOG_DEBUG("Loading customization for temperature sensor %s", sensor.id.c_str());
                 if (id_ == sensor.id) {
+                    LOG_DEBUG("Loading customization for temperature sensor %s", sensor.id.c_str());
                     set_name(sensor.name);
                     set_offset(sensor.offset);
                     return true;
diff --git a/src/test/test.cpp b/src/test/test.cpp
index 16c190d77..648b24e47 100644
--- a/src/test/test.cpp
+++ b/src/test/test.cpp
@@ -313,17 +313,20 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
 
     if (command == "general") {
         shell.printfln("Testing adding a boiler, thermostat, all sensors, scheduler and custom entities...");
-        test("general");
 
         // setup fake data
-        EMSESP::webCustomizationService.test(); // set customizations
-        EMSESP::temperaturesensor_.test();      // add temperature sensors
-        EMSESP::webSchedulerService.test();     // add scheduler items
-        EMSESP::webCustomEntityService.test();  // add custom entities
+        EMSESP::webCustomizationService.test(); // set customizations - this will overwrite any settings in the file
 
-        // shell.invoke_command("show devices");
+        // add devices
+        test("general");
+
+        EMSESP::temperaturesensor_.test();     // add temperature sensors
+        EMSESP::webSchedulerService.test();    // add scheduler items
+        EMSESP::webCustomEntityService.test(); // add custom entities
+
+        shell.invoke_command("show devices");
         // shell.invoke_command("show values");
-        shell.invoke_command("call system allvalues");
+        // shell.invoke_command("call system allvalues");
         // shell.invoke_command("call system publish");
         // shell.invoke_command("show mqtt");
         ok = true;
diff --git a/src/version.h b/src/version.h
index 7f4909db6..7d49b7130 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.7.0-dev.19"
+#define EMSESP_APP_VERSION "3.7.0-dev.20"
diff --git a/src/web/WebCustomizationService.cpp b/src/web/WebCustomizationService.cpp
index 77883d117..407acbbf4 100644
--- a/src/web/WebCustomizationService.cpp
+++ b/src/web/WebCustomizationService.cpp
@@ -24,6 +24,7 @@ bool WebCustomization::_start = true;
 
 WebCustomizationService::WebCustomizationService(AsyncWebServer * server, FS * fs, SecurityManager * securityManager)
     : _fsPersistence(WebCustomization::read, WebCustomization::update, this, fs, EMSESP_CUSTOMIZATION_FILE) {
+    // GET
     server->on(DEVICE_ENTITIES_PATH,
                HTTP_GET,
                securityManager->wrapRequest([this](AsyncWebServerRequest * request) { device_entities(request); }, AuthenticationPredicates::IS_AUTHENTICATED));
@@ -32,10 +33,15 @@ WebCustomizationService::WebCustomizationService(AsyncWebServer * server, FS * f
                HTTP_GET,
                securityManager->wrapRequest([this](AsyncWebServerRequest * request) { devices(request); }, AuthenticationPredicates::IS_AUTHENTICATED));
 
+    // POST
     server->on(RESET_CUSTOMIZATION_SERVICE_PATH,
                HTTP_POST,
                securityManager->wrapRequest([this](AsyncWebServerRequest * request) { reset_customization(request); }, AuthenticationPredicates::IS_ADMIN));
 
+    server->on(WRITE_DEVICE_NAME_PATH,
+               securityManager->wrapCallback([this](AsyncWebServerRequest * request, JsonVariant json) { writeDeviceName(request, json); },
+                                             AuthenticationPredicates::IS_AUTHENTICATED));
+
     server->on(CUSTOMIZATION_ENTITIES_PATH,
                securityManager->wrapCallback([this](AsyncWebServerRequest * request, JsonVariant json) { customization_entities(request, json); },
                                              AuthenticationPredicates::IS_AUTHENTICATED));
@@ -65,12 +71,13 @@ void WebCustomization::read(WebCustomization & customizations, JsonObject root)
         sensorJson["type"]    = sensor.type;   // t
     }
 
-    // Masked entities customization
+    // Masked entities customization and custom device name (optional)
     JsonArray masked_entitiesJson = root["masked_entities"].to<JsonArray>();
     for (const EntityCustomization & entityCustomization : customizations.entityCustomizations) {
-        JsonObject entityJson    = masked_entitiesJson.add<JsonObject>();
-        entityJson["product_id"] = entityCustomization.product_id;
-        entityJson["device_id"]  = entityCustomization.device_id;
+        JsonObject entityJson     = masked_entitiesJson.add<JsonObject>();
+        entityJson["product_id"]  = entityCustomization.product_id;
+        entityJson["device_id"]   = entityCustomization.device_id;
+        entityJson["custom_name"] = entityCustomization.custom_name;
 
         // entries are in the form <XX><shortname>[optional customname] e.g "08heatingactive|heating is on"
         JsonArray masked_entityJson = entityJson["entity_ids"].to<JsonArray>();
@@ -120,9 +127,10 @@ StateUpdateResult WebCustomization::update(JsonObject root, WebCustomization & c
     customizations.entityCustomizations.clear();
     if (root["masked_entities"].is<JsonArray>()) {
         for (const JsonObject masked_entities : root["masked_entities"].as<JsonArray>()) {
-            auto emsEntity       = EntityCustomization();
-            emsEntity.product_id = masked_entities["product_id"];
-            emsEntity.device_id  = masked_entities["device_id"];
+            auto emsEntity        = EntityCustomization();
+            emsEntity.product_id  = masked_entities["product_id"];
+            emsEntity.device_id   = masked_entities["device_id"];
+            emsEntity.custom_name = masked_entities["custom_name"].as<std::string>();
 
             for (const JsonVariant masked_entity_id : masked_entities["entity_ids"].as<JsonArray>()) {
                 if (masked_entity_id.is<std::string>()) {
@@ -163,10 +171,11 @@ void WebCustomizationService::devices(AsyncWebServerRequest * request) {
     for (const auto & emsdevice : EMSESP::emsdevices) {
         if (emsdevice->has_entities()) {
             JsonObject obj = devices.add<JsonObject>();
-            obj["i"]       = emsdevice->unique_id();                                                                     // its unique id
-            obj["s"]  = std::string(emsdevice->device_type_2_device_name_translated()) + " (" + emsdevice->name() + ")"; // shortname, is device type translated
-            obj["tn"] = emsdevice->device_type_name();                                                                   // non-translated, lower-case
-            obj["t"]  = emsdevice->device_type();                                                                        // internal device type ID
+            obj["i"]       = emsdevice->unique_id();                                         // its unique id
+            obj["s"]       = emsdevice->name();                                              // custom name
+            obj["t"]       = emsdevice->device_type();                                       // internal device type ID
+            obj["tn"]      = std::string(emsdevice->device_type_2_device_name_translated()); // translated device type name
+            obj["url"]     = emsdevice->device_type_name();                                  // non-translated, lower-case, used for API URL
         }
     }
 
@@ -211,6 +220,58 @@ void WebCustomizationService::device_entities(AsyncWebServerRequest * request) {
     request->send(response);
 }
 
+// renames a device
+// takes the unique ID and the custom name
+void WebCustomizationService::writeDeviceName(AsyncWebServerRequest * request, JsonVariant json) {
+    if (json.is<JsonObject>()) {
+        // find the device using the unique_id
+        for (const auto & emsdevice : EMSESP::emsdevices) {
+            if (emsdevice) {
+                uint8_t unique_device_id = json["id"];
+                // find product id and device id using the unique id
+                if (emsdevice->unique_id() == unique_device_id) {
+                    uint8_t product_id  = emsdevice->product_id();
+                    uint8_t device_id   = emsdevice->device_id();
+                    auto    custom_name = json["name"].as<std::string>();
+
+                    // emsesp::EMSESP::logger().info("Found Device ID: %d, Product ID: %d", device_id, product_id);
+
+                    // updates current record or creates a new one
+                    bool entry_exists = false;
+                    update([&](WebCustomization & settings) {
+                        for (auto it = settings.entityCustomizations.begin(); it != settings.entityCustomizations.end();) {
+                            if ((*it).product_id == product_id && (*it).device_id == device_id) {
+                                (*it).custom_name = custom_name;
+                                entry_exists      = true;
+                                break;
+                            } else {
+                                ++it;
+                            }
+                        }
+
+                        // if we don't have any customization for this device, create a new entry
+                        if (!entry_exists) {
+                            EntityCustomization new_entry;
+                            new_entry.product_id  = product_id;
+                            new_entry.device_id   = device_id;
+                            new_entry.custom_name = custom_name;
+                            settings.entityCustomizations.push_back(new_entry);
+                        }
+
+                        return StateUpdateResult::CHANGED;
+                    });
+
+                    // update the EMS Device record real-time
+                    emsdevice->custom_name(custom_name);
+                }
+            }
+        }
+    }
+
+    AsyncWebServerResponse * response = request->beginResponse(200);
+    request->send(response);
+}
+
 // takes a list of updated entities with new masks from the web UI
 // saves it in the customization service
 // and updates the entity list real-time
@@ -236,7 +297,6 @@ void WebCustomizationService::customization_entities(AsyncWebServerRequest * req
                         } else {
                             emsdevice->setCustomizationEntity(id_s);
                         }
-                        // emsesp::EMSESP::logger().info(id.as<const char *>());
                     }
 
                     // add deleted entities from file
@@ -271,7 +331,7 @@ void WebCustomizationService::customization_entities(AsyncWebServerRequest * req
 
                     // Save the list to the customization file
                     update([&](WebCustomization & settings) {
-                        // see if we already have a mask list for this device, if so remove it
+                        // see if we already have a mask list for this device, if so remove the entry
                         for (auto it = settings.entityCustomizations.begin(); it != settings.entityCustomizations.end();) {
                             if ((*it).product_id == product_id && (*it).device_id == device_id) {
                                 it = settings.entityCustomizations.erase(it);
@@ -281,16 +341,14 @@ void WebCustomizationService::customization_entities(AsyncWebServerRequest * req
                             }
                         }
 
-                        // create a new entry for this device if there are values
+                        // re-create a new entry
                         EntityCustomization new_entry;
                         new_entry.product_id = product_id;
                         new_entry.device_id  = device_id;
-
                         new_entry.entity_ids = entity_ids;
-
-                        // add the record and save
                         settings.entityCustomizations.push_back(new_entry);
-                        return StateUpdateResult::CHANGED;
+
+                        return StateUpdateResult::CHANGED; // save the changes
                     });
 
                     break;
@@ -308,7 +366,6 @@ void WebCustomizationService::begin() {
     _fsPersistence.readFromFS();
 }
 
-
 // hard coded tests
 #ifdef EMSESP_TEST
 void WebCustomizationService::test() {
@@ -321,11 +378,11 @@ void WebCustomizationService::test() {
         sensor.offset = 0;
         webCustomization.sensorCustomizations.push_back(sensor);
 
-        sensor        = SensorCustomization();
-        sensor.id     = "0B-0C0D-0E0F-1011";
-        sensor.name   = "test_sensor2";
-        sensor.offset = 4;
-        webCustomization.sensorCustomizations.push_back(sensor);
+        auto sensor2   = SensorCustomization();
+        sensor2.id     = "0B-0C0D-0E0F-1011";
+        sensor2.name   = "test_sensor2";
+        sensor2.offset = 4;
+        webCustomization.sensorCustomizations.push_back(sensor2);
 
         // Analog sensors
         // This actually adds the sensors as we use customizations to store them
@@ -350,9 +407,10 @@ void WebCustomizationService::test() {
 
         // EMS entities
         webCustomization.entityCustomizations.clear();
-        auto emsEntity       = EntityCustomization();
-        emsEntity.product_id = 123;
-        emsEntity.device_id  = 8;
+        auto emsEntity        = EntityCustomization();
+        emsEntity.product_id  = 123;
+        emsEntity.device_id   = 8;
+        emsEntity.custom_name = "Custom Name!!";
         emsEntity.entity_ids.push_back("08heatingactive|is my heating on?");
         webCustomization.entityCustomizations.push_back(emsEntity);
 
diff --git a/src/web/WebCustomizationService.h b/src/web/WebCustomizationService.h
index 80b805a9d..98abbbc3b 100644
--- a/src/web/WebCustomizationService.h
+++ b/src/web/WebCustomizationService.h
@@ -28,6 +28,7 @@
 // POST
 #define CUSTOMIZATION_ENTITIES_PATH "/rest/customizationEntities"
 #define RESET_CUSTOMIZATION_SERVICE_PATH "/rest/resetCustomizations"
+#define WRITE_DEVICE_NAME_PATH "/rest/writeDeviceName"
 
 namespace emsesp {
 
@@ -60,9 +61,10 @@ class AnalogCustomization {
 // we use product_id and device_id to make the device unique
 class EntityCustomization {
   public:
-    uint8_t                  product_id; // device's product id
-    uint8_t                  device_id;  // device's device id
-    std::vector<std::string> entity_ids; // array of entity ids with masks and optional custom fullname
+    uint8_t                  product_id;  // device's product id
+    uint8_t                  device_id;   // device's device id
+    std::string              custom_name; // custom device name
+    std::vector<std::string> entity_ids;  // array of entity ids with masks and optional custom fullname
 };
 
 class WebCustomization {
@@ -100,6 +102,7 @@ class WebCustomizationService : public StatefulService<WebCustomization> {
 
     // POST
     void customization_entities(AsyncWebServerRequest * request, JsonVariant json);
+    void writeDeviceName(AsyncWebServerRequest * request, JsonVariant json);
     void reset_customization(AsyncWebServerRequest * request); // command
 };
 
diff --git a/src/web/WebDataService.cpp b/src/web/WebDataService.cpp
index a1f92f778..622c93748 100644
--- a/src/web/WebDataService.cpp
+++ b/src/web/WebDataService.cpp
@@ -73,7 +73,7 @@ void WebDataService::core_data(AsyncWebServerRequest * request) {
             obj["tn"]      = emsdevice->device_type_2_device_name_translated(); // translated device type name
             obj["t"]       = emsdevice->device_type();                          // device type number
             obj["b"]       = emsdevice->brand_to_char();                        // brand
-            obj["n"]       = emsdevice->name();                                 // name
+            obj["n"]       = emsdevice->name();                                 // custom name
             obj["d"]       = emsdevice->device_id();                            // deviceid
             obj["p"]       = emsdevice->product_id();                           // productid
             obj["v"]       = emsdevice->version();                              // version