diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONOAuthClientView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONClientView.java
similarity index 96%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONOAuthClientView.java
rename to openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONClientView.java
index 4fdcff1ba..258a51f28 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONOAuthClientView.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONClientView.java
@@ -19,7 +19,7 @@ import com.google.gson.FieldAttributes;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-public class JSONOAuthClientView extends AbstractView{
+public class JSONClientView extends AbstractView{
 
     /* (non-Javadoc)
       * @see org.springframework.web.servlet.view.AbstractView#renderMergedOutputModel(java.util.Map, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml b/openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml
index 010002ea4..28151527b 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml
@@ -188,7 +188,7 @@
 	
  	<bean id="jsonUserInfoView" class="org.mitre.openid.connect.view.JSONUserInfoView"/>
  	<bean id="jsonIdTokenView" class="org.mitre.openid.connect.view.JSONIdTokenView"/>
-    <bean id="jsonClientView" class="org.mitre.openid.connect.view.JSONOAuthClientView" />
+    <bean id="jsonClientView" class="org.mitre.openid.connect.view.JSONClientView" />
 
 <!-- End view configuration -->