diff --git a/distribution/demo-dist/pom.xml b/distribution/demo-dist/pom.xml
index 73f1622493..a9bed2a02c 100755
--- a/distribution/demo-dist/pom.xml
+++ b/distribution/demo-dist/pom.xml
@@ -34,6 +34,13 @@
     <build>
         <finalName>keycloak-demo-${project.version}</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
diff --git a/distribution/subsystem-war/pom.xml b/distribution/subsystem-war/pom.xml
index a86119090d..20427b3071 100755
--- a/distribution/subsystem-war/pom.xml
+++ b/distribution/subsystem-war/pom.xml
@@ -18,6 +18,13 @@
     <build>
         <finalName>auth-server</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.jboss.as.plugins</groupId>
                 <artifactId>jboss-as-maven-plugin</artifactId>
diff --git a/examples/admin-client/src/main/webapp/index.jsp b/examples/admin-client/src/main/webapp/index.jsp
index 980f1962ec..47b52c15e1 100644
--- a/examples/admin-client/src/main/webapp/index.jsp
+++ b/examples/admin-client/src/main/webapp/index.jsp
@@ -1,6 +1,6 @@
 <%@ page import="org.keycloak.admin.client.Keycloak" %>
 <%@ page import="org.keycloak.admin.client.resource.ClientsResource" %>
-<%@ page import="org.keycloak.representations.idm.ApplicationRepresentation" %>
+<%@ page import="org.keycloak.representations.idm.ClientRepresentation" %>
 <%@ page import="org.keycloak.util.UriUtils" %>
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %>
 <%@ page session="false" %>
@@ -13,16 +13,16 @@
     String authServer = UriUtils.getOrigin(request.getRequestURL().toString()) + "/auth";
 
     Keycloak keycloak = Keycloak.getInstance(authServer, "example", "examples-admin-client", "password", "examples-admin-client", "password");
-    ClientsResource applications = keycloak.realm("example").applications();
+    ClientsResource clients = keycloak.realm("example").clients();
 
     out.println("<h1>Applications</h1>");
     out.println("<ul>");
-    for (ApplicationRepresentation app : applications.findAll()) {
+    for (ClientRepresentation client : clients.findAll()) {
         out.println("\t<li>");
-        if (app.getBaseUrl() != null) {
-            out.println("\t\t<a href=\"" + app.getBaseUrl() + "\">" + app.getName() + "</a>");
+        if (client.getBaseUrl() != null) {
+            out.println("\t\t<a href=\"" + client.getBaseUrl() + "\">" + client.getClientId() + "</a>");
         } else {
-            out.println("\t\t" + app.getName());
+            out.println("\t\t" + client.getClientId());
         }
         out.println("</li>");
     }