diff --git a/Tests/TestBundle/Resources/config/routing_client.yml b/Tests/TestBundle/Resources/config/routing_client.yml
index d38fcfbd..df449c0a 100644
--- a/Tests/TestBundle/Resources/config/routing_client.yml
+++ b/Tests/TestBundle/Resources/config/routing_client.yml
@@ -1,4 +1,4 @@
-client_index:
+client:
     path:       /client
     defaults:   { _controller: TestBundle:Client:clientIndex }
     methods:    [ GET ]
diff --git a/Tests/TestBundle/Resources/config/routing_demo.yml b/Tests/TestBundle/Resources/config/routing_demo.yml
index 41ef4a14..95e51ac3 100644
--- a/Tests/TestBundle/Resources/config/routing_demo.yml
+++ b/Tests/TestBundle/Resources/config/routing_demo.yml
@@ -1,4 +1,4 @@
-demo_index:
+demo:
     path:       /demo
     defaults:   { _controller: TestBundle:Demo:demoIndex }
     methods:    [ GET ]
diff --git a/Tests/TestBundle/Resources/config/routing_oauth2.yml b/Tests/TestBundle/Resources/config/routing_oauth2.yml
index 627db28f..8141a485 100644
--- a/Tests/TestBundle/Resources/config/routing_oauth2.yml
+++ b/Tests/TestBundle/Resources/config/routing_oauth2.yml
@@ -1,4 +1,4 @@
-oauth2_index:
+oauth2:
     path:           /oauth2
     defaults:       { _controller: TestBundle:OAuth2:oauth2Index }
     methods:        [ GET ]
diff --git a/Tests/TestBundle/Resources/config/routing_resource.yml b/Tests/TestBundle/Resources/config/routing_resource.yml
index 54e85119..ebc16adc 100644
--- a/Tests/TestBundle/Resources/config/routing_resource.yml
+++ b/Tests/TestBundle/Resources/config/routing_resource.yml
@@ -1,4 +1,4 @@
-resource_index:
+resource:
     path:       /resource
     defaults:   { _controller: TestBundle:Resource:resourceIndex }
     methods:    [ GET ]
diff --git a/Tests/TestBundle/Resources/views/demo/grant_type/authorization_code.html.twig b/Tests/TestBundle/Resources/views/demo/grant_type/authorization_code.html.twig
index 731fc1bd..f21d9b3f 100644
--- a/Tests/TestBundle/Resources/views/demo/grant_type/authorization_code.html.twig
+++ b/Tests/TestBundle/Resources/views/demo/grant_type/authorization_code.html.twig
@@ -14,7 +14,7 @@
                 <p><a class="btn btn-primary" role="button" href="{{ model_path }}">Debug with Local Resource</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ debug_path }}">Debug with Remote Resource</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ refresh_path }}">Refreshing an Access Token</a></p>
-                <p><a class="btn btn-primary" role="button" href="{{ path('demo_index') }}">Return</a></p>
+                <p><a class="btn btn-primary" role="button" href="{{ path('demo') }}">Return</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ path('oauth2_authorize_logout') }}">Logout</a></p>
 
                 <h2 class="page-header">Access Token Response</h2>
diff --git a/Tests/TestBundle/Resources/views/demo/grant_type/client_credentials.html.twig b/Tests/TestBundle/Resources/views/demo/grant_type/client_credentials.html.twig
index 46f4735b..1a67ade5 100644
--- a/Tests/TestBundle/Resources/views/demo/grant_type/client_credentials.html.twig
+++ b/Tests/TestBundle/Resources/views/demo/grant_type/client_credentials.html.twig
@@ -14,7 +14,7 @@
                 <p><a class="btn btn-primary" role="button" href="{{ model_path }}">Debug with Local Resource</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ debug_path }}">Debug with Remote Resource</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ refresh_path }}">Refreshing an Access Token</a></p>
-                <p><a class="btn btn-primary" role="button" href="{{ path('demo_index') }}">Return</a></p>
+                <p><a class="btn btn-primary" role="button" href="{{ path('demo') }}">Return</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ path('oauth2_authorize_logout') }}">Logout</a></p>
 
                 <h2 class="page-header">Access Token Response:</h2>
diff --git a/Tests/TestBundle/Resources/views/demo/grant_type/password.html.twig b/Tests/TestBundle/Resources/views/demo/grant_type/password.html.twig
index b2b361d2..b7e251cd 100644
--- a/Tests/TestBundle/Resources/views/demo/grant_type/password.html.twig
+++ b/Tests/TestBundle/Resources/views/demo/grant_type/password.html.twig
@@ -14,7 +14,7 @@
                 <p><a class="btn btn-primary" role="button" href="{{ model_path }}">Debug with Local Resource</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ debug_path }}">Debug with Remote Resource</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ refresh_path }}">Refreshing an Access Token</a></p>
