diff --git a/config/src/main/java/org/springframework/security/config/web/server/HttpSecurity.java b/config/src/main/java/org/springframework/security/config/web/server/HttpSecurity.java
index c95633bbc1..fd8f70fa21 100644
--- a/config/src/main/java/org/springframework/security/config/web/server/HttpSecurity.java
+++ b/config/src/main/java/org/springframework/security/config/web/server/HttpSecurity.java
@@ -26,8 +26,8 @@ import org.springframework.security.authorization.AuthorizationDecision;
 import org.springframework.security.authorization.ReactiveAuthorizationManager;
 import org.springframework.security.web.server.AuthenticationEntryPoint;
 import org.springframework.security.web.server.DelegatingAuthenticationEntryPoint;
-import org.springframework.security.web.server.FormLoginAuthenticationConverter;
-import org.springframework.security.web.server.HttpBasicAuthenticationConverter;
+import org.springframework.security.web.server.ServerFormLoginAuthenticationConverter;
+import org.springframework.security.web.server.ServerHttpBasicAuthenticationConverter;
 import org.springframework.security.web.server.MatcherSecurityWebFilterChain;
 import org.springframework.security.web.server.SecurityWebFilterChain;
 import org.springframework.security.web.server.authentication.AuthenticationEntryPointFailureHandler;
