diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py
index ced3f7a60..912fceb11 100644
--- a/netbox/netbox/views/generic/bulk_views.py
+++ b/netbox/netbox/views/generic/bulk_views.py
@@ -304,7 +304,7 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):
     Attributes:
         model_form: The form used to create each imported object
     """
-    template_name = 'generic/object_bulk_import.html'
+    template_name = 'generic/bulk_import.html'
     model_form = None
 
     def _import_form(self, *args, **kwargs):
@@ -434,7 +434,7 @@ class BulkEditView(GetReturnURLMixin, BaseMultiObjectView):
         filterset: FilterSet to apply when deleting by QuerySet
         form: The form class used to edit objects in bulk
     """
-    template_name = 'generic/object_bulk_edit.html'
+    template_name = 'generic/bulk_edit.html'
     filterset = None
     form = None
 
@@ -590,7 +590,7 @@ class BulkRenameView(GetReturnURLMixin, BaseMultiObjectView):
     """
     An extendable view for renaming objects in bulk.
     """
-    template_name = 'generic/object_bulk_rename.html'
+    template_name = 'generic/bulk_rename.html'
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -681,7 +681,7 @@ class BulkDeleteView(GetReturnURLMixin, BaseMultiObjectView):
         filterset: FilterSet to apply when deleting by QuerySet
         table: The table used to display devices being deleted
     """
-    template_name = 'generic/object_bulk_delete.html'
+    template_name = 'generic/bulk_delete.html'
     filterset = None
     table = None
 
@@ -775,7 +775,7 @@ class BulkComponentCreateView(GetReturnURLMixin, BaseMultiObjectView):
     """
     Add one or more components (e.g. interfaces, console ports, etc.) to a set of Devices or VirtualMachines.
     """
-    template_name = 'generic/object_bulk_add_component.html'
+    template_name = 'generic/bulk_add_component.html'
     parent_model = None
     parent_field = None
     form = None
diff --git a/netbox/templates/dcim/device_import.html b/netbox/templates/dcim/device_import.html
index caf94ada6..b30de60c2 100644
--- a/netbox/templates/dcim/device_import.html
+++ b/netbox/templates/dcim/device_import.html
@@ -1,4 +1,4 @@
-{% extends 'generic/object_bulk_import.html' %}
+{% extends 'generic/bulk_import.html' %}
 
 {% block tabs %}
   {% include 'dcim/inc/device_import_header.html' %}
diff --git a/netbox/templates/dcim/device_import_child.html b/netbox/templates/dcim/device_import_child.html
index bec8b21a8..d0dc72b61 100644
--- a/netbox/templates/dcim/device_import_child.html
+++ b/netbox/templates/dcim/device_import_child.html
@@ -1,4 +1,4 @@
-{% extends 'generic/object_bulk_import.html' %}
+{% extends 'generic/bulk_import.html' %}
 
 {% block tabs %}
   {% include 'dcim/inc/device_import_header.html' with active_tab='child_import' %}
diff --git a/netbox/templates/dcim/inventoryitem_bulk_delete.html b/netbox/templates/dcim/inventoryitem_bulk_delete.html
index fc31537b3..6f5735c33 100644
--- a/netbox/templates/dcim/inventoryitem_bulk_delete.html
+++ b/netbox/templates/dcim/inventoryitem_bulk_delete.html
@@ -1,4 +1,4 @@
-{% extends 'generic/object_bulk_delete.html' %}
+{% extends 'generic/bulk_delete.html' %}
 
 {% block message_extra %}
     <p class="text-center text-danger"><i class="mdi mdi-alert"></i> This will also delete all child inventory items of those listed.</p>
diff --git a/netbox/templates/generic/object_bulk_add_component.html b/netbox/templates/generic/bulk_add_component.html
similarity index 100%
rename from netbox/templates/generic/object_bulk_add_component.html
rename to netbox/templates/generic/bulk_add_component.html
diff --git a/netbox/templates/generic/object_bulk_delete.html b/netbox/templates/generic/bulk_delete.html
similarity index 100%
rename from netbox/templates/generic/object_bulk_delete.html
rename to netbox/templates/generic/bulk_delete.html
diff --git a/netbox/templates/generic/object_bulk_edit.html b/netbox/templates/generic/bulk_edit.html
similarity index 100%
rename from netbox/templates/generic/object_bulk_edit.html
rename to netbox/templates/generic/bulk_edit.html
diff --git a/netbox/templates/generic/object_bulk_import.html b/netbox/templates/generic/bulk_import.html
similarity index 100%
rename from netbox/templates/generic/object_bulk_import.html
rename to netbox/templates/generic/bulk_import.html
diff --git a/netbox/templates/generic/object_bulk_remove.html b/netbox/templates/generic/bulk_remove.html
similarity index 100%
rename from netbox/templates/generic/object_bulk_remove.html
rename to netbox/templates/generic/bulk_remove.html
diff --git a/netbox/templates/generic/object_bulk_rename.html b/netbox/templates/generic/bulk_rename.html
similarity index 100%
rename from netbox/templates/generic/object_bulk_rename.html
rename to netbox/templates/generic/bulk_rename.html
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 0957e28a2..686e625a5 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -266,7 +266,7 @@ class ClusterAddDevicesView(generic.ObjectEditView):
 class ClusterRemoveDevicesView(generic.ObjectEditView):
     queryset = Cluster.objects.all()
     form = forms.ClusterRemoveDevicesForm
-    template_name = 'generic/object_bulk_remove.html'
+    template_name = 'generic/bulk_remove.html'
 
     def post(self, request, pk):