diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1334b4c3d..bccaf6cc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Ongoing
+
+- Add/update model-data for Jip, Tom and Floor via PR [#842](https://github.com/plugwise/python-plugwise/pull/842)
+
 ## v1.11.1
 
 - Code optimizations via PR [#837](https://github.com/plugwise/python-plugwise/pull/837), [#838](https://github.com/plugwise/python-plugwise/pull/838), [#839](https://github.com/plugwise/python-plugwise/pull/839), [#840](https://github.com/plugwise/python-plugwise/pull/840), and [#841](https://github.com/plugwise/python-plugwise/pull/841)
diff --git a/fixtures/adam_jip/data.json b/fixtures/adam_jip/data.json
index da7df0e27..a1136e3c9 100644
--- a/fixtures/adam_jip/data.json
+++ b/fixtures/adam_jip/data.json
@@ -85,7 +85,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "d58fec52899f4f1c92e4f8fad6d8c48c",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Logeerkamer",
     "sensors": {
@@ -109,7 +109,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "06aecb3d00354375924f50c47af36bd2",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Slaapkamer",
     "sensors": {
@@ -176,7 +176,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "13228dab8ce04617af318a2888b3c548",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Woonkamer",
     "sensors": {
@@ -276,7 +276,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "d27aede973b54be484f6842d1b2802ad",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Kinderkamer",
     "sensors": {
diff --git a/fixtures/adam_multiple_devices_per_zone/data.json b/fixtures/adam_multiple_devices_per_zone/data.json
index 364d71e59..a64835649 100644
--- a/fixtures/adam_multiple_devices_per_zone/data.json
+++ b/fixtures/adam_multiple_devices_per_zone/data.json
@@ -193,7 +193,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "08963fec7c53423ca5680aa4cb502c63",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Thermostatic Radiator Badkamer 1",
     "sensors": {
@@ -334,7 +334,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "12493538af164a409c6a1c79e38afe1c",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Bios Cv Thermostatic Radiator ",
     "sensors": {
@@ -359,7 +359,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "c50f167537524366a5af7aa3942feb1e",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Floor kraan",
     "sensors": {
@@ -467,7 +467,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "82fa13f017d240daa0d0ea1775420f24",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Thermostatic Radiator Jessie",
     "sensors": {
@@ -535,7 +535,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "446ac08dd04d4eff8ac57489757b7314",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "CV Kraan Garage",
     "sensors": {
diff --git a/fixtures/adam_plus_anna_new/data.json b/fixtures/adam_plus_anna_new/data.json
index afa38abd8..cf8e4ab56 100644
--- a/fixtures/adam_plus_anna_new/data.json
+++ b/fixtures/adam_plus_anna_new/data.json
@@ -71,7 +71,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "f871b8c4d63549319221e294e4f88074",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Badkamer",
     "sensors": {
diff --git a/fixtures/adam_plus_anna_new_regulation_off/data.json b/fixtures/adam_plus_anna_new_regulation_off/data.json
index 0a859e23a..888e0c21b 100644
--- a/fixtures/adam_plus_anna_new_regulation_off/data.json
+++ b/fixtures/adam_plus_anna_new_regulation_off/data.json
@@ -45,7 +45,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "f871b8c4d63549319221e294e4f88074",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Badkamer",
     "sensors": {
diff --git a/fixtures/adam_zone_per_device/data.json b/fixtures/adam_zone_per_device/data.json
index c40afc0ba..ce3d258b4 100644
--- a/fixtures/adam_zone_per_device/data.json
+++ b/fixtures/adam_zone_per_device/data.json
@@ -190,7 +190,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "08963fec7c53423ca5680aa4cb502c63",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Thermostatic Radiator Badkamer",
     "sensors": {
@@ -331,7 +331,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "12493538af164a409c6a1c79e38afe1c",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Bios Cv Thermostatic Radiator ",
     "sensors": {
@@ -356,7 +356,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "c50f167537524366a5af7aa3942feb1e",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Floor kraan",
     "sensors": {
@@ -464,7 +464,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "82fa13f017d240daa0d0ea1775420f24",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Thermostatic Radiator Jessie",
     "sensors": {
@@ -532,7 +532,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "446ac08dd04d4eff8ac57489757b7314",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "CV Kraan Garage",
     "sensors": {
diff --git a/fixtures/m_adam_cooling/data.json b/fixtures/m_adam_cooling/data.json
index 9b95475eb..edd7d0ea5 100644
--- a/fixtures/m_adam_cooling/data.json
+++ b/fixtures/m_adam_cooling/data.json
@@ -60,7 +60,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "f871b8c4d63549319221e294e4f88074",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Badkamer",
     "sensors": {
diff --git a/fixtures/m_adam_heating/data.json b/fixtures/m_adam_heating/data.json
index 47a8fdeb2..7b997d288 100644
--- a/fixtures/m_adam_heating/data.json
+++ b/fixtures/m_adam_heating/data.json
@@ -65,7 +65,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "f871b8c4d63549319221e294e4f88074",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Badkamer",
     "sensors": {
diff --git a/fixtures/m_adam_jip/data.json b/fixtures/m_adam_jip/data.json
index c9ffb7395..160cec1aa 100644
--- a/fixtures/m_adam_jip/data.json
+++ b/fixtures/m_adam_jip/data.json
@@ -84,7 +84,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "d58fec52899f4f1c92e4f8fad6d8c48c",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Logeerkamer",
     "sensors": {
@@ -108,7 +108,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "06aecb3d00354375924f50c47af36bd2",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Slaapkamer",
     "sensors": {
@@ -175,7 +175,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "13228dab8ce04617af318a2888b3c548",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Woonkamer",
     "sensors": {
@@ -275,7 +275,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "d27aede973b54be484f6842d1b2802ad",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Kinderkamer",
     "sensors": {
diff --git a/fixtures/m_adam_multiple_devices_per_zone/data.json b/fixtures/m_adam_multiple_devices_per_zone/data.json
index 126031795..981c094ce 100644
--- a/fixtures/m_adam_multiple_devices_per_zone/data.json
+++ b/fixtures/m_adam_multiple_devices_per_zone/data.json
@@ -186,7 +186,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "08963fec7c53423ca5680aa4cb502c63",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Thermostatic Radiator Badkamer 1",
     "sensors": {
@@ -327,7 +327,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "12493538af164a409c6a1c79e38afe1c",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Bios Cv Thermostatic Radiator ",
     "sensors": {
@@ -352,7 +352,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "c50f167537524366a5af7aa3942feb1e",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Floor kraan",
     "sensors": {
@@ -460,7 +460,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "82fa13f017d240daa0d0ea1775420f24",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Thermostatic Radiator Jessie",
     "sensors": {
@@ -528,7 +528,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "446ac08dd04d4eff8ac57489757b7314",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "CV Kraan Garage",
     "sensors": {
diff --git a/plugwise/constants.py b/plugwise/constants.py
index 188a23bfc..bf3f2f3cd 100644
--- a/plugwise/constants.py
+++ b/plugwise/constants.py
@@ -50,10 +50,12 @@
     "159.2": "Adam",
     # "?????": "Emma Essential",
     "170.1": "Emma Pro wired",
-    "106-03": "Tom/Floor",
+    "106-03": "Tom",
     "158-01": "Lisa",
     "160-01": "Plug",
+    "165-01": "Floor",
     "168-01": "Jip",
+    "168-02": "Jip",
     "170-01": "Emma Pro",
     "038500": "Stick",
     "070085": "Stick",
diff --git a/tests/data/adam/adam_jip.json b/tests/data/adam/adam_jip.json
index da7df0e27..a1136e3c9 100644
--- a/tests/data/adam/adam_jip.json
+++ b/tests/data/adam/adam_jip.json
@@ -85,7 +85,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "d58fec52899f4f1c92e4f8fad6d8c48c",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Logeerkamer",
     "sensors": {
@@ -109,7 +109,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "06aecb3d00354375924f50c47af36bd2",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Slaapkamer",
     "sensors": {
@@ -176,7 +176,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "13228dab8ce04617af318a2888b3c548",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Woonkamer",
     "sensors": {
@@ -276,7 +276,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "d27aede973b54be484f6842d1b2802ad",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Kinderkamer",
     "sensors": {
diff --git a/tests/data/adam/adam_multiple_devices_per_zone.json b/tests/data/adam/adam_multiple_devices_per_zone.json
index 364d71e59..a64835649 100644
--- a/tests/data/adam/adam_multiple_devices_per_zone.json
+++ b/tests/data/adam/adam_multiple_devices_per_zone.json
@@ -193,7 +193,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "08963fec7c53423ca5680aa4cb502c63",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Thermostatic Radiator Badkamer 1",
     "sensors": {
@@ -334,7 +334,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "12493538af164a409c6a1c79e38afe1c",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Bios Cv Thermostatic Radiator ",
     "sensors": {
@@ -359,7 +359,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "c50f167537524366a5af7aa3942feb1e",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Floor kraan",
     "sensors": {
@@ -467,7 +467,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "82fa13f017d240daa0d0ea1775420f24",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Thermostatic Radiator Jessie",
     "sensors": {
@@ -535,7 +535,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "446ac08dd04d4eff8ac57489757b7314",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "CV Kraan Garage",
     "sensors": {
diff --git a/tests/data/adam/adam_plus_anna_new.json b/tests/data/adam/adam_plus_anna_new.json
index afa38abd8..cf8e4ab56 100644
--- a/tests/data/adam/adam_plus_anna_new.json
+++ b/tests/data/adam/adam_plus_anna_new.json
@@ -71,7 +71,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "f871b8c4d63549319221e294e4f88074",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Badkamer",
     "sensors": {
diff --git a/tests/data/adam/adam_plus_anna_new_regulation_off.json b/tests/data/adam/adam_plus_anna_new_regulation_off.json
index 10cd1add3..4a0576d90 100644
--- a/tests/data/adam/adam_plus_anna_new_regulation_off.json
+++ b/tests/data/adam/adam_plus_anna_new_regulation_off.json
@@ -45,7 +45,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "f871b8c4d63549319221e294e4f88074",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Badkamer",
     "sensors": {
diff --git a/tests/data/adam/adam_zone_per_device.json b/tests/data/adam/adam_zone_per_device.json
index c40afc0ba..ce3d258b4 100644
--- a/tests/data/adam/adam_zone_per_device.json
+++ b/tests/data/adam/adam_zone_per_device.json
@@ -190,7 +190,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "08963fec7c53423ca5680aa4cb502c63",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Thermostatic Radiator Badkamer",
     "sensors": {
@@ -331,7 +331,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "12493538af164a409c6a1c79e38afe1c",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Bios Cv Thermostatic Radiator ",
     "sensors": {
@@ -356,7 +356,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "c50f167537524366a5af7aa3942feb1e",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Floor kraan",
     "sensors": {
@@ -464,7 +464,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "82fa13f017d240daa0d0ea1775420f24",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Thermostatic Radiator Jessie",
     "sensors": {
@@ -532,7 +532,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "446ac08dd04d4eff8ac57489757b7314",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "CV Kraan Garage",
     "sensors": {