diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 5bfb70cd3..53273da47 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -6,7 +6,7 @@
 {% block title %}{{ device }}{% endblock %}
 
 {% block content %}
-{% include 'dcim/inc/_device_header.html' with active_tab='info' %}
+{% include 'dcim/inc/device_header.html' with active_tab='info' %}
 <div class="row">
 	<div class="col-md-5 col-lg-6">
         <div class="panel panel-default">
@@ -183,7 +183,7 @@
             {% if ip_addresses %}
                 <table class="table table-hover panel-body">
                     {% for ip in ip_addresses %}
-                        {% include 'dcim/inc/_ipaddress.html' %}
+                        {% include 'dcim/inc/ipaddress.html' %}
                     {% endfor %}
                 </table>
             {% elif interfaces or mgmt_interfaces %}
@@ -212,7 +212,7 @@
             {% if services %}
                 <table class="table table-hover panel-body">
                     {% for service in services %}
-                        {% include 'dcim/inc/_service.html' %}
+                        {% include 'dcim/inc/service.html' %}
                     {% endfor %}
                 </table>
             {% else %}
@@ -234,7 +234,7 @@
             </div>
             <table class="table table-hover panel-body">
                 {% for iface in mgmt_interfaces %}
-                    {% include 'dcim/inc/_interface.html' with icon='wrench' %}
+                    {% include 'dcim/inc/interface.html' with icon='wrench' %}
                 {% empty %}
                     <tr>
                         <td colspan="5" class="alert-warning">
@@ -246,7 +246,7 @@
                     </tr>
                 {% endfor %}
                 {% for cp in console_ports %}
-                    {% include 'dcim/inc/_consoleport.html' %}
+                    {% include 'dcim/inc/consoleport.html' %}
                 {% empty %}
                     <tr>
                         <td colspan="5" class="alert-warning">
@@ -258,7 +258,7 @@
                     </tr>
                 {% endfor %}
                 {% for pp in power_ports %}
-                    {% include 'dcim/inc/_powerport.html' %}
+                    {% include 'dcim/inc/powerport.html' %}
                 {% empty %}
                     <tr>
                         <td colspan="5" class="alert-warning">
@@ -349,7 +349,7 @@
                 </div>
                 <table class="table table-hover panel-body">
                     {% for devicebay in device_bays %}
-                        {% include 'dcim/inc/_devicebay.html' with selectable=True %}
+                        {% include 'dcim/inc/devicebay.html' with selectable=True %}
                     {% empty %}
                         <tr>
                             <td colspan="4">No device bays defined</td>
@@ -401,7 +401,7 @@
                 </div>
                 <table class="table table-hover panel-body">
                     {% for iface in interfaces %}
-                        {% include 'dcim/inc/_interface.html' with selectable=True %}
+                        {% include 'dcim/inc/interface.html' with selectable=True %}
                     {% empty %}
                         <tr>
                             <td colspan="4">No interfaces defined</td>
@@ -458,7 +458,7 @@
                 </div>
                 <table class="table table-hover panel-body">
                     {% for csp in cs_ports %}
-                        {% include 'dcim/inc/_consoleserverport.html' with selectable=True %}
+                        {% include 'dcim/inc/consoleserverport.html' with selectable=True %}
                     {% empty %}
                         <tr>
                             <td colspan="4">No console server ports defined</td>
@@ -510,7 +510,7 @@
                 </div>
                 <table class="table table-hover panel-body">
                     {% for po in power_outlets %}
-                        {% include 'dcim/inc/_poweroutlet.html' with selectable=True %}
+                        {% include 'dcim/inc/poweroutlet.html' with selectable=True %}
                     {% empty %}
                         <tr>
                             <td colspan="4">No power outlets defined</td>
diff --git a/netbox/templates/dcim/device_import.html b/netbox/templates/dcim/device_import.html
index a603ab4ef..c075abe34 100644
--- a/netbox/templates/dcim/device_import.html
+++ b/netbox/templates/dcim/device_import.html
@@ -5,7 +5,7 @@
 {% block title %}Device Import{% endblock %}
 
 {% block content %}
-{% include 'dcim/inc/_device_import_header.html' %}
+{% include 'dcim/inc/device_import_header.html' %}
 <div class="row">
 	<div class="col-md-12">
 		<form action="." method="post" class="form">
diff --git a/netbox/templates/dcim/device_import_child.html b/netbox/templates/dcim/device_import_child.html
index eed987d46..cf5d96e79 100644
--- a/netbox/templates/dcim/device_import_child.html
+++ b/netbox/templates/dcim/device_import_child.html
@@ -5,7 +5,7 @@
 {% block title %}Device Import{% endblock %}
 
 {% block content %}
-{% include 'dcim/inc/_device_import_header.html' with active_tab='child_import' %}
+{% include 'dcim/inc/device_import_header.html' with active_tab='child_import' %}
 <div class="row">
 	<div class="col-md-12">
 		<form action="." method="post" class="form">
