diff --git a/libnymea-app/models/interfacesproxy.cpp b/libnymea-app/models/interfacesproxy.cpp
index b16eea8c..059e92d6 100644
--- a/libnymea-app/models/interfacesproxy.cpp
+++ b/libnymea-app/models/interfacesproxy.cpp
@@ -98,11 +98,11 @@ bool InterfacesProxy::filterAcceptsRow(int source_row, const QModelIndex &source
         }
     }
 
-    if (m_devicesFilter != nullptr) {
+    if (m_thingsFilter != nullptr) {
         // TODO: This could be improved *a lot* by caching interfaces in the devices model...
         bool found = false;
-        for (int i = 0; i < m_devicesFilter->rowCount(); i++) {
-            Device *d = m_devicesFilter->get(i);
+        for (int i = 0; i < m_thingsFilter->rowCount(); i++) {
+            Device *d = m_thingsFilter->get(i);
             if (!d->thingClass()) {
                 qWarning() << "Cannot find DeviceClass for device:" << d->id() << d->name();
                 return false;
@@ -116,11 +116,11 @@ bool InterfacesProxy::filterAcceptsRow(int source_row, const QModelIndex &source
             return false;
         }
     }
-    if (m_devicesProxyFilter != nullptr) {
+    if (m_thingsProxyFilter != nullptr) {
         // TODO: This could be improved *a lot* by caching interfaces in the devices model...
         bool found = false;
-        for (int i = 0; i < m_devicesProxyFilter->rowCount(); i++) {
-            Device *d = m_devicesProxyFilter->get(i);
+        for (int i = 0; i < m_thingsProxyFilter->rowCount(); i++) {
+            Device *d = m_thingsProxyFilter->get(i);
             if (!d->thingClass()) {
                 qWarning() << "Cannot find ThingClass for thing:" << d->id() << d->name();
                 return false;
diff --git a/libnymea-app/models/interfacesproxy.h b/libnymea-app/models/interfacesproxy.h
index 30f0049b..271c681c 100644
--- a/libnymea-app/models/interfacesproxy.h
+++ b/libnymea-app/models/interfacesproxy.h
@@ -44,8 +44,8 @@ class InterfacesProxy: public QSortFilterProxyModel
     Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
 
     Q_PROPERTY(QStringList shownInterfaces READ shownInterfaces WRITE setShownInterfaces NOTIFY shownInterfacesChanged)
-    Q_PROPERTY(Devices* devicesFilter READ devicesFilter WRITE setDevicesFilter NOTIFY devicesFilterChanged)
-    Q_PROPERTY(DevicesProxy* devicesProxyFilter READ devicesProxyFilter WRITE setDevicesProxyFilter NOTIFY devicesProxyFilterChanged)
+    Q_PROPERTY(Devices* thingsFilter READ thingsFilter WRITE setThingsFilter NOTIFY thingsFilterChanged)
+    Q_PROPERTY(DevicesProxy* thingsProxyFilter READ thingsProxyFilter WRITE setThingsProxyFilter NOTIFY thingsProxyFilterChanged)
     Q_PROPERTY(bool showEvents READ showEvents WRITE setShowEvents NOTIFY showEventsChanged)
     Q_PROPERTY(bool showActions READ showActions WRITE setShowActions NOTIFY showActionsChanged)
     Q_PROPERTY(bool showStates READ showStates WRITE setShowStates NOTIFY showStatesChanged)
@@ -56,11 +56,11 @@ public:
     QStringList shownInterfaces() const { return m_shownInterfaces; }
     void setShownInterfaces(const QStringList &shownInterfaces) { m_shownInterfaces = shownInterfaces; emit shownInterfacesChanged(); invalidateFilter(); }
 
-    Devices* devicesFilter() const { return m_devicesFilter; }
-    void setDevicesFilter(Devices *devices) { m_devicesFilter = devices; emit devicesFilterChanged(); invalidateFilter(); }
+    Devices* thingsFilter() const { return m_thingsFilter; }
+    void setThingsFilter(Devices *things) { m_thingsFilter = things; emit thingsFilterChanged(); invalidateFilter(); }
 
-    DevicesProxy* devicesProxyFilter() const { return m_devicesProxyFilter; }
-    void setDevicesProxyFilter(DevicesProxy *devicesProxy) { m_devicesProxyFilter = devicesProxy; emit devicesProxyFilterChanged(); invalidateFilter(); }
+    DevicesProxy* thingsProxyFilter() const { return m_thingsProxyFilter; }
+    void setThingsProxyFilter(DevicesProxy *thingsProxy) { m_thingsProxyFilter = thingsProxy; emit thingsProxyFilterChanged(); invalidateFilter(); }
 
     bool showEvents() const;
     void setShowEvents(bool showEvents);
@@ -78,8 +78,8 @@ public:
 
 signals:
     void shownInterfacesChanged();
-    void devicesFilterChanged();
-    void devicesProxyFilterChanged();
+    void thingsFilterChanged();
+    void thingsProxyFilterChanged();
     void showEventsChanged();
     void showActionsChanged();
     void showStatesChanged();
@@ -89,8 +89,8 @@ signals:
 private:
     Interfaces *m_interfaces = nullptr;
     QStringList m_shownInterfaces;
-    Devices* m_devicesFilter = nullptr;
-    DevicesProxy* m_devicesProxyFilter = nullptr;
+    Devices* m_thingsFilter = nullptr;
+    DevicesProxy* m_thingsProxyFilter = nullptr;
     bool m_showEvents = false;
     bool m_showActions = false;
     bool m_showStates = false;
diff --git a/nymea-app/ui/customviews/ThermostatController.qml b/nymea-app/ui/customviews/ThermostatController.qml
index 73a990ae..19a0beb8 100644
--- a/nymea-app/ui/customviews/ThermostatController.qml
+++ b/nymea-app/ui/customviews/ThermostatController.qml
@@ -136,7 +136,7 @@ Item {
             ctx.beginPath();
             ctx.font = "" + app.hugeFont + "px " + Style.fontFamily;
             ctx.fillStyle = Style.foregroundColor;
-            var roundedTargetTemp = Types.toUiValue(root.targetTemperatureState.value, root.targetTemperatureStateType.unit)
+            var roundedTargetTemp = Types.toUiValue(currentValue, root.targetTemperatureStateType.unit)
             roundedTargetTemp = roundToPrecision(roundedTargetTemp).toFixed(1) + "°"
             var size = ctx.measureText(roundedTargetTemp)
             ctx.text(roundedTargetTemp, center.x - size.width / 2, center.y + app.hugeFont / 2);
diff --git a/nymea-app/ui/grouping/GroupThingsPage.qml b/nymea-app/ui/grouping/GroupThingsPage.qml
index 6966be01..f800bc16 100644
--- a/nymea-app/ui/grouping/GroupThingsPage.qml
+++ b/nymea-app/ui/grouping/GroupThingsPage.qml
@@ -54,7 +54,7 @@ Page {
 
     InterfacesProxy {
         id: interfacesInGroup
-        devicesProxyFilter: devicesInGroup
+        thingsProxyFilter: devicesInGroup
         showStates: true
     }
 
diff --git a/nymea-app/ui/magic/SelectThingPage.qml b/nymea-app/ui/magic/SelectThingPage.qml
index 512a14dd..6e5d0f2c 100644
--- a/nymea-app/ui/magic/SelectThingPage.qml
+++ b/nymea-app/ui/magic/SelectThingPage.qml
@@ -70,7 +70,7 @@ Page {
 
     InterfacesProxy {
         id: interfacesProxy
-        devicesFilter: engine.deviceManager.devices
+        thingsFilter: engine.thingManager.things
     }
 
     DevicesProxy {