diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportAutoConfiguration.java
index b145cd75d66..ab141a0ea3e 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportAutoConfiguration.java
@@ -53,16 +53,13 @@ public class EndpointMBeanExportAutoConfiguration {
 	@Bean
 	public EndpointMBeanExporter endpointMBeanExporter(MBeanServer server) {
 		EndpointMBeanExporter mbeanExporter = new EndpointMBeanExporter();
-
 		String domain = this.properties.getDomain();
 		if (StringUtils.hasText(domain)) {
 			mbeanExporter.setDomain(domain);
 		}
 		mbeanExporter.setServer(server);
-
 		mbeanExporter.setEnsureUniqueRuntimeObjectNames(this.properties.isUniqueNames());
 		mbeanExporter.setObjectNameStaticProperties(this.properties.getStaticNames());
-
 		return mbeanExporter;
 	}
 
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java
index 1fa2eecc921..54347446e3b 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java
@@ -75,7 +75,7 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
 
 	private FieldValuesParser fieldValuesParser;
 
-	private ElementExcludeFilter elementExcludeFilter = new ElementExcludeFilter();
+	private TypeExcludeFilter typeExcludeFilter = new TypeExcludeFilter();
 
 	protected String configurationPropertiesAnnotation() {
 		return CONFIGURATION_PROPERTIES_ANNOTATION;
@@ -179,7 +179,7 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
 			VariableElement field = members.getFields().get(name);
 			Element returnType = this.processingEnv.getTypeUtils().asElement(
 					getter.getReturnType());
-			boolean isExcluded = this.elementExcludeFilter.isExcluded(getter
+			boolean isExcluded = this.typeExcludeFilter.isExcluded(getter
 					.getReturnType());
 			boolean isNested = isNested(returnType, field, element);
 			boolean isCollection = this.typeUtils.isCollectionOrMap(getter
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ElementExcludeFilter.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeExcludeFilter.java
similarity index 96%
rename from spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ElementExcludeFilter.java
rename to spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeExcludeFilter.java
index a5b468d7a6c..d896587ca46 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ElementExcludeFilter.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeExcludeFilter.java
@@ -27,11 +27,11 @@ import javax.lang.model.type.TypeMirror;
  * @author Stephane Nicoll
  * @since 1.2.0
  */
-class ElementExcludeFilter {
+class TypeExcludeFilter {
 
 	private final Set<String> excludes = new HashSet<String>();
 
-	public ElementExcludeFilter() {
+	public TypeExcludeFilter() {
 		add("java.io.Writer");
 		add("java.io.PrintWriter");
 		add("java.lang.ClassLoader");