diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeAuthenticationProviderBeanManagerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeAuthenticationProviderBeanManagerConfigurer.java
index 62fb6e9b480..6aa64b8dfa1 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeAuthenticationProviderBeanManagerConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeAuthenticationProviderBeanManagerConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,10 @@
 import org.springframework.core.annotation.Order;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.password.PasswordEncoder;
 
 /**
- * Lazily initializes the global authentication with a {@link UserDetailsService} if it is
- * not yet configured and there is only a single Bean of that type. Optionally, if a
- * {@link PasswordEncoder} is defined will wire this up too.
+ * Lazily initializes the global authentication with an {@link AuthenticationProvider} if it is
+ * not yet configured and there is only a single Bean of that type.
  *
  * @author Rob Winch
  * @since 4.1
@@ -49,10 +46,10 @@ class InitializeAuthenticationProviderBeanManagerConfigurer
 
 	@Override
 	public void init(AuthenticationManagerBuilder auth) throws Exception {
-		auth.apply(new InitializeUserDetailsManagerConfigurer());
+		auth.apply(new InitializeAuthenticationProviderManagerConfigurer());
 	}
 
-	class InitializeUserDetailsManagerConfigurer
+	class InitializeAuthenticationProviderManagerConfigurer
 			extends GlobalAuthenticationConfigurerAdapter {
 		@Override
 		public void configure(AuthenticationManagerBuilder auth) {
@@ -70,17 +67,17 @@ public void configure(AuthenticationManagerBuilder auth) {
 		}
 
 		/**
-		 * @return
+		 * @return a bean of the requested class if there's just a single registered component, null otherwise.
 		 */
 		private <T> T getBeanOrNull(Class<T> type) {
-			String[] userDetailsBeanNames = InitializeAuthenticationProviderBeanManagerConfigurer.this.context
+			String[] beanNames = InitializeAuthenticationProviderBeanManagerConfigurer.this.context
 					.getBeanNamesForType(type);
-			if (userDetailsBeanNames.length != 1) {
+			if (beanNames.length != 1) {
 				return null;
 			}
 
 			return InitializeAuthenticationProviderBeanManagerConfigurer.this.context
-					.getBean(userDetailsBeanNames[0], type);
+					.getBean(beanNames[0], type);
 		}
 	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeUserDetailsBeanManagerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeUserDetailsBeanManagerConfigurer.java
index 98af4d70db4..14013dbf0d5 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeUserDetailsBeanManagerConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeUserDetailsBeanManagerConfigurer.java
@@ -85,14 +85,14 @@ public void configure(AuthenticationManagerBuilder auth) throws Exception {
 		 * @return a bean of the requested class if there's just a single registered component, null otherwise.
 		 */
 		private <T> T getBeanOrNull(Class<T> type) {
-			String[] userDetailsBeanNames = InitializeUserDetailsBeanManagerConfigurer.this.context
+			String[] beanNames = InitializeUserDetailsBeanManagerConfigurer.this.context
 					.getBeanNamesForType(type);
-			if (userDetailsBeanNames.length != 1) {
+			if (beanNames.length != 1) {
 				return null;
 			}
 
 			return InitializeUserDetailsBeanManagerConfigurer.this.context
-					.getBean(userDetailsBeanNames[0], type);
+					.getBean(beanNames[0], type);
 		}
 	}
 }