diff --git a/djadmin2/core.py b/djadmin2/core.py
index 4940ade..5349a6f 100644
--- a/djadmin2/core.py
+++ b/djadmin2/core.py
@@ -120,7 +120,7 @@ class Admin2(object):
             url(
                 regex=r'^(?P<app_label>\w+)/$',
                 view=self.app_index_view.as_view(**self.get_app_index_kwargs()),
-                name='app-index'
+                name='app_index'
             ),
             url(
                 regex=r'^api/v0/$',
diff --git a/djadmin2/templates/admin2/bootstrap/includes/app_model_list.html b/djadmin2/templates/admin2/bootstrap/includes/app_model_list.html
index 2474b51..3a4c1c9 100644
--- a/djadmin2/templates/admin2/bootstrap/includes/app_model_list.html
+++ b/djadmin2/templates/admin2/bootstrap/includes/app_model_list.html
@@ -3,7 +3,7 @@
 <thead>
     <tr>
         <th colspan="3">
-            <a href="{% url 'admin2:app-index' app_label=app_label %}">{{ app_label|title }}</a>
+            <a href="{% url 'admin2:app_index' app_label=app_label %}">{{ app_label|title }}</a>
         </th>
     </tr>
 </thead>
diff --git a/djadmin2/templates/admin2/bootstrap/model_confirm_delete.html b/djadmin2/templates/admin2/bootstrap/model_confirm_delete.html
index 7a2e2fc..c2fd7f8 100644
--- a/djadmin2/templates/admin2/bootstrap/model_confirm_delete.html
+++ b/djadmin2/templates/admin2/bootstrap/model_confirm_delete.html
@@ -7,9 +7,9 @@
 
 {% block breadcrumbs %}
     <li><a href="{% url "admin2:dashboard" %}">Home</a> <span class="divider">/</span></li>
-    <li><a href="{% url "admin2:app-index" app_label=app_label %}">{{ app_label|title }}</a> <span class="divider">/</span></li>    
+    <li><a href="{% url "admin2:app_index" app_label=app_label %}">{{ app_label|title }}</a> <span class="divider">/</span></li>
     <li><a href="{% url view|admin2_urlname:"index" %}">{{ model_name_pluralized|title }}</a> <span class="divider">/</span></li>
-    <li><a href="{% url view|admin2_urlname:"detail" pk=object.pk %}">{{ object }}</a> <span class="divider">/</span></li>         
+    <li><a href="{% url view|admin2_urlname:"detail" pk=object.pk %}">{{ object }}</a> <span class="divider">/</span></li>
     <li class="active">{% trans "Delete" %}</li>
 {% endblock %}
 
diff --git a/djadmin2/templates/admin2/bootstrap/model_detail.html b/djadmin2/templates/admin2/bootstrap/model_detail.html
index 1153400..fa2e217 100644
--- a/djadmin2/templates/admin2/bootstrap/model_detail.html
+++ b/djadmin2/templates/admin2/bootstrap/model_detail.html
@@ -8,9 +8,9 @@
 
 {% block breadcrumbs %}
     <li><a href="{% url "admin2:dashboard" %}">Home</a> <span class="divider">/</span></li>
-    <li><a href="{% url "admin2:app-index" app_label=app_label %}">{{ app_label|title }}</a> <span class="divider">/</span></li>
+    <li><a href="{% url "admin2:app_index" app_label=app_label %}">{{ app_label|title }}</a> <span class="divider">/</span></li>
     <li><a href="{% url view|admin2_urlname:"index" %}">{{ model_name_pluralized|title }}</a> <span class="divider">/</span></li>
-    <li class="active">{{ object }}</li>         
+    <li class="active">{{ object }}</li>
 {% endblock %}
 
 {% block content %}
diff --git a/djadmin2/templates/admin2/bootstrap/model_list.html b/djadmin2/templates/admin2/bootstrap/model_list.html
index 14e27fa..5e501b4 100644
--- a/djadmin2/templates/admin2/bootstrap/model_list.html
+++ b/djadmin2/templates/admin2/bootstrap/model_list.html
@@ -11,8 +11,8 @@
 
 {% block breadcrumbs %}
     <li><a href="{% url "admin2:dashboard" %}">Home</a> <span class="divider">/</span></li>
-    <li><a href="{% url "admin2:app-index" app_label=app_label %}">{{ app_label|title }}</a> <span class="divider">/</span></li>
-    <li class="active">{{ model_name_pluralized|title }}</li>     
+    <li><a href="{% url "admin2:app_index" app_label=app_label %}">{{ app_label|title }}</a> <span class="divider">/</span></li>
+    <li class="active">{{ model_name_pluralized|title }}</li>
 {% endblock %}
 
 {% block content %}
@@ -60,7 +60,7 @@
                 </tbody>
             </table>
 
-            {{ object_list|length }} {{ model_name_pluralized }} 
+            {{ object_list|length }} {{ model_name_pluralized }}
         </div>
     </form>
 </div>
diff --git a/djadmin2/templates/admin2/bootstrap/model_update_form.html b/djadmin2/templates/admin2/bootstrap/model_update_form.html
index dc417f7..51dfe46 100644
--- a/djadmin2/templates/admin2/bootstrap/model_update_form.html
+++ b/djadmin2/templates/admin2/bootstrap/model_update_form.html
@@ -8,13 +8,13 @@
 
 {% block breadcrumbs %}
     <li><a href="{% url "admin2:dashboard" %}">Home</a> <span class="divider">/</span></li>
-    <li><a href="{% url "admin2:app-index" app_label=app_label %}">{{ app_label|title }}</a> <span class="divider">/</span></li>
+    <li><a href="{% url "admin2:app_index" app_label=app_label %}">{{ app_label|title }}</a> <span class="divider">/</span></li>
     <li><a href="{% url view|admin2_urlname:"index" %}">{{ model_name_pluralized|title }}</a> <span class="divider">/</span></li>
     {% if action == 'Add' %}
 	<li class="active">{{ action }}</li>
     {% else %}
     <li><a href="{% url view|admin2_urlname:"detail" pk=object.pk %}">{{ object }}</a> <span class="divider">/</span></li>
-    <li class="active">{% trans 'Change' %}</li>     
+    <li class="active">{% trans 'Change' %}</li>
     {% endif %}
 
 {% endblock %}
@@ -51,7 +51,7 @@
 							{% endif %}
 							{{ field }}
 						</td>
-						{% endfor %}            
+						{% endfor %}
 					</tr>
 					{% endfor %}
 				</tbody>