-                <p><a class="btn btn-primary" role="button" href="{{ path('demo_index') }}">Return</a></p>
+                <p><a class="btn btn-primary" role="button" href="{{ path('demo') }}">Return</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ path('oauth2_authorize_logout') }}">Logout</a></p>
 
                 <h2 class="page-header">Access Token Response</h2>
diff --git a/Tests/TestBundle/Resources/views/demo/grant_type/refresh_token.html.twig b/Tests/TestBundle/Resources/views/demo/grant_type/refresh_token.html.twig
index b2a415ad..0e08bdf9 100644
--- a/Tests/TestBundle/Resources/views/demo/grant_type/refresh_token.html.twig
+++ b/Tests/TestBundle/Resources/views/demo/grant_type/refresh_token.html.twig
@@ -14,7 +14,7 @@
                 <p><a class="btn btn-primary" role="button" href="{{ model_path }}">Debug with Local Resource</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ debug_path }}">Debug with Remote Resource</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ refresh_path }}">Refreshing an Access Token</a></p>
-                <p><a class="btn btn-primary" role="button" href="{{ path('demo_index') }}">Return</a></p>
+                <p><a class="btn btn-primary" role="button" href="{{ path('demo') }}">Return</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ path('oauth2_authorize_logout') }}">Logout</a></p>
 
                 <h2 class="page-header">Access Token Response</h2>
diff --git a/Tests/TestBundle/Resources/views/demo/resource_type/debug_endpoint.html.twig b/Tests/TestBundle/Resources/views/demo/resource_type/debug_endpoint.html.twig
index c5f15af5..c9c38059 100644
--- a/Tests/TestBundle/Resources/views/demo/resource_type/debug_endpoint.html.twig
+++ b/Tests/TestBundle/Resources/views/demo/resource_type/debug_endpoint.html.twig
@@ -11,7 +11,7 @@
                     <p>The client accesses protected resources by presenting the access token to the resource server.</p>
                     <footer><a href="http://tools.ietf.org/html/rfc6749#section-7">7. Accessing Protected Resources</a></footer>
                 </blockquote>
-                <p><a class="btn btn-primary" role="button" href="{{ path('demo_index') }}">Return</a></p>
+                <p><a class="btn btn-primary" role="button" href="{{ path('demo') }}">Return</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ path('oauth2_authorize_logout') }}">Logout</a></p>
 
                 <h2 class="page-header">Resource Response</h2>
diff --git a/Tests/TestBundle/Resources/views/demo/resource_type/model.html.twig b/Tests/TestBundle/Resources/views/demo/resource_type/model.html.twig
index d5bf57a0..537a1a11 100644
--- a/Tests/TestBundle/Resources/views/demo/resource_type/model.html.twig
+++ b/Tests/TestBundle/Resources/views/demo/resource_type/model.html.twig
@@ -11,7 +11,7 @@
                     <p>The client accesses protected resources by presenting the access token to the resource server.</p>
                     <footer><a href="http://tools.ietf.org/html/rfc6749#section-7">7. Accessing Protected Resources</a></footer>
                 </blockquote>
-                <p><a class="btn btn-primary" role="button" href="{{ path('demo_index') }}">Return</a></p>
+                <p><a class="btn btn-primary" role="button" href="{{ path('demo') }}">Return</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ path('oauth2_authorize_logout') }}">Logout</a></p>
 
                 <h2 class="page-header">Resource Response</h2>
diff --git a/Tests/TestBundle/Resources/views/demo/response_type/code.html.twig b/Tests/TestBundle/Resources/views/demo/response_type/code.html.twig
index 20602787..ba3a15d2 100644
--- a/Tests/TestBundle/Resources/views/demo/response_type/code.html.twig
+++ b/Tests/TestBundle/Resources/views/demo/response_type/code.html.twig
@@ -12,7 +12,7 @@
                     <footer><a href="http://tools.ietf.org/html/rfc6749#section-4.1.1">4.1.1. Authorization Request</a></footer>
                 </blockquote>
                 <p><a class="btn btn-primary" role="button" href="{{ token_path }}">Access Token Request</a></p>
-                <p><a class="btn btn-primary" role="button" href="{{ path('demo_index') }}">Return</a></p>
+                <p><a class="btn btn-primary" role="button" href="{{ path('demo') }}">Return</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ path('oauth2_authorize_logout') }}">Logout</a></p>
 
                 <h2 class="page-header">Authorization response</h2>
