diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index f514deca4..d0283f6a0 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -367,7 +367,7 @@ class ComponentTemplateCreateView(View):
 
         devicetype = get_object_or_404(DeviceType, pk=pk)
 
-        return render(request, 'dcim/component_template_add.html', {
+        return render(request, 'dcim/devicetype_component_add.html', {
             'devicetype': devicetype,
             'component_type': self.model._meta.verbose_name,
             'form': self.form(initial=request.GET),
@@ -400,7 +400,7 @@ class ComponentTemplateCreateView(View):
                 else:
                     return redirect('dcim:devicetype', pk=devicetype.pk)
 
-        return render(request, 'dcim/component_template_add.html', {
+        return render(request, 'dcim/devicetype_component_add.html', {
             'devicetype': devicetype,
             'component_type': self.model._meta.verbose_name,
             'form': form,
diff --git a/netbox/templates/dcim/component_template_delete.html b/netbox/templates/dcim/component_template_delete.html
deleted file mode 100644
index a1302feb7..000000000
--- a/netbox/templates/dcim/component_template_delete.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends 'utilities/confirmation_form.html' %}
-{% load form_helpers %}
-
-{% block title %}Delete device type components?{% endblock %}
-
-{% block message %}
-    <p>Are you sure you want to delete these components from <strong>{{ devicetype }}</strong>?</p>
-    <ul>
-        {% for o in selected_objects %}
-            <li>{{ o }}</li>
-        {% endfor %}
-    </ul>
-{% endblock %}
diff --git a/netbox/templates/dcim/component_template_add.html b/netbox/templates/dcim/devicetype_component_add.html
similarity index 100%
rename from netbox/templates/dcim/component_template_add.html
rename to netbox/templates/dcim/devicetype_component_add.html