diff --git a/openid-connect-server/src/main/java/org/mitre/swd/web/SimpleWebDiscoveryEndpoint.java b/openid-connect-server/src/main/java/org/mitre/swd/web/SimpleWebDiscoveryEndpoint.java
index 8405a9dab..4065398ec 100644
--- a/openid-connect-server/src/main/java/org/mitre/swd/web/SimpleWebDiscoveryEndpoint.java
+++ b/openid-connect-server/src/main/java/org/mitre/swd/web/SimpleWebDiscoveryEndpoint.java
@@ -18,10 +18,7 @@ package org.mitre.swd.web;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.mitre.openid.connect.config.ConfigurationPropertiesBean;
-import org.mitre.util.Utility;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -106,10 +103,9 @@ public class SimpleWebDiscoveryEndpoint {
 		Map<String, Object> m = new HashMap<String, Object>();
 		m.put("version", "3.0");
 		m.put("issuer", config.getIssuer());
-		m.put("authorization_endpoint", baseUrl + "openidconnect/auth");
-		m.put("token_endpoint", baseUrl + "openidconnect/token");
+		m.put("authorization_endpoint", baseUrl + "authorize");
+		m.put("token_endpoint", baseUrl + "token");
 		m.put("userinfo_endpoint", baseUrl + "userinfo");
-		m.put("check_id_endpoint", baseUrl + "checkid");
 		//m.put("refresh_session_endpoint", baseUrl + "/refresh_session");
 		//m.put("end_session_endpoint", baseUrl + "/end_session");
 		m.put("jwk_url", baseUrl + "jwk");
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml b/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml
index 153bb823e..143836cf8 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml
@@ -58,7 +58,7 @@
 		authorization-request-factory-ref="authorizationRequestFactory" 
 		token-services-ref="defaultOAuth2ProviderTokenService" 
 		user-approval-handler-ref="userApprovalHandler" 
-		authorization-endpoint-url="/auth" 
+		authorization-endpoint-url="/authorize" 
 		token-endpoint-url="/token">
 		
 		<oauth:authorization-code />