diff --git a/src/webui/service/templates/device/detail.html b/src/webui/service/templates/device/detail.html
index e49396c4f7971cb19fff5780d3830082f9422a5b..db1d9a8ef6b5b62ad3902f48fa3c48647df9e49e 100644
--- a/src/webui/service/templates/device/detail.html
+++ b/src/webui/service/templates/device/detail.html
@@ -17,7 +17,7 @@
 {% extends 'base.html' %}
 
 {% block content %}
-<h1>Device {{ device.device_id.device_uuid.uuid }}</h1>
+<h1>Device {{ device.name }} ({{ device.device_id.device_uuid.uuid }})</h1>
 
 <div class="row mb-3">
     <div class="col-sm-3">
@@ -44,6 +44,7 @@
 <div class="row mb-3">
     <div class="col-sm-4">
         <b>UUID: </b>{{ device.device_id.device_uuid.uuid }}<br><br>
+        <b>Name: </b>{{ device.name }}<br><br>
         <b>Type: </b>{{ device.device_type }}<br><br>
         <b>Status: </b> {{ dose.Name(device.device_operational_status).replace('DEVICEOPERATIONALSTATUS_', '') }}<br>
         <b>Drivers: </b>
@@ -57,7 +58,8 @@
         <table class="table table-striped table-hover">
             <thead>
                 <tr>
-                    <th scope="col">Endpoints</th>
+                    <th scope="col">Endpoint</th>
+                    <th scope="col">Name</th>
                     <th scope="col">Type</th>
                 </tr>
             </thead>
@@ -67,6 +69,9 @@
                     <td>
                         {{ endpoint.endpoint_id.endpoint_uuid.uuid }}
                     </td>
+                    <td>
+                        {{ endpoint.name }}
+                    </td>
                     <td>
                         {{ endpoint.endpoint_type }}
                     </td>