diff --git a/spring-shell-core/src/main/java/org/springframework/shell/command/annotation/CommandAvailability.java b/spring-shell-core/src/main/java/org/springframework/shell/command/annotation/CommandAvailability.java
index 8d5afd66..431667e4 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/command/annotation/CommandAvailability.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/command/annotation/CommandAvailability.java
@@ -34,9 +34,9 @@ import org.springframework.shell.Availability;
 public @interface CommandAvailability {
 
 	/**
-	 * Names of supplier beans for {@link Availability}.
+	 * Names of provider beans for {@link Availability}.
 	 *
 	 * @return names of supplier beans
 	 */
-	String[] name() default {};
+	String[] provider() default {};
 }
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/command/annotation/support/CommandRegistrationFactoryBean.java b/spring-shell-core/src/main/java/org/springframework/shell/command/annotation/support/CommandRegistrationFactoryBean.java
index 0c2caa56..f73b4560 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/command/annotation/support/CommandRegistrationFactoryBean.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/command/annotation/support/CommandRegistrationFactoryBean.java
@@ -39,8 +39,6 @@ import org.springframework.core.annotation.MergedAnnotations.SearchStrategy;
 import org.springframework.messaging.handler.invocation.InvocableHandlerMethod;
 import org.springframework.shell.Availability;
 import org.springframework.shell.AvailabilityProvider;
-import org.springframework.shell.CompletionContext;
-import org.springframework.shell.CompletionProposal;
 import org.springframework.shell.Utils;
 import org.springframework.shell.command.CommandExceptionResolver;
 import org.springframework.shell.command.CommandHandlingResult;
@@ -55,7 +53,6 @@ import org.springframework.shell.command.annotation.Option;
 import org.springframework.shell.command.annotation.OptionValues;
 import org.springframework.shell.command.invocation.InvocableShellMethod;
 import org.springframework.shell.completion.CompletionProvider;
-import org.springframework.shell.completion.CompletionResolver;
 import org.springframework.shell.context.InteractionMode;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
@@ -172,7 +169,7 @@ class CommandRegistrationFactoryBean implements FactoryBean<CommandRegistration>
 		MergedAnnotation<CommandAvailability> caAnn = MergedAnnotations.from(method, SearchStrategy.TYPE_HIERARCHY)
 				.get(CommandAvailability.class);
 		if (caAnn.isPresent()) {
-			String[] refs = caAnn.getStringArray("name");
+			String[] refs = caAnn.getStringArray("provider");
 			List<AvailabilityProvider> avails = Stream.of(refs)
 				.map(r -> {
 					return this.applicationContext.getBean(r, AvailabilityProvider.class);
diff --git a/spring-shell-core/src/test/java/org/springframework/shell/command/annotation/support/CommandRegistrationFactoryBeanTests.java b/spring-shell-core/src/test/java/org/springframework/shell/command/annotation/support/CommandRegistrationFactoryBeanTests.java
index c537dfc5..f12aae56 100644
--- a/spring-shell-core/src/test/java/org/springframework/shell/command/annotation/support/CommandRegistrationFactoryBeanTests.java
+++ b/spring-shell-core/src/test/java/org/springframework/shell/command/annotation/support/CommandRegistrationFactoryBeanTests.java
@@ -138,7 +138,7 @@ class CommandRegistrationFactoryBeanTests {
 	private static class AvailabilityIndicator {
 
 		@Command
-		@CommandAvailability(name = "testAvailability")
+		@CommandAvailability(provider = "testAvailability")
 		void command1() {
 		}
 
diff --git a/spring-shell-samples/src/main/java/org/springframework/shell/samples/e2e/AvailabilityCommands.java b/spring-shell-samples/src/main/java/org/springframework/shell/samples/e2e/AvailabilityCommands.java
index 93ec30ad..4a533cbd 100644
--- a/spring-shell-samples/src/main/java/org/springframework/shell/samples/e2e/AvailabilityCommands.java
+++ b/spring-shell-samples/src/main/java/org/springframework/shell/samples/e2e/AvailabilityCommands.java
@@ -71,7 +71,7 @@ public class AvailabilityCommands {
 	public static class Annotation extends BaseE2ECommands {
 
 		@Command(command = "availability-1")
-		@CommandAvailability(name = "testAvailability1AnnotationAvailability")
+		@CommandAvailability(provider = "testAvailability1AnnotationAvailability")
 		public String testAvailability1Annotation(
 		) {
 			return "Hello";