diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/HttpInterfaceClientsAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/HttpInterfaceClientsAutoConfiguration.java
index 88ee9cbeed69..502de18a0198 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/HttpInterfaceClientsAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/HttpInterfaceClientsAutoConfiguration.java
@@ -58,7 +58,7 @@ public class HttpInterfaceClientsAutoConfiguration {
 	@ConditionalOnProperty(value = "spring.interfaceclients.http.resttemplate.enabled", havingValue = "false",
 			matchIfMissing = true)
 	@Import(RestClientInterfaceClientsImportRegistrar.class)
-	protected static class RestClientAdapterProviderConfiguration {
+	protected static class RestClientInterfaceClientsConfiguration {
 
 	}
 
@@ -67,7 +67,7 @@ protected static class RestClientAdapterProviderConfiguration {
 	@Conditional(NotReactiveWebApplicationCondition.class)
 	@ConditionalOnProperty(value = "spring.interfaceclients.http.resttemplate.enabled", havingValue = "true")
 	@Import(RestTemplateInterfaceClientsImportRegistrar.class)
-	protected static class RestTemplateAdapterProviderConfiguration {
+	protected static class RestTemplateInterfaceClientsConfiguration {
 
 	}
 
@@ -75,7 +75,7 @@ protected static class RestTemplateAdapterProviderConfiguration {
 	@ConditionalOnClass({ WebClient.class, WebClientAdapter.class, HttpServiceProxyFactory.class })
 	@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
 	@Import(WebClientInterfaceClientsImportRegistrar.class)
-	protected static class WebClientAdapterProviderConfiguration {
+	protected static class WebClientInterfaceClientsConfiguration {
 
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/RestClientInterfaceClientsFactoryBean.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/RestClientInterfaceClientsFactoryBean.java
index 005b085ae1eb..5d278ccf0c0a 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/RestClientInterfaceClientsFactoryBean.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/RestClientInterfaceClientsFactoryBean.java
@@ -50,7 +50,7 @@ protected HttpExchangeAdapter exchangeAdapter() {
 			.qualifiedBean(this.applicationContext.getBeanFactory(), RestClient.class, this.clientId);
 		if (userProvidedRestClient != null) {
 			// If the user wants to set the baseUrl directly on the builder,
-			// it should not be set in properties.
+			// it should not be set in the properties.
 			if (baseUrl != null) {
 				userProvidedRestClient = userProvidedRestClient.mutate().baseUrl(baseUrl).build();
 			}
@@ -60,7 +60,8 @@ protected HttpExchangeAdapter exchangeAdapter() {
 		RestClient.Builder userProvidedRestClientBuilder = QualifiedBeanProvider
 			.qualifiedBean(this.applicationContext.getBeanFactory(), RestClient.Builder.class, this.clientId);
 		if (userProvidedRestClientBuilder != null) {
-
+			// If the user wants to set the baseUrl directly on the builder,
+			// it should not be set in the properties.
 			if (baseUrl != null) {
 				userProvidedRestClientBuilder.baseUrl(baseUrl);
 			}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/WebClientInterfaceClientsFactoryBean.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/WebClientInterfaceClientsFactoryBean.java
index 05b1438bf47d..82f15506c4f9 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/WebClientInterfaceClientsFactoryBean.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/interfaceclients/http/WebClientInterfaceClientsFactoryBean.java
@@ -25,6 +25,7 @@
 import org.springframework.web.reactive.function.client.support.WebClientAdapter;
 import org.springframework.web.service.invoker.HttpExchangeAdapter;
 
+//FIXME
 /**
  * {@link RestClient}-backed {@link AbstractHttpInterfaceClientsFactoryBean}
  * implementation.