diff --git a/openid-connect-server/src/main/webapp/resources/js/app.js b/openid-connect-server/src/main/webapp/resources/js/app.js
index b557fe28c..a6a7b5bdf 100644
--- a/openid-connect-server/src/main/webapp/resources/js/app.js
+++ b/openid-connect-server/src/main/webapp/resources/js/app.js
@@ -60,7 +60,7 @@
         // We can pass it default values.
         defaults:{
             idTokenValiditySeconds: 0,
-            clientName:"",
+            applicationName:"",
             clientSecret:"",
             registeredRedirectUri:[],
             authorizedGrantTypes:["authorization_code"],
@@ -206,7 +206,7 @@
             });
 
             var valid = this.model.set({
-                clientName:$('#clientName input').val(),
+                applicationName:$('#applicationName input').val(),
                 clientSecret:$('#clientSecret input').val(),
                 registeredRedirectUri:registeredRedirectUri,
                 clientDescription:$('#clientDescription textarea').val(),
diff --git a/openid-connect-server/src/main/webapp/resources/template/client.html b/openid-connect-server/src/main/webapp/resources/template/client.html
index fff369f24..f4f3824e2 100644
--- a/openid-connect-server/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server/src/main/webapp/resources/template/client.html
@@ -5,7 +5,7 @@
     </td>
 
     <td>
-        <%=clientName%>
+        <%=applicationName%>
         <!--expandable future information-->
     </td>
 
@@ -45,10 +45,10 @@
     <form class="form-horizontal">
         <fieldset>
             <legend>Details <%=(clientId != null ? 'for ' + clientId : '')%></legend>
-            <div class="control-group" id="clientName">
-                <label class="control-label">Client name</label>
+            <div class="control-group" id="applicationName">
+                <label class="control-label">Application name</label>
                 <div class="controls">
-                    <input value="<%=clientName%>" maxlength="100" type="text" class="" placeholder="Type something">
+                    <input value="<%=applicationName%>" maxlength="100" type="text" class="" placeholder="Type something">
                     <p class="help-block">Supporting help text</p>
                 </div>
             </div>