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 71c3ab7a7..36e6479cb 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
@@ -35,9 +35,9 @@
 		<security:expression-handler ref="oauthExpressionHandler" />
 	</security:global-method-security>
 
-	<oauth2:expression-handler id="oauthExpressionHandler" />
+	<oauth:expression-handler id="oauthExpressionHandler" />
 
-	<oauth2:web-expression-handler id="oauthWebExpressionHandler" />
+	<oauth:web-expression-handler id="oauthWebExpressionHandler" />
 
 	<!-- Spring Security configuration -->