diff --git a/samples/featured-authorizationserver/src/main/java/sample/web/DeviceErrorController.java b/samples/featured-authorizationserver/src/main/java/sample/web/DefaultErrorController.java
similarity index 95%
rename from samples/featured-authorizationserver/src/main/java/sample/web/DeviceErrorController.java
rename to samples/featured-authorizationserver/src/main/java/sample/web/DefaultErrorController.java
index 7ad9750e..f4e55c6e 100644
--- a/samples/featured-authorizationserver/src/main/java/sample/web/DeviceErrorController.java
+++ b/samples/featured-authorizationserver/src/main/java/sample/web/DefaultErrorController.java
@@ -30,7 +30,7 @@ import org.springframework.web.servlet.ModelAndView;
  * @since 1.1
  */
 @Controller
-public class DeviceErrorController implements ErrorController {
+public class DefaultErrorController implements ErrorController {
 
 	@RequestMapping("/error")
 	public ModelAndView handleError(HttpServletRequest request) {
diff --git a/samples/featured-authorizationserver/src/main/resources/templates/access-denied.html b/samples/featured-authorizationserver/src/main/resources/templates/access-denied.html
index e69a32c8..c358bc7b 100644
--- a/samples/featured-authorizationserver/src/main/resources/templates/access-denied.html
+++ b/samples/featured-authorizationserver/src/main/resources/templates/access-denied.html
@@ -3,23 +3,18 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-        <title>Device Grant Example</title>
+        <title>Spring Security Example</title>
         <link rel="stylesheet" href="/webjars/bootstrap/css/bootstrap.css" th:href="@{/webjars/bootstrap/css/bootstrap.css}" />
         <link rel="stylesheet" href="/assets/css/style.css" th:href="@{/assets/css/style.css}" />
     </head>
     <body>
-        <div class="jumbotron">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-8">
-                        <h2>Access Denied</h2>
-                        <p>You have denied access. Please return to your device to continue.</p>
-                    </div>
-                    <div class="col-md-4">
-                        <img src="https://cdn.pixabay.com/photo/2017/07/03/15/20/technology-2468063_1280.png" class="img-responsive" alt="Devices">
-                    </div>
+        <div class="container">
+            <div class="row">
+                <div class="col-md-8">
+                    <h2>Access Denied</h2>
+                    <p>You have denied access.</p>
                 </div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/samples/featured-authorizationserver/src/main/resources/templates/error.html b/samples/featured-authorizationserver/src/main/resources/templates/error.html
index 11088646..7bf6baae 100644
--- a/samples/featured-authorizationserver/src/main/resources/templates/error.html
+++ b/samples/featured-authorizationserver/src/main/resources/templates/error.html
@@ -3,23 +3,18 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-        <title>Device Grant Example</title>
+        <title>Spring Security Example</title>
         <link rel="stylesheet" href="/webjars/bootstrap/css/bootstrap.css" th:href="@{/webjars/bootstrap/css/bootstrap.css}" />
         <link rel="stylesheet" href="/assets/css/style.css" th:href="@{/assets/css/style.css}" />
     </head>
     <body>
-        <div class="jumbotron">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-8">
-                        <h2>Error</h2>
-                        <p th:text="${message}"></p>
-                    </div>
-                    <div class="col-md-4">
-                        <img src="https://cdn.pixabay.com/photo/2017/07/03/15/20/technology-2468063_1280.png" class="img-responsive" alt="Devices">
-                    </div>
+        <div class="container">
+            <div class="row">
+                <div class="col-md-8">
+                    <h2>Error</h2>
+                    <p th:text="${message}"></p>
                 </div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
