diff --git a/netbox/templates/dcim/device_delete.html b/netbox/templates/dcim/device_delete.html
index 5d1b0a394..587dad0b7 100644
--- a/netbox/templates/dcim/device_delete.html
+++ b/netbox/templates/dcim/device_delete.html
@@ -1,8 +1,8 @@
 {% extends 'utilities/confirmation_form.html' %}
 {% load form_helpers %}
 
-{% block title %}Delete device {{ device }}?{% endblock %}
+{% block title %}Delete device {{ obj }}?{% endblock %}
 
 {% block message %}
-    <p>Are you sure you want to delete <strong>{{ device }}</strong>?</p>
+    <p>Are you sure you want to delete <strong>{{ obj }}</strong>?</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html
index 86ab2be81..dfc1ad5d2 100644
--- a/netbox/templates/dcim/device_edit.html
+++ b/netbox/templates/dcim/device_edit.html
@@ -1,11 +1,11 @@
 {% extends '_base.html' %}
 {% load form_helpers %}
 
-{% block title %}{% if device %}Editing device {{ device }}{% else %}Add a device{% endif %}{% endblock %}
+{% block title %}{% if obj %}Editing device {{ obj }}{% else %}Add a device{% endif %}{% endblock %}
 
 {% block content %}
-{% if device %}
-	<h1>{{ device }}</h1>
+{% if obj %}
+	<h1>{{ obj }}</h1>
 {% else %}
 	<h1>Add a Device</h1>
 {% endif %}
@@ -62,7 +62,7 @@
                 <div class="panel-body">
                     {% render_field form.platform %}
                     {% render_field form.status %}
-                    {% if device %}{% render_field form.primary_ip %}{% endif %}
+                    {% if obj %}{% render_field form.primary_ip %}{% endif %}
                     {% render_field form.ro_snmp %}
                 </div>
             </div>
@@ -70,9 +70,9 @@
     </div>
     <div class="row">
         <div class="col-md-12 text-right">
-            {% if device %}
+            {% if obj %}
                 <button type="submit" name="_update" class="btn btn-primary">Update</button>
-                <a href="{% url 'dcim:device' pk=device.pk %}" class="btn btn-default">Cancel</a>
+                <a href="{% url 'dcim:device' pk=obj.pk %}" class="btn btn-default">Cancel</a>
             {% else %}
                 <button type="submit" name="_create" class="btn btn-primary">Create</button>
                 <button type="submit" name="_addanother" class="btn btn-primary">Create and Add Another</button>