diff --git a/djadmin2/core.py b/djadmin2/core.py
index 2650957..4631d40 100644
--- a/djadmin2/core.py
+++ b/djadmin2/core.py
@@ -127,11 +127,11 @@ class Admin2(object):
             ),
             url(regex='^auth/user/(?P<pk>\d+)/update/password/$',
                 view=views.PasswordChangeView.as_view(),
-                name='password-change'
+                name='password_change'
                 ),
             url(regex='^password_change_done/$',
                 view=views.PasswordChangeDoneView.as_view(),
-                name='password-change-done'
+                name='password_change_done'
                 ),
             url(regex='^logout/$',
                 view=views.LogoutView.as_view(),
diff --git a/djadmin2/templates/admin2/bootstrap/base.html b/djadmin2/templates/admin2/bootstrap/base.html
index 56bb8dd..33178a2 100644
--- a/djadmin2/templates/admin2/bootstrap/base.html
+++ b/djadmin2/templates/admin2/bootstrap/base.html
@@ -36,7 +36,7 @@
                             </a>
                             <ul class="dropdown-menu">
                                 {% if user.has_usable_password %}
-                                <li><a href="{% url 'admin2:password-change' user.id %}">{% trans "Change password" %}</a></li>
+                                <li><a href="{% url 'admin2:password_change' user.id %}">{% trans "Change password" %}</a></li>
                                 {% endif %}
                                 <li><a href="{% url 'admin2:logout' %}">{% trans "Log out" %}</a></li>
                             </ul>
diff --git a/djadmin2/views.py b/djadmin2/views.py
index c767901..03ae687 100644
--- a/djadmin2/views.py
+++ b/djadmin2/views.py
@@ -142,7 +142,7 @@ class PasswordChangeView(Admin2Mixin, generic.UpdateView):
     form_class = AdminPasswordChangeForm
     admin_form_class = PasswordChangeForm
     model = get_user_model()
-    success_url = reverse_lazy('admin2:password-change-done')
+    success_url = reverse_lazy('admin2:password_change_done')
 
     def get_form_kwargs(self, **kwargs):
         data = {'user': self.get_object()}
diff --git a/example/blog/tests/test_views.py b/example/blog/tests/test_views.py
index 791c871..2b85a28 100644
--- a/example/blog/tests/test_views.py
+++ b/example/blog/tests/test_views.py
@@ -185,12 +185,12 @@ class TestAuthViews(TestCase):
     def test_change_password_for_myself(self):
         self.client.login(username=self.user.username,
                           password='password')
-        request = self.client.post(reverse('admin2:password-change',
+        request = self.client.post(reverse('admin2:password_change',
                                            kwargs={'pk': self.user.pk}),
                                    {'old_password': 'password',
                                     'new_password1': 'user',
                                     'new_password2': 'user'})
-        self.assertRedirects(request, reverse('admin2:password-change-done'))
+        self.assertRedirects(request, reverse('admin2:password_change_done'))
         self.client.logout()
 
         self.assertFalse(self.client.login(username=self.user.username,
@@ -206,12 +206,12 @@ class TestAuthViews(TestCase):
         new_user.set_password("new_user")
         new_user.save()
 
-        request = self.client.post(reverse('admin2:password-change',
+        request = self.client.post(reverse('admin2:password_change',
                                            kwargs={'pk': new_user.pk}),
                                    {'old_password': 'new_user',
                                     'password1': 'new_user_password',
                                     'password2': 'new_user_password'})
-        self.assertRedirects(request, reverse('admin2:password-change-done'))
+        self.assertRedirects(request, reverse('admin2:password_change_done'))
         self.client.logout()
 
         self.assertFalse(self.client.login(username=new_user.username,