Changing login and register to login_user and register_user

common/djangoapps/student/views.py

@@ -204,14 +204,14 @@ def _cert_info(user, course, cert_status):
     return d
 
 
-def login(request):
+def login_user(request):
     """
     This view will display the non-modal login form
     """
     context = {}
     return render_to_response('login.html', context)
 
-def register(request):
+def register_user(request):
     """
     This view will display the non-modal registration form
     """

lms/urls.py

@@ -15,8 +15,8 @@ urlpatterns = ('',
     url(r'^update_certificate$', 'certificates.views.update_certificate'),
     url(r'^$', 'branding.views.index', name="root"), # Main marketing page, or redirect to courseware
     url(r'^dashboard$', 'student.views.dashboard', name="dashboard"),
-    url(r'^signin$', 'student.views.login', name="login"),
-    url(r'^register$', 'student.views.register', name="register"),
+    url(r'^signin$', 'student.views.login_user', name="login_user"),
+    url(r'^register$', 'student.views.register_user', name="register_user"),
 
     url(r'^admin_dashboard$', 'dashboard.views.dashboard'),