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 a2588d2ee4..f60b98f159 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
@@ -1777,7 +1777,7 @@ To help with the customization, some other properties are transferred from the S
 
 | `logging.pattern.rolling-file-name`
 | `ROLLING_FILE_NAME_PATTERN`
-| Pattern to use when roll-over log files (default `$\{LOG_FILE}.%d\{yyyy-MM-dd}.%i.gz`).
+| Pattern for rolled-over log file names (default `$\{LOG_FILE}.%d\{yyyy-MM-dd}.%i.gz`).
   (Only supported with the default Logback setup.)
 
 | `PID`
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java
index e8e2d818cd..160be0af97 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java
@@ -97,7 +97,8 @@ public class LoggingSystemProperties {
 	public static final String LOG_DATEFORMAT_PATTERN = "LOG_DATEFORMAT_PATTERN";
 
 	/**
-	 * The name of the System property that contains the rolled-over log file pattern.
+	 * The name of the System property that contains the rolled-over log file name
+	 * pattern.
 	 */
 	public static final String ROLLING_FILE_NAME_PATTERN = "ROLLING_FILE_NAME_PATTERN";
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
index 0e2180a178..8c7322d50c 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
@@ -47,7 +47,6 @@ import org.springframework.util.unit.DataSize;
  * @author Madhura Bhave
  * @author Vedran Pavic
  * @author Robert Thornton
- * @author Eddú Meléndez
  */
 class DefaultLogbackConfiguration {
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
index 658e2a0aea..73425d702d 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
@@ -61,7 +61,6 @@ import org.springframework.util.StringUtils;
  * @author Dave Syer
  * @author Andy Wilkinson
  * @author Ben Hale
- * @author Eddú Meléndez
  * @since 1.0.0
  */
 public class LogbackLoggingSystem extends Slf4JLoggingSystem {
diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index bd4c7a4e70..613e4a15a1 100644
--- a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -168,7 +168,7 @@
     {
       "name": "logging.pattern.rolling-file-name",
       "type": "java.lang.String",
-      "description": "Pattern for roll-over log files. Supported only with the default Logback setup.",
+      "description": "Pattern for rolled-over log file names. Supported only with the default Logback setup.",
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
       "defaultValue": "${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz"
     },
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/LoggingSystemPropertiesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/LoggingSystemPropertiesTests.java
index 3d8d0ef5bd..dee39064d0 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/LoggingSystemPropertiesTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/LoggingSystemPropertiesTests.java
@@ -84,7 +84,7 @@ class LoggingSystemPropertiesTests {
 	}
 
 	@Test
-	void rollingFileIsSet() {
+	void rollingFileNameIsSet() {
 		new LoggingSystemProperties(
 				new MockEnvironment().withProperty("logging.pattern.rolling-file-name", "rolling file pattern"))
 						.apply(null);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationTests.java
index a80cc8d833..1c2391ec33 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationTests.java
@@ -69,7 +69,7 @@ class LogbackConfigurationTests {
 	}
 
 	@Test
-	void defaultFileNamePattern() throws JoranException {
+	void defaultRollingFileNamePattern() throws JoranException {
 		JoranConfigurator configurator = new JoranConfigurator();
 		LoggerContext context = new LoggerContext();
 		configurator.setContext(context);
@@ -82,7 +82,7 @@ class LogbackConfigurationTests {
 	}
 
 	@Test
-	void customFileNamePattern() throws JoranException {
+	void customRollingFileNamePattern() throws JoranException {
 		JoranConfigurator configurator = new JoranConfigurator();
 		LoggerContext context = new LoggerContext();
 		configurator.setContext(context);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
index ffd49315c3..2fab7a2f00 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
@@ -539,7 +539,7 @@ class LogbackLoggingSystemTests extends AbstractLoggingSystemTests {
 	}
 
 	@Test
-	void testRollingFileProperty() {
+	void testRollingFileNameProperty() {
 		MockEnvironment environment = new MockEnvironment();
 		String rollingFile = "my.log.%d{yyyyMMdd}.%i.gz";
 		environment.setProperty("logging.pattern.rolling-file-name", rollingFile);