diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepTagsProvider.java b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepKeyValuesProvider.java
similarity index 87%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepTagsProvider.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepKeyValuesProvider.java
index 25b7e7355..41e80453a 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepTagsProvider.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepKeyValuesProvider.java
@@ -22,9 +22,10 @@ import io.micrometer.observation.Observation;
  * {@link Observation.KeyValuesProvider} for {@link BatchStepContext}.
  *
  * @author Marcin Grzejszczak
+ * @author Mahmoud Ben Hassine
  * @since 5.0
  */
-public interface BatchStepTagsProvider extends Observation.KeyValuesProvider<BatchStepContext> {
+public interface BatchStepKeyValuesProvider extends Observation.KeyValuesProvider<BatchStepContext> {
 
 	@Override
 	default boolean supportsContext(Observation.Context context) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepTagsProvider.java b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepKeyValuesProvider.java
similarity index 91%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepTagsProvider.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepKeyValuesProvider.java
index a21b76c42..d81173908 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepTagsProvider.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepKeyValuesProvider.java
@@ -20,13 +20,13 @@ import io.micrometer.common.KeyValues;
 import org.springframework.batch.core.StepExecution;
 
 /**
- * Default {@link BatchStepTagsProvider} implementation.
+ * Default {@link BatchStepKeyValuesProvider} implementation.
  *
  * @author Marcin Grzejszczak
  * @author Mahmoud Ben Hassine
  * @since 5.0
  */
-public class DefaultBatchStepTagsProvider implements BatchStepTagsProvider {
+public class DefaultBatchStepKeyValuesProvider implements BatchStepKeyValuesProvider {
 
 	@Override
 	public KeyValues getLowCardinalityKeyValues(BatchStepContext context) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
index da2e90b74..53ed19d90 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
@@ -38,8 +38,8 @@ import org.springframework.batch.core.listener.CompositeStepExecutionListener;
 import org.springframework.batch.core.observability.BatchMetrics;
 import org.springframework.batch.core.observability.BatchStepContext;
 import org.springframework.batch.core.observability.BatchStepObservation;
-import org.springframework.batch.core.observability.BatchStepTagsProvider;
-import org.springframework.batch.core.observability.DefaultBatchStepTagsProvider;
+import org.springframework.batch.core.observability.BatchStepKeyValuesProvider;
+import org.springframework.batch.core.observability.DefaultBatchStepKeyValuesProvider;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.scope.context.StepSynchronizationManager;
 import org.springframework.batch.item.ExecutionContext;
@@ -74,7 +74,7 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw
 
 	private JobRepository jobRepository;
 
-	private BatchStepTagsProvider keyValuesProvider = new DefaultBatchStepTagsProvider();
+	private BatchStepKeyValuesProvider keyValuesProvider = new DefaultBatchStepKeyValuesProvider();
 
 	/**
 	 * Default constructor.
@@ -418,7 +418,7 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw
 		return exitStatus;
 	}
 
-	public void setKeyValuesProvider(BatchStepTagsProvider keyValuesProvider) {
+	public void setKeyValuesProvider(BatchStepKeyValuesProvider keyValuesProvider) {
 		this.keyValuesProvider = keyValuesProvider;
 	}