diff --git a/netbox/secrets/models.py b/netbox/secrets/models.py
index 5ffd2fa57..317fe0dd5 100644
--- a/netbox/secrets/models.py
+++ b/netbox/secrets/models.py
@@ -288,6 +288,9 @@ class Secret(CreatedUpdatedModel):
     def __str__(self):
         if self.role and self.device and self.name:
             return '{} for {} ({})'.format(self.role, self.device, self.name)
+        # Return role and device if no name is set
+        if self.role and self.device:
+            return '{} for {}'.format(self.role, self.device)
         return 'Secret'
 
     def get_absolute_url(self):
diff --git a/netbox/templates/dcim/inc/rack_elevation.html b/netbox/templates/dcim/inc/rack_elevation.html
index 64381841e..e6b721db4 100644
--- a/netbox/templates/dcim/inc/rack_elevation.html
+++ b/netbox/templates/dcim/inc/rack_elevation.html
@@ -27,13 +27,13 @@
                     {% ifequal u.device.face face_id %}
                         <a href="{% url 'dcim:device' pk=u.device.pk %}" data-toggle="popover" data-trigger="hover" data-container="body" data-html="true"
                            data-content="{{ u.device.device_role }}<br />{{ u.device.device_type.full_name }} ({{ u.device.device_type.u_height }}U){% if u.device.asset_tag %}<br />{{ u.device.asset_tag }}{% endif %}">
-                            {{ u.device|default:u.device.device_role }}
+                            {{ u.device.name|default:u.device.device_role }}
                             {% if u.device.devicebay_count %}
                                 ({{ u.device.get_children.count }}/{{ u.device.devicebay_count }})
                             {% endif %}
                         </a>
                     {% else %}
-                        <span>{{ u.device|default:u.device.device_role }}</span>
+                        <span>{{ u.device.name|default:u.device.device_role }}</span>
                     {% endifequal %}
                 </li>
             {% else %}
diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html
index 8c2df0713..5304538c1 100644
--- a/netbox/templates/dcim/rack_elevation_list.html
+++ b/netbox/templates/dcim/rack_elevation_list.html
@@ -14,7 +14,7 @@
                 {% for rack in page %}
                     <div style="display: inline-block; width: 266px">
                         <div class="rack_header">
-                            <strong><a href="{% url 'dcim:rack' pk=rack.pk %}">{{ rack|truncatechars:"25" }}</a></strong>
+                            <strong><a href="{% url 'dcim:rack' pk=rack.pk %}">{{ rack.name|truncatechars:"25" }}</a></strong>
                             <p><small class="text-muted">{{ rack.facility_id|truncatechars:"30" }}</small></p>
                         </div>
                         {% if face_id %}
@@ -24,7 +24,7 @@
                         {% endif %}
                         <div class="clearfix"></div>
                         <div class="rack_header">
-                            <strong><a href="{% url 'dcim:rack' pk=rack.pk %}">{{ rack|truncatechars:"25" }}</a></strong>
+                            <strong><a href="{% url 'dcim:rack' pk=rack.pk %}">{{ rack.name|truncatechars:"25" }}</a></strong>
                             <p><small class="text-muted">{{ rack.facility_id|truncatechars:"30" }}</small></p>
                         </div>
                     </div>
diff --git a/netbox/templates/ipam/inc/service.html b/netbox/templates/ipam/inc/service.html
index 6eef80485..a88aff4ce 100644
--- a/netbox/templates/ipam/inc/service.html
+++ b/netbox/templates/ipam/inc/service.html
@@ -1,5 +1,5 @@
 <tr>
-    <td>{{ service }}</td>
+    <td>{{ service.name }}</td>
     <td>
         {{ service.get_protocol_display }}/{{ service.port }}
     </td>
diff --git a/netbox/templates/secrets/inc/secret_tr.html b/netbox/templates/secrets/inc/secret_tr.html
index 1e0c3c7dc..b64b334e8 100644
--- a/netbox/templates/secrets/inc/secret_tr.html
+++ b/netbox/templates/secrets/inc/secret_tr.html
@@ -1,7 +1,7 @@
 {% load secret_helpers %}
 <tr>
     <td><a href="{% url 'secrets:secret' pk=secret.pk %}">{{ secret.role }}</a></td>
-    <td>{{ secret }}</td>
+    <td>{{ secret.name }}</td>
     <td id="secret_{{ secret.pk }}">********</td>
     <td class="text-right">
         {% if secret|decryptable_by:request.user %}