diff --git a/netbox/templates/dcim/device/consoleports.html b/netbox/templates/dcim/device/consoleports.html
index fba99fba5..22d8cdb4f 100644
--- a/netbox/templates/dcim/device/consoleports.html
+++ b/netbox/templates/dcim/device/consoleports.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_consoleport %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:consoleport_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_consoleports' pk=object.pk %}"
diff --git a/netbox/templates/dcim/device/consoleserverports.html b/netbox/templates/dcim/device/consoleserverports.html
index b1fe4a1bc..84d1cbeff 100644
--- a/netbox/templates/dcim/device/consoleserverports.html
+++ b/netbox/templates/dcim/device/consoleserverports.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_consoleserverport %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:consoleserverport_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_consoleserverports' pk=object.pk %}"
diff --git a/netbox/templates/dcim/device/devicebays.html b/netbox/templates/dcim/device/devicebays.html
index eb99b4265..1b304b827 100644
--- a/netbox/templates/dcim/device/devicebays.html
+++ b/netbox/templates/dcim/device/devicebays.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_devicebay %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:devicebay_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_devicebays' pk=object.pk %}"
diff --git a/netbox/templates/dcim/device/frontports.html b/netbox/templates/dcim/device/frontports.html
index 1b26db3e5..2f9ec7df6 100644
--- a/netbox/templates/dcim/device/frontports.html
+++ b/netbox/templates/dcim/device/frontports.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_frontport %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:frontport_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_frontports' pk=object.pk %}"
diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html
index 843f12444..d92bfa2f3 100644
--- a/netbox/templates/dcim/device/interfaces.html
+++ b/netbox/templates/dcim/device/interfaces.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_interface %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:interface_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_interfaces' pk=object.pk %}"
diff --git a/netbox/templates/dcim/device/inventory.html b/netbox/templates/dcim/device/inventory.html
index 2f07a7dca..9e1590a28 100644
--- a/netbox/templates/dcim/device/inventory.html
+++ b/netbox/templates/dcim/device/inventory.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_inventoryitem %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:inventoryitem_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_inventory' pk=object.pk %}"
diff --git a/netbox/templates/dcim/device/modulebays.html b/netbox/templates/dcim/device/modulebays.html
index 31057af80..46a9c76ac 100644
--- a/netbox/templates/dcim/device/modulebays.html
+++ b/netbox/templates/dcim/device/modulebays.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_modulebay %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:modulebay_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_modulebays' pk=object.pk %}"
diff --git a/netbox/templates/dcim/device/poweroutlets.html b/netbox/templates/dcim/device/poweroutlets.html
index 735ada210..8c8f7eebd 100644
--- a/netbox/templates/dcim/device/poweroutlets.html
+++ b/netbox/templates/dcim/device/poweroutlets.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_poweroutlet %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:poweroutlet_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_poweroutlets' pk=object.pk %}"
diff --git a/netbox/templates/dcim/device/powerports.html b/netbox/templates/dcim/device/powerports.html
index 43667e226..defbb0d02 100644
--- a/netbox/templates/dcim/device/powerports.html
+++ b/netbox/templates/dcim/device/powerports.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_powerport %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:powerport_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_powerports' pk=object.pk %}"
diff --git a/netbox/templates/dcim/device/rearports.html b/netbox/templates/dcim/device/rearports.html
index c5babc6f4..569b5c2f2 100644
--- a/netbox/templates/dcim/device/rearports.html
+++ b/netbox/templates/dcim/device/rearports.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_rearport %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:rearport_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_rearports' pk=object.pk %}"
diff --git a/netbox/templates/generic/object_tab.html b/netbox/templates/generic/object_tab.html
index 25329f66c..ed2c91c6b 100644
--- a/netbox/templates/generic/object_tab.html
+++ b/netbox/templates/generic/object_tab.html
@@ -11,8 +11,8 @@
             </div>
         </div>
 
-        {% block bulk_controls %}
-            <div class="noprint bulk-buttons">
+        <div class="noprint bulk-buttons">
+            {% block bulk_controls %}
                 <div class="bulk-button-group">
                     {% if 'bulk_edit' in actions %}
                         <div class="btn-group" role="group">
@@ -59,10 +59,8 @@
                         {% endif %}
                     </div>
                 </div>
-                {% block extra_contols_bottom %}
-                {% endblock %}
-            </div>
-        {% endblock %}
+            {% endblock %}
+        </div>
     </form>
 {% endblock content %}