diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index e5deb0782dd..cae153fb807 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -6934,7 +6934,7 @@ useful libraries.
 
 [TIP]
 ====
-The starter also brings the vintage engine so that you can run both JUnit 4 and Junit 5
+The starter also brings the vintage engine so that you can run both JUnit 4 and JUnit 5
 tests. If you have migrated your tests to JUnit 5, you should exclude JUnit 4 support, as
 shown in the following example:
 
diff --git a/spring-boot-samples/spring-boot-sample-junit-jupiter/src/main/java/sample/SampleJunitJupiterApplication.java b/spring-boot-samples/spring-boot-sample-junit-jupiter/src/main/java/sample/SampleJUnitJupiterApplication.java
similarity index 88%
rename from spring-boot-samples/spring-boot-sample-junit-jupiter/src/main/java/sample/SampleJunitJupiterApplication.java
rename to spring-boot-samples/spring-boot-sample-junit-jupiter/src/main/java/sample/SampleJUnitJupiterApplication.java
index 5fea44d81bc..725ce5dc07f 100644
--- a/spring-boot-samples/spring-boot-sample-junit-jupiter/src/main/java/sample/SampleJunitJupiterApplication.java
+++ b/spring-boot-samples/spring-boot-sample-junit-jupiter/src/main/java/sample/SampleJUnitJupiterApplication.java
@@ -20,10 +20,10 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class SampleJunitJupiterApplication {
+public class SampleJUnitJupiterApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(SampleJunitJupiterApplication.class, args);
+		SpringApplication.run(SampleJUnitJupiterApplication.class, args);
 	}
 
 }
diff --git a/spring-boot-samples/spring-boot-sample-junit-jupiter/src/test/java/sample/SampleJunitJupiterApplicationTests.java b/spring-boot-samples/spring-boot-sample-junit-jupiter/src/test/java/sample/SampleJUnitJupiterApplicationTests.java
similarity index 96%
rename from spring-boot-samples/spring-boot-sample-junit-jupiter/src/test/java/sample/SampleJunitJupiterApplicationTests.java
rename to spring-boot-samples/spring-boot-sample-junit-jupiter/src/test/java/sample/SampleJUnitJupiterApplicationTests.java
index a535edf3f5e..d115e5275b1 100644
--- a/spring-boot-samples/spring-boot-sample-junit-jupiter/src/test/java/sample/SampleJunitJupiterApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-junit-jupiter/src/test/java/sample/SampleJUnitJupiterApplicationTests.java
@@ -26,7 +26,7 @@ import org.springframework.boot.test.web.client.TestRestTemplate;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-class SampleJunitJupiterApplicationTests {
+class SampleJUnitJupiterApplicationTests {
 
 	@Autowired
 	private TestRestTemplate restTemplate;
diff --git a/spring-boot-samples/spring-boot-sample-junit-vintage/src/main/java/sample/SampleJunitVintageApplication.java b/spring-boot-samples/spring-boot-sample-junit-vintage/src/main/java/sample/SampleJUnitVintageApplication.java
similarity index 88%
rename from spring-boot-samples/spring-boot-sample-junit-vintage/src/main/java/sample/SampleJunitVintageApplication.java
rename to spring-boot-samples/spring-boot-sample-junit-vintage/src/main/java/sample/SampleJUnitVintageApplication.java
index f5385c4eb02..2257815c584 100644
--- a/spring-boot-samples/spring-boot-sample-junit-vintage/src/main/java/sample/SampleJunitVintageApplication.java
+++ b/spring-boot-samples/spring-boot-sample-junit-vintage/src/main/java/sample/SampleJUnitVintageApplication.java
@@ -20,10 +20,10 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class SampleJunitVintageApplication {
+public class SampleJUnitVintageApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(SampleJunitVintageApplication.class, args);
+		SpringApplication.run(SampleJUnitVintageApplication.class, args);
 	}
 
 }
diff --git a/spring-boot-samples/spring-boot-sample-junit-vintage/src/test/java/sample/SampleJunitVintageApplicationTests.java b/spring-boot-samples/spring-boot-sample-junit-vintage/src/test/java/sample/SampleJUnitVintageApplicationTests.java
similarity index 96%
rename from spring-boot-samples/spring-boot-sample-junit-vintage/src/test/java/sample/SampleJunitVintageApplicationTests.java
rename to spring-boot-samples/spring-boot-sample-junit-vintage/src/test/java/sample/SampleJUnitVintageApplicationTests.java
index 3f23fc51856..dec352a4638 100644
--- a/spring-boot-samples/spring-boot-sample-junit-vintage/src/test/java/sample/SampleJunitVintageApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-junit-vintage/src/test/java/sample/SampleJUnitVintageApplicationTests.java
@@ -29,7 +29,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 @RunWith(SpringRunner.class)
 @WebMvcTest
-public class SampleJunitVintageApplicationTests {
+public class SampleJUnitVintageApplicationTests {
 
 	@Autowired
 	private MockMvc mockMvc;
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index 4ff7999a78e..8012edb4a87 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -44,5 +44,5 @@
 	<suppress files="JavaLoggingSystemTests" checks="SpringJUnit5" />
 	<suppress files="Log4J2LoggingSystemTests" checks="SpringJUnit5" />
 	<suppress files="RestClientTestWithComponentIntegrationTests" checks="SpringJUnit5" />
-	<suppress files="SampleJunitVintageApplicationTests" checks="SpringJUnit5" />
+	<suppress files="SampleJUnitVintageApplicationTests" checks="SpringJUnit5" />
 </suppressions>