diff --git a/tests/TestBundle/Controller/DemoController.php b/tests/TestBundle/Controller/DemoController.php
index 00262709..245837bc 100644
--- a/tests/TestBundle/Controller/DemoController.php
+++ b/tests/TestBundle/Controller/DemoController.php
@@ -22,7 +22,7 @@ public function indexAction(Request $request, Application $app)
         return $app['twig']->render('demo/index.html.twig');
     }
 
-    public function authorizeCodeAction(Request $request, Application $app)
+    public function requestCodeAction(Request $request, Application $app)
     {
         $session = $request->getSession();
 
@@ -54,7 +54,7 @@ public function authorizeCodeAction(Request $request, Application $app)
         return $app->redirect($url);
     }
 
-    public function authorizeTokenAction(Request $request, Application $app)
+    public function requestTokenAction(Request $request, Application $app)
     {
         $session = $request->getSession();
 
diff --git a/tests/TestBundle/Resources/config/routing.php b/tests/TestBundle/Resources/config/routing.php
index 05474e47..8c762c51 100644
--- a/tests/TestBundle/Resources/config/routing.php
+++ b/tests/TestBundle/Resources/config/routing.php
@@ -21,11 +21,11 @@
 $app->get('/demo', 'authbucket_oauth2.tests.demo_controller:indexAction')
     ->bind('demo');
 
-$app->get('/demo/authorize/code', 'authbucket_oauth2.tests.demo_controller:authorizeCodeAction')
-    ->bind('demo_authorize_code');
+$app->get('/demo/request/code', 'authbucket_oauth2.tests.demo_controller:requestCodeAction')
+    ->bind('demo_request_code');
 
-$app->get('/demo/authorize/token', 'authbucket_oauth2.tests.demo_controller:authorizeTokenAction')
-    ->bind('demo_authorize_token');
+$app->get('/demo/request/token', 'authbucket_oauth2.tests.demo_controller:requestTokenAction')
+    ->bind('demo_request_token');
 
 $app->get('/demo/response_type/code', 'authbucket_oauth2.tests.demo_controller:responseTypeCodeAction')
     ->bind('demo_response_type_code');
diff --git a/tests/TestBundle/Resources/views/demo/index.html.twig b/tests/TestBundle/Resources/views/demo/index.html.twig
index 213682b8..a78187d6 100644
--- a/tests/TestBundle/Resources/views/demo/index.html.twig
+++ b/tests/TestBundle/Resources/views/demo/index.html.twig
@@ -14,14 +14,14 @@
                     <p>The authorization code grant type is used to obtain both access tokens and refresh tokens and is optimized for confidential clients.</p>
                     <footer><a href="http://tools.ietf.org/html/rfc6749#section-4.1">4.1. Authorization Code Grant</a></footer>
                 </blockquote>
-                <p><a class="btn btn-primary" role="button" href="{{ path('demo_authorize_code') }}">Authorization Request</a></p>
+                <p><a class="btn btn-primary" role="button" href="{{ path('demo_request_code') }}">Authorization Request</a></p>
 
                 <h2 id="implicit-grant" class="page-header">Implicit Grant</h2>
                 <blockquote>
                     <p>The implicit grant type is used to obtain access tokens (it does not support the issuance of refresh tokens) and is optimized for public clients known to operate a particular redirection URI. These clients are typically implemented in a browser using a scripting language such as JavaScript.</p>
                     <footer><a href="http://tools.ietf.org/html/rfc6749#section-4.2">4.2. Implicit Grant</a></footer>
                 </blockquote>
-                <p><a class="btn btn-primary" role="button" href="{{ path('demo_authorize_token') }}">Authorization Request</a></p>
+                <p><a class="btn btn-primary" role="button" href="{{ path('demo_request_token') }}">Authorization Request</a></p>
 
                 <h2 id="resource-owner-password-credentials-grant" class="page-header">Resource Owner Password Credentials Grant</h2>
                 <blockquote>