diff --git a/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/BasePropertyPathNotificationExtractor.java b/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/BasePropertyPathNotificationExtractor.java
index cffa9021..0d8e2a5a 100755
--- a/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/BasePropertyPathNotificationExtractor.java
+++ b/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/BasePropertyPathNotificationExtractor.java
@@ -17,7 +17,7 @@
 package org.springframework.cloud.config.monitor;
 
 import java.util.Collection;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -35,7 +35,7 @@ public abstract class BasePropertyPathNotificationExtractor
 			Map<String, Object> request) {
 		if (requestBelongsToGitRepoManager(headers)) {
 			if (request.get("commits") instanceof Collection) {
-				Set<String> paths = new HashSet<>();
+				Set<String> paths = new LinkedHashSet<>();
 				@SuppressWarnings("unchecked")
 				Collection<Map<String, Object>> commits = (Collection<Map<String, Object>>) request
 						.get("commits");
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java
index 06e9d289..f67836c9 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java
@@ -152,7 +152,7 @@ public class EnvironmentRepositoryConfiguration {
 	protected static class DefaultConfigTokenProvider {
 
 		@Bean
-		public ConfigTokenProvider configTokenProvider(
+		public ConfigTokenProvider defaultConfigTokenProvider(
 				ObjectProvider<HttpServletRequest> httpRequest) {
 			return new HttpRequestConfigTokenProvider(httpRequest);
 		}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/VaultConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/VaultConfiguration.java
index b8cc4b7a..cee8cb84 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/VaultConfiguration.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/VaultConfiguration.java
@@ -46,7 +46,7 @@ public class VaultConfiguration {
 
 	@Bean
 	@ConditionalOnProperty(VAULT_TOKEN_PROPERTY_NAME)
-	public ConfigTokenProvider configTokenProvider(Environment environment) {
+	public ConfigTokenProvider vaultConfigTokenProvider(Environment environment) {
 		return new EnvironmentConfigTokenProvider(environment, VAULT_TOKEN_PROPERTY_NAME);
 	}