@@ -355,7 +355,7 @@ public class HttpSecurity {
 			AuthenticationWebFilter authenticationFilter = new AuthenticationWebFilter(
 				this.authenticationManager);
 			authenticationFilter.setAuthenticationFailureHandler(new AuthenticationEntryPointFailureHandler(this.entryPoint));
-			authenticationFilter.setAuthenticationConverter(new HttpBasicAuthenticationConverter());
+			authenticationFilter.setAuthenticationConverter(new ServerHttpBasicAuthenticationConverter());
 			if(this.securityContextRepository != null) {
 				authenticationFilter.setSecurityContextRepository(this.securityContextRepository);
 			}
@@ -433,7 +433,7 @@ public class HttpSecurity {
 				this.authenticationManager);
 			authenticationFilter.setRequiresAuthenticationMatcher(this.requiresAuthenticationMatcher);
 			authenticationFilter.setAuthenticationFailureHandler(this.authenticationFailureHandler);
-			authenticationFilter.setAuthenticationConverter(new FormLoginAuthenticationConverter());
+			authenticationFilter.setAuthenticationConverter(new ServerFormLoginAuthenticationConverter());
 			authenticationFilter.setAuthenticationSuccessHandler(new RedirectAuthenticationSuccessHandler("/"));
 			authenticationFilter.setSecurityContextRepository(this.securityContextRepository);
 			http.addFilterAt(authenticationFilter, SecurityWebFiltersOrder.FORM_LOGIN);
diff --git a/webflux/src/main/java/org/springframework/security/web/server/FormLoginAuthenticationConverter.java b/webflux/src/main/java/org/springframework/security/web/server/ServerFormLoginAuthenticationConverter.java
similarity index 95%
rename from webflux/src/main/java/org/springframework/security/web/server/FormLoginAuthenticationConverter.java
rename to webflux/src/main/java/org/springframework/security/web/server/ServerFormLoginAuthenticationConverter.java
index 1dcca2241e..3cb2e09cad 100644
--- a/webflux/src/main/java/org/springframework/security/web/server/FormLoginAuthenticationConverter.java
+++ b/webflux/src/main/java/org/springframework/security/web/server/ServerFormLoginAuthenticationConverter.java
@@ -32,7 +32,7 @@ import org.springframework.web.server.ServerWebExchange;
  * @author Rob Winch
  * @since 5.0
  */
-public class FormLoginAuthenticationConverter implements Function<ServerWebExchange,Mono<Authentication>> {
+public class ServerFormLoginAuthenticationConverter implements Function<ServerWebExchange,Mono<Authentication>> {
 
 	private String usernameParameter = "username";
 
diff --git a/webflux/src/main/java/org/springframework/security/web/server/HttpBasicAuthenticationConverter.java b/webflux/src/main/java/org/springframework/security/web/server/ServerHttpBasicAuthenticationConverter.java
similarity index 95%
rename from webflux/src/main/java/org/springframework/security/web/server/HttpBasicAuthenticationConverter.java
rename to webflux/src/main/java/org/springframework/security/web/server/ServerHttpBasicAuthenticationConverter.java
index efe3cea4aa..48621703e7 100644
--- a/webflux/src/main/java/org/springframework/security/web/server/HttpBasicAuthenticationConverter.java
+++ b/webflux/src/main/java/org/springframework/security/web/server/ServerHttpBasicAuthenticationConverter.java
@@ -32,7 +32,7 @@ import reactor.core.publisher.Mono;
  * @author Rob Winch
  * @since 5.0
  */
-public class HttpBasicAuthenticationConverter implements Function<ServerWebExchange,Mono<Authentication>> {
+public class ServerHttpBasicAuthenticationConverter implements Function<ServerWebExchange,Mono<Authentication>> {
 
 	public static final String BASIC = "Basic ";
 
diff --git a/webflux/src/main/java/org/springframework/security/web/server/authentication/AuthenticationWebFilter.java b/webflux/src/main/java/org/springframework/security/web/server/authentication/AuthenticationWebFilter.java
index 539bd0604a..9885d7bb5a 100644
--- a/webflux/src/main/java/org/springframework/security/web/server/authentication/AuthenticationWebFilter.java
+++ b/webflux/src/main/java/org/springframework/security/web/server/authentication/AuthenticationWebFilter.java
@@ -23,8 +23,7 @@ import reactor.core.publisher.Mono;
 import org.springframework.security.authentication.ReactiveAuthenticationManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextImpl;
-import org.springframework.security.web.server.AuthenticationEntryPoint;
-import org.springframework.security.web.server.HttpBasicAuthenticationConverter;
+import org.springframework.security.web.server.ServerHttpBasicAuthenticationConverter;
 import org.springframework.security.web.server.WebFilterExchange;
 import org.springframework.security.web.server.authentication.www.HttpBasicAuthenticationEntryPoint;
 import org.springframework.security.web.server.context.SecurityContextRepository;
@@ -48,7 +47,7 @@ public class AuthenticationWebFilter implements WebFilter {
 
 	private AuthenticationSuccessHandler authenticationSuccessHandler = new WebFilterChainAuthenticationSuccessHandler();
 
-	private Function<ServerWebExchange,Mono<Authentication>> authenticationConverter = new HttpBasicAuthenticationConverter();
+	private Function<ServerWebExchange,Mono<Authentication>> authenticationConverter = new ServerHttpBasicAuthenticationConverter();
 
 	private AuthenticationFailureHandler authenticationFailureHandler = new AuthenticationEntryPointFailureHandler(new HttpBasicAuthenticationEntryPoint());
 
diff --git a/webflux/src/test/java/org/springframework/security/web/server/FormLoginAuthenticationConverterTests.java b/webflux/src/test/java/org/springframework/security/web/server/ServerFormLoginAuthenticationConverterTests.java
similarity index 95%
rename from webflux/src/test/java/org/springframework/security/web/server/FormLoginAuthenticationConverterTests.java
rename to webflux/src/test/java/org/springframework/security/web/server/ServerFormLoginAuthenticationConverterTests.java
index a8aa7267c9..a3a6caf2b1 100644
--- a/webflux/src/test/java/org/springframework/security/web/server/FormLoginAuthenticationConverterTests.java
+++ b/webflux/src/test/java/org/springframework/security/web/server/ServerFormLoginAuthenticationConverterTests.java
@@ -35,13 +35,13 @@ import static org.mockito.Mockito.when;
  * @since 5.0
  */
 @RunWith(MockitoJUnitRunner.class)
-public class FormLoginAuthenticationConverterTests {
+public class ServerFormLoginAuthenticationConverterTests {
 	@Mock
 	private ServerWebExchange exchange;
 
 	private MultiValueMap<String,String> data = new LinkedMultiValueMap<>();
 
-	private FormLoginAuthenticationConverter converter = new FormLoginAuthenticationConverter();
+	private ServerFormLoginAuthenticationConverter converter = new ServerFormLoginAuthenticationConverter();
 
 	@Before
 	public void setup() {
diff --git a/webflux/src/test/java/org/springframework/security/web/server/HttpBasicAuthenticationConverterTests.java b/webflux/src/test/java/org/springframework/security/web/server/ServerHttpBasicAuthenticationConverterTests.java
similarity index 93%
rename from webflux/src/test/java/org/springframework/security/web/server/HttpBasicAuthenticationConverterTests.java
rename to webflux/src/test/java/org/springframework/security/web/server/ServerHttpBasicAuthenticationConverterTests.java
index 712deb3215..4762e82356 100644
--- a/webflux/src/test/java/org/springframework/security/web/server/HttpBasicAuthenticationConverterTests.java
+++ b/webflux/src/test/java/org/springframework/security/web/server/ServerHttpBasicAuthenticationConverterTests.java
@@ -22,7 +22,6 @@ import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import reactor.core.publisher.Mono;
-import reactor.test.StepVerifier;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -30,9 +29,9 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Rob Winch
  * @since 5.0
  */
-public class HttpBasicAuthenticationConverterTests {
+public class ServerHttpBasicAuthenticationConverterTests {
 
-	HttpBasicAuthenticationConverter converter = new HttpBasicAuthenticationConverter();
+	ServerHttpBasicAuthenticationConverter converter = new ServerHttpBasicAuthenticationConverter();
 	MockServerHttpRequest.BaseBuilder<?> request = MockServerHttpRequest.get("/");
 
 	@Test