diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index 0948610c8..3bc7f5714 100644
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -41,7 +41,7 @@
         {% endif %}
     </div>
     <h1>{{ object }}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index ce691c237..16340ac7b 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -41,7 +41,7 @@
         {% endif %}
     </div>
     <h1>{{ object }}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html
index 51d4e6978..e80cb5a24 100644
--- a/netbox/templates/dcim/cable.html
+++ b/netbox/templates/dcim/cable.html
@@ -23,7 +23,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}Cable {{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
diff --git a/netbox/templates/dcim/device/base.html b/netbox/templates/dcim/device/base.html
index 675f60ec1..2ee046f91 100644
--- a/netbox/templates/dcim/device/base.html
+++ b/netbox/templates/dcim/device/base.html
@@ -82,7 +82,7 @@
         {% endif %}
     </div>
     <h1>{{ object }}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index b1062b8e1..3988c77ee 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -62,7 +62,7 @@
         {% endif %}
     </div>
     <h1>{{ object.manufacturer }} {{ object.model }}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html
index 16fa2fe93..3b4b8b1c0 100644
--- a/netbox/templates/dcim/powerfeed.html
+++ b/netbox/templates/dcim/powerfeed.html
@@ -44,7 +44,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}{{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html
index b5358b86a..a405a8a09 100644
--- a/netbox/templates/dcim/powerpanel.html
+++ b/netbox/templates/dcim/powerpanel.html
@@ -40,7 +40,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}{{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=powerpanel %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
@@ -85,7 +85,7 @@
         {% plugin_left_page object %}
     </div>
 	<div class="col-md-6">
-        {% include 'inc/custom_fields_panel.html' with obj=powerpanel %}
+        {% include 'inc/custom_fields_panel.html' with obj=object %}
         {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:powerpanel_list' %}
         {% plugin_right_page object %}
     </div>
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 0e96e54dc..6c3d0bbe7 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -52,7 +52,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}Rack {{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         <button class="btn btn-sm btn-default toggle-images" selected="selected">
             <span class="mdi mdi-checkbox-marked-circle-outline" aria-hidden="true"></span> Show Images
diff --git a/netbox/templates/dcim/rackreservation.html b/netbox/templates/dcim/rackreservation.html
index a3eccaaab..1b7d2d392 100644
--- a/netbox/templates/dcim/rackreservation.html
+++ b/netbox/templates/dcim/rackreservation.html
@@ -37,7 +37,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}{{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=rackreservation %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
@@ -122,7 +122,7 @@
                 </tr>
             </table>
         </div>
-        {% include 'inc/custom_fields_panel.html' with obj=rackreservation %}
+        {% include 'inc/custom_fields_panel.html' with obj=object %}
         {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:rackreservation_list' %}
         {% plugin_left_page object %}
 	</div>
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index 0a06235ef..9123c1def 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -46,7 +46,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}{{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html
index 72f5140e9..190eebba6 100644
--- a/netbox/templates/dcim/virtualchassis.html
+++ b/netbox/templates/dcim/virtualchassis.html
@@ -38,7 +38,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}{{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
diff --git a/netbox/templates/extras/tag.html b/netbox/templates/extras/tag.html
index f77aa0221..2ad7cf814 100644
--- a/netbox/templates/extras/tag.html
+++ b/netbox/templates/extras/tag.html
@@ -37,7 +37,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}Tag: {{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=tag %}
+    {% include 'inc/created_updated.html' %}
     <ul class="nav nav-tabs">
         <li role="presentation"{% if not active_tab %} class="active"{% endif %}>
             <a href="{{ object.get_absolute_url }}">Tag</a>
diff --git a/netbox/templates/inc/created_updated.html b/netbox/templates/inc/created_updated.html
index 001bb6b85..58be428c4 100644
--- a/netbox/templates/inc/created_updated.html
+++ b/netbox/templates/inc/created_updated.html
@@ -1,3 +1,3 @@
 <p>
-    <small class="text-muted">Created {{ obj.created }} &middot; Updated <span title="{{ obj.last_updated }}">{{ obj.last_updated|timesince }}</span> ago</small>
+    <small class="text-muted">Created {{ object.created }} &middot; Updated <span title="{{ object.last_updated }}">{{ object.last_updated|timesince }}</span> ago</small>
 </p>
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index 1dfb7af69..bfdc43cfe 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -39,7 +39,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}{{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     {% include 'ipam/inc/toggle_available.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index ecade75aa..76b752752 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -42,7 +42,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}{{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html
index 24711db6a..3e29ce5c7 100644
--- a/netbox/templates/ipam/prefix.html
+++ b/netbox/templates/ipam/prefix.html
@@ -52,7 +52,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}{{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     {% include 'ipam/inc/toggle_available.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
diff --git a/netbox/templates/ipam/routetarget.html b/netbox/templates/ipam/routetarget.html
index 4bd954038..5ef7ffa26 100644
--- a/netbox/templates/ipam/routetarget.html
+++ b/netbox/templates/ipam/routetarget.html
@@ -38,7 +38,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}Route target {{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
diff --git a/netbox/templates/ipam/service.html b/netbox/templates/ipam/service.html
index c1d0c3c4d..28c548f83 100644
--- a/netbox/templates/ipam/service.html
+++ b/netbox/templates/ipam/service.html
@@ -36,7 +36,7 @@
     {% endif %}
 </div>
 <h1>{% block title %}{{ object }}{% endblock %}</h1>
-{% include 'inc/created_updated.html' with obj=service %}
+{% include 'inc/created_updated.html' %}
 <div class="pull-right noprint">
     {% custom_links object %}
 </div>
@@ -81,7 +81,7 @@
                 </tr>
 		    </table>
         </div>
-        {% include 'inc/custom_fields_panel.html' with obj=service %}
+        {% include 'inc/custom_fields_panel.html' with obj=object %}
         {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='ipam:service_list' %}
         {% plugin_left_page object %}
     </div>
diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html
index d5f421474..784fe0e3f 100644
--- a/netbox/templates/ipam/vlan.html
+++ b/netbox/templates/ipam/vlan.html
@@ -44,7 +44,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}VLAN {{ object.display_name }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html
index c7ff7d6ea..92cf1b7c9 100644
--- a/netbox/templates/ipam/vrf.html
+++ b/netbox/templates/ipam/vrf.html
@@ -38,7 +38,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}VRF {{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
diff --git a/netbox/templates/secrets/secret.html b/netbox/templates/secrets/secret.html
index c5085110b..b7ee22a59 100644
--- a/netbox/templates/secrets/secret.html
+++ b/netbox/templates/secrets/secret.html
@@ -26,7 +26,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}{{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=secret %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
@@ -66,7 +66,7 @@
                 </tr>
             </table>
         </div>
-        {% include 'inc/custom_fields_panel.html' with obj=secret %}
+        {% include 'inc/custom_fields_panel.html' with obj=object %}
         {% plugin_left_page object %}
 	</div>
 	<div class="col-md-6">
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html
index c7d4b875d..4c59bee1d 100644
--- a/netbox/templates/tenancy/tenant.html
+++ b/netbox/templates/tenancy/tenant.html
@@ -41,7 +41,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}{{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
diff --git a/netbox/templates/virtualization/cluster.html b/netbox/templates/virtualization/cluster.html
index 52aa6e34e..a4e7e3a1c 100644
--- a/netbox/templates/virtualization/cluster.html
+++ b/netbox/templates/virtualization/cluster.html
@@ -41,7 +41,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}{{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 6583e10e4..ea123790e 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -46,7 +46,7 @@
         {% endif %}
     </div>
     <h1>{% block title %}{{ object }}{% endblock %}</h1>
-    {% include 'inc/created_updated.html' with obj=object %}
+    {% include 'inc/created_updated.html' %}
     <div class="pull-right noprint">
         {% custom_links object %}
     </div>