diff --git a/netbox/templates/dcim/device_inventory.html b/netbox/templates/dcim/device_inventory.html
index b2c94c1dd..6e19d8fe8 100644
--- a/netbox/templates/dcim/device_inventory.html
+++ b/netbox/templates/dcim/device_inventory.html
@@ -3,7 +3,7 @@
 {% block title %}{{ device }} - Inventory{% endblock %}
 
 {% block content %}
-{% include 'dcim/inc/_device_header.html' with active_tab='inventory' %}
+{% include 'dcim/inc/device_header.html' with active_tab='inventory' %}
 <div class="row">
     <div class="col-md-4">
         <div class="panel panel-default">
diff --git a/netbox/templates/dcim/device_lldp_neighbors.html b/netbox/templates/dcim/device_lldp_neighbors.html
index 415456a29..6a5446c3b 100644
--- a/netbox/templates/dcim/device_lldp_neighbors.html
+++ b/netbox/templates/dcim/device_lldp_neighbors.html
@@ -3,7 +3,7 @@
 {% block title %}{{ device }} - LLDP Neighbors{% endblock %}
 
 {% block content %}
-{% include 'dcim/inc/_device_header.html' with active_tab='lldp-neighbors' %}
+{% include 'dcim/inc/device_header.html' with active_tab='lldp-neighbors' %}
 <div class="panel panel-default">
     <div class="panel-heading">
         <strong>LLDP Neighbors</strong>
diff --git a/netbox/templates/dcim/inc/_consoleport.html b/netbox/templates/dcim/inc/consoleport.html
similarity index 100%
rename from netbox/templates/dcim/inc/_consoleport.html
rename to netbox/templates/dcim/inc/consoleport.html
diff --git a/netbox/templates/dcim/inc/_consoleserverport.html b/netbox/templates/dcim/inc/consoleserverport.html
similarity index 100%
rename from netbox/templates/dcim/inc/_consoleserverport.html
rename to netbox/templates/dcim/inc/consoleserverport.html
diff --git a/netbox/templates/dcim/inc/_device_header.html b/netbox/templates/dcim/inc/device_header.html
similarity index 100%
rename from netbox/templates/dcim/inc/_device_header.html
rename to netbox/templates/dcim/inc/device_header.html
diff --git a/netbox/templates/dcim/inc/_device_import_header.html b/netbox/templates/dcim/inc/device_import_header.html
similarity index 100%
rename from netbox/templates/dcim/inc/_device_import_header.html
rename to netbox/templates/dcim/inc/device_import_header.html
diff --git a/netbox/templates/dcim/inc/_devicebay.html b/netbox/templates/dcim/inc/devicebay.html
similarity index 100%
rename from netbox/templates/dcim/inc/_devicebay.html
rename to netbox/templates/dcim/inc/devicebay.html
diff --git a/netbox/templates/dcim/inc/_interface.html b/netbox/templates/dcim/inc/interface.html
similarity index 100%
rename from netbox/templates/dcim/inc/_interface.html
rename to netbox/templates/dcim/inc/interface.html
diff --git a/netbox/templates/dcim/inc/_ipaddress.html b/netbox/templates/dcim/inc/ipaddress.html
similarity index 100%
rename from netbox/templates/dcim/inc/_ipaddress.html
rename to netbox/templates/dcim/inc/ipaddress.html
diff --git a/netbox/templates/dcim/inc/_poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html
similarity index 100%
rename from netbox/templates/dcim/inc/_poweroutlet.html
rename to netbox/templates/dcim/inc/poweroutlet.html
diff --git a/netbox/templates/dcim/inc/_powerport.html b/netbox/templates/dcim/inc/powerport.html
similarity index 100%
rename from netbox/templates/dcim/inc/_powerport.html
rename to netbox/templates/dcim/inc/powerport.html
diff --git a/netbox/templates/dcim/inc/_rack_elevation.html b/netbox/templates/dcim/inc/rack_elevation.html
similarity index 100%
rename from netbox/templates/dcim/inc/_rack_elevation.html
rename to netbox/templates/dcim/inc/rack_elevation.html
diff --git a/netbox/templates/dcim/inc/_service.html b/netbox/templates/dcim/inc/service.html
similarity index 100%
rename from netbox/templates/dcim/inc/_service.html
rename to netbox/templates/dcim/inc/service.html
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 2d0e065fd..d73a0b560 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -195,13 +195,13 @@
           <div class="rack_header">
             <h4>Front</h4>
           </div>
-          {% include 'dcim/inc/_rack_elevation.html' with primary_face=front_elevation secondary_face=rear_elevation face_id=0 %}
+          {% include 'dcim/inc/rack_elevation.html' with primary_face=front_elevation secondary_face=rear_elevation face_id=0 %}
       </div>
       <div class="col-md-6 col-sm-6 col-xs-12">
         <div class="rack_header">
             <h4>Rear</h4>
         </div>
-        {% include 'dcim/inc/_rack_elevation.html' with primary_face=rear_elevation secondary_face=front_elevation face_id=1 %}
+        {% include 'dcim/inc/rack_elevation.html' with primary_face=rear_elevation secondary_face=front_elevation face_id=1 %}
       </div>
     </div>
 </div>