diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy
index 67b988a6..5c526139 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy
@@ -95,7 +95,7 @@ abstract class AbstractSpringJavaPlugin implements Plugin<Project> {
 		pluginManager.apply(PropDepsPlugin)
 		pluginManager.apply(PropDepsEclipsePlugin)
 		pluginManager.apply(PropDepsIdeaPlugin)
-		pluginManager.apply(SpringDependencyManagementConventionPlugin)
+		pluginManager.apply(SpringDependencyManagementConventionsPlugin)
 		pluginManager.apply(DependencySetPlugin)
 		pluginManager.apply(TestsConfigurationPlugin)
 		pluginManager.apply(IntegrationTestPlugin)
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringDependencyManagementConventionPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringDependencyManagementConventionsPlugin.groovy
similarity index 88%
rename from buildSrc/src/main/groovy/io/spring/gradle/convention/SpringDependencyManagementConventionPlugin.groovy
rename to buildSrc/src/main/groovy/io/spring/gradle/convention/SpringDependencyManagementConventionsPlugin.groovy
index d1a677c2..9b263628 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringDependencyManagementConventionPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringDependencyManagementConventionsPlugin.groovy
@@ -18,7 +18,6 @@ package io.spring.gradle.convention
 import io.spring.gradle.dependencymanagement.DependencyManagementPlugin
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.plugins.PluginManager
 
 /**
  * Applies and configures the Spring Gradle {@link DependencyManagementPlugin}.
@@ -32,24 +31,26 @@ import org.gradle.api.plugins.PluginManager
  * @see org.gradle.api.Project
  * @see org.gradle.api.plugins.PluginManager
  */
-class SpringDependencyManagementConventionPlugin implements Plugin<Project> {
+class SpringDependencyManagementConventionsPlugin implements Plugin<Project> {
 
     static final String DEPENDENCY_MANAGEMENT_RESOURCE = "gradle/dependency-management.gradle"
 
     @Override
     void apply(Project project) {
 
-        PluginManager pluginManager = project.getPluginManager()
+        applyAndConfigureDependencyManagementPlugin(project)
+        applyDependencyManagementResources(project)
+    }
 
-        pluginManager.apply(DependencyManagementPlugin)
+    private void applyAndConfigureDependencyManagementPlugin(Project project) {
+
+        project.getPluginManager().apply(DependencyManagementPlugin)
 
         project.dependencyManagement {
             resolutionStrategy {
                 cacheChangingModulesFor 0, "seconds"
             }
         }
-
-        applyDependencyManagementResources(project)
     }
 
     @SuppressWarnings("all")
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleBootPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleBootPlugin.groovy
index 7719d425..2211f566 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleBootPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleBootPlugin.groovy
@@ -31,8 +31,8 @@ class SpringSampleBootPlugin extends SpringSamplePlugin {
         project.getPluginManager().apply("org.springframework.boot");
 
         project.repositories {
-            maven { url 'https://repo.spring.io/snapshot' }
             maven { url 'https://repo.spring.io/milestone' }
+            maven { url 'https://repo.spring.io/snapshot' }
         }
     }
 }
diff --git a/buildSrc/src/main/java/org/springframework/gradle/maven/MavenPublishingConventionsPlugin.java b/buildSrc/src/main/java/org/springframework/gradle/maven/MavenPublishConventionsPlugin.java
similarity index 98%
rename from buildSrc/src/main/java/org/springframework/gradle/maven/MavenPublishingConventionsPlugin.java
rename to buildSrc/src/main/java/org/springframework/gradle/maven/MavenPublishConventionsPlugin.java
index 7a6f1b21..9a64bd07 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/maven/MavenPublishingConventionsPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/maven/MavenPublishConventionsPlugin.java
@@ -41,7 +41,7 @@ import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
  * @see org.gradle.api.publish.maven.MavenPublication
  * @see org.gradle.api.publish.maven.plugins.MavenPublishPlugin
  */
-public class MavenPublishingConventionsPlugin implements Plugin<Project> {
+public class MavenPublishConventionsPlugin implements Plugin<Project> {
 
 	@Override
 	public void apply(Project project) {
diff --git a/buildSrc/src/main/java/org/springframework/gradle/maven/SpringMavenPlugin.java b/buildSrc/src/main/java/org/springframework/gradle/maven/SpringMavenPlugin.java
index 72d0a985..82e8d297 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/maven/SpringMavenPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/maven/SpringMavenPlugin.java
@@ -38,7 +38,7 @@ public class SpringMavenPlugin implements Plugin<Project> {
 		PluginManager pluginManager = project.getPluginManager();
 
 		pluginManager.apply(MavenPublishPlugin.class);
-		pluginManager.apply(MavenPublishingConventionsPlugin.class);
+		pluginManager.apply(MavenPublishConventionsPlugin.class);
 		pluginManager.apply(PublishAllJavaComponentsPlugin.class);
 		pluginManager.apply(PublishArtifactsPlugin.class);
 		pluginManager.apply(PublishLocalPlugin.class);
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.springdependencymangement.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.springdependencymangement.properties
index 10b8580c..c8f5dd2d 100644
--- a/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.springdependencymangement.properties
+++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/io.spring.convention.springdependencymangement.properties
@@ -1 +1 @@
-implementation-class=io.spring.gradle.convention.SpringDependencyManagementConventionPlugin
+implementation-class=io.spring.gradle.convention.SpringDependencyManagementConventionsPlugin