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 9112fa750b..2c52e5dcd1 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
@@ -161,7 +161,7 @@ class DefaultLogbackConfiguration {
 		Charset charset = resolveCharset(config, "${" + type + "_LOG_CHARSET}");
 		String structuredLogFormat = resolve(config, "${" + type + "_LOG_STRUCTURED_FORMAT}");
 		if (StringUtils.hasLength(structuredLogFormat)) {
-			StructuredLogEncoder encoder = createStructuredLoggingEncoder(config, structuredLogFormat);
+			StructuredLogEncoder encoder = createStructuredLogEncoder(config, structuredLogFormat);
 			encoder.setCharset(charset);
 			return encoder;
 		}
@@ -171,7 +171,7 @@ class DefaultLogbackConfiguration {
 		return encoder;
 	}
 
-	private StructuredLogEncoder createStructuredLoggingEncoder(LogbackConfigurator config, String format) {
+	private StructuredLogEncoder createStructuredLogEncoder(LogbackConfigurator config, String format) {
 		StructuredLogEncoder encoder = new StructuredLogEncoder();
 		encoder.setFormat(format);
 		return encoder;
diff --git a/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-console-appender.xml b/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-console-appender.xml
index 9117c360a2..c89f545dad 100644
--- a/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-console-appender.xml
+++ b/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-console-appender.xml
@@ -10,7 +10,7 @@ equivalent to the programmatic initialization performed by Boot
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>${CONSOLE_LOG_THRESHOLD}</level>
 		</filter>
-		<encoder class="org.springframework.boot.logging.logback.StructuredLoggingEncoder">
+		<encoder class="org.springframework.boot.logging.logback.StructuredLogEncoder">
 			<format>${CONSOLE_LOG_STRUCTURED_FORMAT}</format>
 			<charset>${CONSOLE_LOG_CHARSET}</charset>
 		</encoder>
diff --git a/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-file-appender.xml b/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-file-appender.xml
index 76d45b4a92..80377634bb 100644
--- a/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-file-appender.xml
+++ b/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-file-appender.xml
@@ -10,7 +10,7 @@ equivalent to the programmatic initialization performed by Boot
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>${FILE_LOG_THRESHOLD}</level>
 		</filter>
-		<encoder class="org.springframework.boot.logging.logback.StructuredLoggingEncoder">
+		<encoder class="org.springframework.boot.logging.logback.StructuredLogEncoder">
 			<format>${FILE_LOG_STRUCTURED_FORMAT}</format>
 			<charset>${FILE_LOG_CHARSET}</charset>
 		</encoder>
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLoggingEncoderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLogEncoderTests.java
similarity index 98%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLoggingEncoderTests.java
rename to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLogEncoderTests.java
index 7015ec3bae..3928f7e952 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLoggingEncoderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLogEncoderTests.java
@@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
  * @author Moritz Halbritter
  * @author Phillip Webb
  */
-class StructuredLoggingEncoderTests extends AbstractStructuredLoggingTests {
+class StructuredLogEncoderTests extends AbstractStructuredLoggingTests {
 
 	private StructuredLogEncoder encoder;