diff --git a/res/app/control-panes/device-control/device-control.jade b/res/app/control-panes/device-control/device-control.jade
index 3fc0e724..3d7531e8 100644
--- a/res/app/control-panes/device-control/device-control.jade
+++ b/res/app/control-panes/device-control/device-control.jade
@@ -21,7 +21,7 @@
             p
               .device-small-image
                 img(ng-src='/static/app/devices/icon/x24/{{ device.image || "E30HT.jpg" }}')
-              span.device-name-text {{ device.name }}
+              span.device-name-text {{ device.enhancedName }}
               span.caret(ng-show='groupDevices.length > 0')
             //span(ng-show='device && !device.present', translate) (Absent)
 
@@ -31,7 +31,7 @@
                 .pull-left
                   .device-small-image
                     img(ng-src='/static/app/devices/icon/x24/{{ groupDevice.image || "E30HT.jpg" }}')
-                  span(ng-class='{"current-device": groupDevice.serial === device.serial }') {{ groupDevice.name }}
+                  span(ng-class='{"current-device": groupDevice.serial === device.serial }') {{ groupDevice.enhancedName }}
 
                 .pull-right(ng-click='kickDevice(groupDevice); $event.stopPropagation()').kick-device
                   i.fa.fa-times