diff --git a/Tests/TestBundle/Resources/views/demo/response_type/token.html.twig b/Tests/TestBundle/Resources/views/demo/response_type/token.html.twig
index 739400e8..aa7eba1c 100644
--- a/Tests/TestBundle/Resources/views/demo/response_type/token.html.twig
+++ b/Tests/TestBundle/Resources/views/demo/response_type/token.html.twig
@@ -13,7 +13,7 @@
                 </blockquote>
                 <p><a class="btn btn-primary" role="button" href="{{ model_path }}">Debug with Local Resource</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ debug_path }}">Debug with Remote Resource</a></p>
-                <p><a class="btn btn-primary" role="button" href="{{ path('demo_index') }}">Return</a></p>
+                <p><a class="btn btn-primary" role="button" href="{{ path('demo') }}">Return</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ path('oauth2_authorize_logout') }}">Logout</a></p>
 
                 <h2 class="page-header">Access Token Response</h2>
diff --git a/Tests/TestBundle/Resources/views/oauth2/authorize.html.twig b/Tests/TestBundle/Resources/views/oauth2/authorize.html.twig
index 3cfeb098..a14a8aaf 100644
--- a/Tests/TestBundle/Resources/views/oauth2/authorize.html.twig
+++ b/Tests/TestBundle/Resources/views/oauth2/authorize.html.twig
@@ -25,7 +25,7 @@
                         <button class="btn btn-success" type="submit" name="submit" />Authorize Application</button>
                     </div>
                 </form>
-                <p><a class="btn btn-primary" role="button" href="{{ path('demo_index') }}">Return</a></p>
+                <p><a class="btn btn-primary" role="button" href="{{ path('demo') }}">Return</a></p>
                 <p><a class="btn btn-primary" role="button" href="{{ path('oauth2_authorize_logout') }}">Logout</a></p>
 
                 <h2 class="page-header">Authorization request</h2>
diff --git a/Tests/TestBundle/Resources/views/oauth2/index.html.twig b/Tests/TestBundle/Resources/views/oauth2/index.html.twig
index b62b88cd..aa37f47a 100644
--- a/Tests/TestBundle/Resources/views/oauth2/index.html.twig
+++ b/Tests/TestBundle/Resources/views/oauth2/index.html.twig
@@ -67,7 +67,7 @@ Host: server.example.com</code></pre>
     &quot;token_type&quot;: &quot;bearer&quot;,
     &quot;username&quot;: &quot;demousername1&quot;
 }</code></pre>
-                <p>Remote <a href="{{ path('resource_index') }}">Resource Server</a> may also utilize this debug endpoint to verfiy the supplied access token.</p>
+                <p>Remote <a href="{{ path('resource') }}">Resource Server</a> may also utilize this debug endpoint to verfiy the supplied access token.</p>
             </div>
         </div>
     </div>
diff --git a/Tests/TestBundle/Resources/views/oauth2/login.html.twig b/Tests/TestBundle/Resources/views/oauth2/login.html.twig
index b7819167..a95aebe8 100644
--- a/Tests/TestBundle/Resources/views/oauth2/login.html.twig
+++ b/Tests/TestBundle/Resources/views/oauth2/login.html.twig
@@ -32,7 +32,7 @@
                         <button class="btn btn-success" type="submit" name="submit">Login</button>
                     </div>
                 </form>
-                <p><a class="btn btn-primary" role="button" href="{{ path('demo_index') }}">Return</a></p>
+                <p><a class="btn btn-primary" role="button" href="{{ path('demo') }}">Return</a></p>
             </div>
         </div>
     </div>
diff --git a/Tests/TestBundle/Resources/views/page_top.html.twig b/Tests/TestBundle/Resources/views/page_top.html.twig
index e4839a26..e097c427 100644
--- a/Tests/TestBundle/Resources/views/page_top.html.twig
+++ b/Tests/TestBundle/Resources/views/page_top.html.twig
@@ -17,10 +17,10 @@
             </div>
             <div class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
-                    <li><a href="{{ path('demo_index') }}">Demo</a></li>
-                    <li><a href="{{ path('client_index') }}">Client</a></li>
-                    <li><a href="{{ path('oauth2_index') }}">Authorization Server</a></li>
-                    <li><a href="{{ path('resource_index') }}">Resource Server</a></li>
+                    <li><a href="{{ path('demo') }}">Demo</a></li>
+                    <li><a href="{{ path('client') }}">Client</a></li>
+                    <li><a href="{{ path('oauth2') }}">Authorization Server</a></li>
+                    <li><a href="{{ path('resource') }}">Resource Server</a></li>
                 </ul>
             </div><!--/.nav-collapse -->
         </div><!--/.container-fluid -->