diff --git a/samples/messages-client/gradle.properties b/samples/demo-client/gradle.properties
similarity index 100%
rename from samples/messages-client/gradle.properties
rename to samples/demo-client/gradle.properties
diff --git a/samples/messages-client/samples-messages-client.gradle b/samples/demo-client/samples-demo-client.gradle
similarity index 100%
rename from samples/messages-client/samples-messages-client.gradle
rename to samples/demo-client/samples-demo-client.gradle
diff --git a/samples/messages-client/src/main/java/sample/MessagesClientApplication.java b/samples/demo-client/src/main/java/sample/DemoClientApplication.java
similarity index 89%
rename from samples/messages-client/src/main/java/sample/MessagesClientApplication.java
rename to samples/demo-client/src/main/java/sample/DemoClientApplication.java
index a2db0f93..ce73e4d0 100644
--- a/samples/messages-client/src/main/java/sample/MessagesClientApplication.java
+++ b/samples/demo-client/src/main/java/sample/DemoClientApplication.java
@@ -23,10 +23,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @since 0.0.1
  */
 @SpringBootApplication
-public class MessagesClientApplication {
+public class DemoClientApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(MessagesClientApplication.class, args);
+		SpringApplication.run(DemoClientApplication.class, args);
 	}
 
 }
diff --git a/samples/messages-client/src/main/java/sample/config/SecurityConfig.java b/samples/demo-client/src/main/java/sample/config/SecurityConfig.java
similarity index 100%
rename from samples/messages-client/src/main/java/sample/config/SecurityConfig.java
rename to samples/demo-client/src/main/java/sample/config/SecurityConfig.java
diff --git a/samples/messages-client/src/main/java/sample/config/WebClientConfig.java b/samples/demo-client/src/main/java/sample/config/WebClientConfig.java
similarity index 100%
rename from samples/messages-client/src/main/java/sample/config/WebClientConfig.java
rename to samples/demo-client/src/main/java/sample/config/WebClientConfig.java
diff --git a/samples/messages-client/src/main/java/sample/web/AuthorizationController.java b/samples/demo-client/src/main/java/sample/web/AuthorizationController.java
similarity index 100%
rename from samples/messages-client/src/main/java/sample/web/AuthorizationController.java
rename to samples/demo-client/src/main/java/sample/web/AuthorizationController.java
diff --git a/samples/messages-client/src/main/java/sample/web/DefaultController.java b/samples/demo-client/src/main/java/sample/web/DefaultController.java
similarity index 100%
rename from samples/messages-client/src/main/java/sample/web/DefaultController.java
rename to samples/demo-client/src/main/java/sample/web/DefaultController.java
diff --git a/samples/messages-client/src/main/java/sample/web/DeviceController.java b/samples/demo-client/src/main/java/sample/web/DeviceController.java
similarity index 100%
rename from samples/messages-client/src/main/java/sample/web/DeviceController.java
rename to samples/demo-client/src/main/java/sample/web/DeviceController.java
diff --git a/samples/messages-client/src/main/java/sample/web/authentication/DeviceCodeOAuth2AuthorizedClientProvider.java b/samples/demo-client/src/main/java/sample/web/authentication/DeviceCodeOAuth2AuthorizedClientProvider.java
similarity index 100%
rename from samples/messages-client/src/main/java/sample/web/authentication/DeviceCodeOAuth2AuthorizedClientProvider.java
rename to samples/demo-client/src/main/java/sample/web/authentication/DeviceCodeOAuth2AuthorizedClientProvider.java
diff --git a/samples/messages-client/src/main/java/sample/web/authentication/OAuth2DeviceAccessTokenResponseClient.java b/samples/demo-client/src/main/java/sample/web/authentication/OAuth2DeviceAccessTokenResponseClient.java
similarity index 100%
rename from samples/messages-client/src/main/java/sample/web/authentication/OAuth2DeviceAccessTokenResponseClient.java
rename to samples/demo-client/src/main/java/sample/web/authentication/OAuth2DeviceAccessTokenResponseClient.java
diff --git a/samples/messages-client/src/main/java/sample/web/authentication/OAuth2DeviceGrantRequest.java b/samples/demo-client/src/main/java/sample/web/authentication/OAuth2DeviceGrantRequest.java
similarity index 100%
rename from samples/messages-client/src/main/java/sample/web/authentication/OAuth2DeviceGrantRequest.java
rename to samples/demo-client/src/main/java/sample/web/authentication/OAuth2DeviceGrantRequest.java
diff --git a/samples/messages-client/src/main/resources/application.yml b/samples/demo-client/src/main/resources/application.yml
similarity index 100%
rename from samples/messages-client/src/main/resources/application.yml
rename to samples/demo-client/src/main/resources/application.yml
diff --git a/samples/messages-client/src/main/resources/static/assets/css/style.css b/samples/demo-client/src/main/resources/static/assets/css/style.css
similarity index 100%
rename from samples/messages-client/src/main/resources/static/assets/css/style.css
rename to samples/demo-client/src/main/resources/static/assets/css/style.css
diff --git a/samples/messages-client/src/main/resources/templates/device-activate.html b/samples/demo-client/src/main/resources/templates/device-activate.html
similarity index 100%
rename from samples/messages-client/src/main/resources/templates/device-activate.html
rename to samples/demo-client/src/main/resources/templates/device-activate.html
diff --git a/samples/messages-client/src/main/resources/templates/device-authorize.html b/samples/demo-client/src/main/resources/templates/device-authorize.html
similarity index 100%
rename from samples/messages-client/src/main/resources/templates/device-authorize.html
rename to samples/demo-client/src/main/resources/templates/device-authorize.html
diff --git a/samples/messages-client/src/main/resources/templates/index.html b/samples/demo-client/src/main/resources/templates/index.html
similarity index 100%
rename from samples/messages-client/src/main/resources/templates/index.html
rename to samples/demo-client/src/main/resources/templates/index.html
diff --git a/samples/messages-client/src/main/resources/templates/logged-out.html b/samples/demo-client/src/main/resources/templates/logged-out.html
similarity index 100%
rename from samples/messages-client/src/main/resources/templates/logged-out.html
rename to samples/demo-client/src/main/resources/templates/logged-out.html