Adjusted test classes to include WithSetterPrefix.

21 files changed, 318 insertions, 318 deletions

diff --git a/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java
index c29d2a16..b10ad619 100644
--- a/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java
@@ -1,34 +1,34 @@
 import java.util.List;
-class BuilderWithPrefix<T> {
+class BuilderSimpleWithSetterPrefix<T> {
 	private int unprefixed;
 	@java.lang.SuppressWarnings("all")
-	BuilderWithPrefix(final int unprefixed) {
+	BuilderSimpleWithSetterPrefix(final int unprefixed) {
 		this.unprefixed = unprefixed;
 	}
 	@java.lang.SuppressWarnings("all")
-	protected static class BuilderWithPrefixBuilder<T> {
+	protected static class BuilderSimpleWithSetterPrefixBuilder<T> {
 		@java.lang.SuppressWarnings("all")
 		private int unprefixed;
 		@java.lang.SuppressWarnings("all")
-		BuilderWithPrefixBuilder() {
+		BuilderSimpelWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithPrefixBuilder<T> withUnprefixed(final int unprefixed) {
+		public BuilderSimpleWithSetterPrefixBuilder<T> withUnprefixed(final int unprefixed) {
 			this.unprefixed = unprefixed;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithPrefix<T> build() {
-			return new BuilderWithPrefix<T>(unprefixed);
+		public BuilderSimpleWithSetterPrefix<T> build() {
+			return new BuilderSimpleWithSetterPrefix<T>(unprefixed);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderWithPrefix.BuilderWithPrefixBuilder(unprefixed=" + this.unprefixed + ")";
+			return "BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder(unprefixed=" + this.unprefixed + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	protected static <T> BuilderWithPrefixBuilder<T> builder() {
-		return new BuilderWithPrefixBuilder<T>();
+	protected static <T> BuilderSimpleWithSetterPrefixBuilder<T> builder() {
+		return new BuilderSimpleWithSetterPrefixBuilder<T>();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java
index 2d535e65..c90e3233 100644
--- a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java
@@ -6,16 +6,16 @@ import lombok.NonNull;
 @Target(ElementType.TYPE_USE)
 @interface MyAnnotation {
 }
-class BuilderSingularAnnotatedTypes {
+class BuilderSingularAnnotatedTypesWithSetterPrefix {
 	private Set<@MyAnnotation @NonNull String> foos;
 	private Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars;
 	@java.lang.SuppressWarnings("all")
-	BuilderSingularAnnotatedTypes(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) {
+	BuilderSingularAnnotatedTypesWithSetterPrefix(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) {
 		this.foos = foos;
 		this.bars = bars;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderSingularAnnotatedTypesBuilder {
+	public static class BuilderSingularAnnotatedTypesWithSetterPrefixBuilder {
 		@java.lang.SuppressWarnings("all")
 		private java.util.ArrayList<@MyAnnotation @NonNull String> foos;
 		@java.lang.SuppressWarnings("all")
@@ -23,10 +23,10 @@ class BuilderSingularAnnotatedTypes {
 		@java.lang.SuppressWarnings("all")
 		private java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value;
 		@java.lang.SuppressWarnings("all")
-		BuilderSingularAnnotatedTypesBuilder() {
+		BuilderSingularAnnotatedTypesWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularAnnotatedTypesBuilder withFoo(@MyAnnotation @NonNull final String foo) {
+		public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoo(@MyAnnotation @NonNull final String foo) {
 			if (foo == null) {
 				throw new java.lang.NullPointerException("foo is marked non-null but is null");
 			}
@@ -35,18 +35,18 @@ class BuilderSingularAnnotatedTypes {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularAnnotatedTypesBuilder withFoos(final java.util.Collection<? extends @MyAnnotation @NonNull String> foos) {
+		public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoos(final java.util.Collection<? extends @MyAnnotation @NonNull String> foos) {
 			if (this.foos == null) this.foos = new java.util.ArrayList<@MyAnnotation @NonNull String>();
 			this.foos.addAll(foos);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularAnnotatedTypesBuilder clearFoos() {
+		public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearFoos() {
 			if (this.foos != null) this.foos.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularAnnotatedTypesBuilder withBar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull final Integer barValue) {
+		public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull final Integer barValue) {
 			if (barKey == null) {
 				throw new java.lang.NullPointerException("barKey is marked non-null but is null");
 			}
@@ -62,7 +62,7 @@ class BuilderSingularAnnotatedTypes {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularAnnotatedTypesBuilder withBars(final java.util.Map<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> bars) {
+		public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBars(final java.util.Map<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> bars) {
 			if (this.bars$key == null) {
 				this.bars$key = new java.util.ArrayList<@MyAnnotation @NonNull String>();
 				this.bars$value = new java.util.ArrayList<@MyAnnotation @NonNull Integer>();
@@ -74,7 +74,7 @@ class BuilderSingularAnnotatedTypes {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularAnnotatedTypesBuilder clearBars() {
+		public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearBars() {
 			if (this.bars$key != null) {
 				this.bars$key.clear();
 				this.bars$value.clear();
@@ -82,7 +82,7 @@ class BuilderSingularAnnotatedTypes {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularAnnotatedTypes build() {
+		public BuilderSingularAnnotatedTypesWithSetterPrefix build() {
 			java.util.Set<@MyAnnotation @NonNull String> foos;
 			switch (this.foos == null ? 0 : this.foos.size()) {
 			case 0: 
@@ -109,16 +109,16 @@ class BuilderSingularAnnotatedTypes {
 				for (int $i = 0; $i < this.bars$key.size(); $i++) bars.put(this.bars$key.get($i), (@MyAnnotation @NonNull Integer) this.bars$value.get($i));
 				bars = java.util.Collections.unmodifiableMap(bars);
 			}
-			return new BuilderSingularAnnotatedTypes(foos, bars);
+			return new BuilderSingularAnnotatedTypesWithSetterPrefix(foos, bars);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder(foos=" + this.foos + ", bars$key=" + this.bars$key + ", bars$value=" + this.bars$value + ")";
+			return "BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder(foos=" + this.foos + ", bars$key=" + this.bars$key + ", bars$value=" + this.bars$value + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderSingularAnnotatedTypesBuilder builder() {
+	public static BuilderSingularAnnotatedTypesWithSetterPrefixBuilder builder() {
 		return new BuilderSingularAnnotatedTypesBuilder();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSetsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSetsWithSetterPrefix.java
index 0e9e6dfd..792a873e 100644
--- a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSetsWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSetsWithSetterPrefix.java
@@ -3,7 +3,7 @@ import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.ImmutableTable;
-class BuilderSingularGuavaListsSets<T> {
+class BuilderSingularGuavaListsSetsWithSetterPrefix<T> {
 	private ImmutableList<T> cards;
 	private ImmutableCollection<? extends Number> frogs;
 	@SuppressWarnings("all")
@@ -11,7 +11,7 @@ class BuilderSingularGuavaListsSets<T> {
 	private ImmutableSortedSet<String> passes;
 	private ImmutableTable<? extends Number, ? extends Number, String> users;
 	@java.lang.SuppressWarnings("all")
-	BuilderSingularGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes, final ImmutableTable<? extends Number, ? extends Number, String> users) {
+	BuilderSingularGuavaListsSetsWithSetterPrefix(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes, final ImmutableTable<? extends Number, ? extends Number, String> users) {
 		this.cards = cards;
 		this.frogs = frogs;
 		this.rawSet = rawSet;
@@ -19,7 +19,7 @@ class BuilderSingularGuavaListsSets<T> {
 		this.users = users;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderSingularGuavaListsSetsBuilder<T> {
+	public static class BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> {
 		@java.lang.SuppressWarnings("all")
 		private com.google.common.collect.ImmutableList.Builder<T> cards;
 		@java.lang.SuppressWarnings("all")
@@ -34,107 +34,107 @@ class BuilderSingularGuavaListsSets<T> {
 		BuilderSingularGuavaListsSetsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularGuavaListsSetsBuilder<T> withCard(final T card) {
+		public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withCard(final T card) {
 			if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder();
 			this.cards.add(card);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularGuavaListsSetsBuilder<T> withCards(final java.lang.Iterable<? extends T> cards) {
+		public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withCards(final java.lang.Iterable<? extends T> cards) {
 			if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder();
 			this.cards.addAll(cards);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularGuavaListsSetsBuilder<T> clearCards() {
+		public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearCards() {
 			this.cards = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularGuavaListsSetsBuilder<T> withFrog(final Number frog) {
+		public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withFrog(final Number frog) {
 			if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder();
 			this.frogs.add(frog);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularGuavaListsSetsBuilder<T> withFrogs(final java.lang.Iterable<? extends Number> frogs) {
+		public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withFrogs(final java.lang.Iterable<? extends Number> frogs) {
 			if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder();
 			this.frogs.addAll(frogs);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() {
+		public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearFrogs() {
 			this.frogs = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularGuavaListsSetsBuilder<T> withRawSet(final java.lang.Object rawSet) {
+		public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withRawSet(final java.lang.Object rawSet) {
 			if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder();
 			this.rawSet.add(rawSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularGuavaListsSetsBuilder<T> withRawSet(final java.lang.Iterable<?> rawSet) {
+		public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withRawSet(final java.lang.Iterable<?> rawSet) {
 			if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder();
 			this.rawSet.addAll(rawSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() {
+		public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearRawSet() {
 			this.rawSet = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularGuavaListsSetsBuilder<T> withPass(final String pass) {
+		public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withPass(final String pass) {
 			if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
 			this.passes.add(pass);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularGuavaListsSetsBuilder<T> withPasses(final java.lang.Iterable<? extends String> passes) {
+		public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withPasses(final java.lang.Iterable<? extends String> passes) {
 			if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
 			this.passes.addAll(passes);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularGuavaListsSetsBuilder<T> clearPasses() {
+		public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearPasses() {
 			this.passes = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularGuavaListsSetsBuilder<T> withUser(final Number rowKey, final Number columnKey, final String value) {
+		public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withUser(final Number rowKey, final Number columnKey, final String value) {
 			if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder();
 			this.users.put(rowKey, columnKey, value);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularGuavaListsSetsBuilder<T> withUsers(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) {
+		public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withUsers(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) {
 			if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder();
 			this.users.putAll(users);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularGuavaListsSetsBuilder<T> clearUsers() {
+		public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearUsers() {
 			this.users = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularGuavaListsSets<T> build() {
+		public BuilderSingularGuavaListsSetsWithSetterPrefix<T> build() {
 			com.google.common.collect.ImmutableList<T> cards = this.cards == null ? com.google.common.collect.ImmutableList.<T>of() : this.cards.build();
 			com.google.common.collect.ImmutableCollection<Number> frogs = this.frogs == null ? com.google.common.collect.ImmutableList.<Number>of() : this.frogs.build();
 			com.google.common.collect.ImmutableSet<java.lang.Object> rawSet = this.rawSet == null ? com.google.common.collect.ImmutableSet.<java.lang.Object>of() : this.rawSet.build();
 			com.google.common.collect.ImmutableSortedSet<String> passes = this.passes == null ? com.google.common.collect.ImmutableSortedSet.<String>of() : this.passes.build();
 			com.google.common.collect.ImmutableTable<Number, Number, String> users = this.users == null ? com.google.common.collect.ImmutableTable.<Number, Number, String>of() : this.users.build();
-			return new BuilderSingularGuavaListsSets<T>(cards, frogs, rawSet, passes, users);
+			return new BuilderSingularGuavaListsSetsWithSetterPrefix<T>(cards, frogs, rawSet, passes, users);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ", users=" + this.users + ")";
+			return "BuilderSingularGuavaListsSetsWithSetterPrefix.BuilderSingularGuavaListsSetsWithSetterPrefixBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ", users=" + this.users + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static <T> BuilderSingularGuavaListsSetsBuilder<T> builder() {
-		return new BuilderSingularGuavaListsSetsBuilder<T>();
+	public static <T> BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> builder() {
+		return new BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T>();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderSingularListsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularListsWithSetterPrefix.java
index 1fd58406..029ecda7 100644
--- a/test/transform/resource/after-delombok/BuilderSingularListsWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSingularListsWithSetterPrefix.java
@@ -1,18 +1,18 @@
 import java.util.List;
 import java.util.Collection;
-class BuilderSingularLists<T> {
+class BuilderSingularListsWithSetterPrefix<T> {
 	private List<T> children;
 	private Collection<? extends Number> scarves;
 	@SuppressWarnings("all")
 	private List rawList;
 	@java.lang.SuppressWarnings("all")
-	BuilderSingularLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) {
+	BuilderSingularListsWithSetterPrefix(final List<T> children, final Collection<? extends Number> scarves, final List rawList) {
 		this.children = children;
 		this.scarves = scarves;
 		this.rawList = rawList;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderSingularListsBuilder<T> {
+	public static class BuilderSingularListsWithSetterPrefixBuilder<T> {
 		@java.lang.SuppressWarnings("all")
 		private java.util.ArrayList<T> children;
 		@java.lang.SuppressWarnings("all")
@@ -23,58 +23,58 @@ class BuilderSingularLists<T> {
 		BuilderSingularListsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularListsBuilder<T> withChild(final T child) {
+		public BuilderSingularListsWithSetterPrefixBuilder<T> withChild(final T child) {
 			if (this.children == null) this.children = new java.util.ArrayList<T>();
 			this.children.add(child);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularListsBuilder<T> withChildren(final java.util.Collection<? extends T> children) {
+		public BuilderSingularListsWithSetterPrefixBuilder<T> withChildren(final java.util.Collection<? extends T> children) {
 			if (this.children == null) this.children = new java.util.ArrayList<T>();
 			this.children.addAll(children);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularListsBuilder<T> clearChildren() {
+		public BuilderSingularListsWithSetterPrefixBuilder<T> clearChildren() {
 			if (this.children != null) this.children.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularListsBuilder<T> withScarf(final Number scarf) {
+		public BuilderSingularListsWithSetterPrefixBuilder<T> withScarf(final Number scarf) {
 			if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>();
 			this.scarves.add(scarf);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularListsBuilder<T> withScarves(final java.util.Collection<? extends Number> scarves) {
+		public BuilderSingularListsWithSetterPrefixBuilder<T> withScarves(final java.util.Collection<? extends Number> scarves) {
 			if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>();
 			this.scarves.addAll(scarves);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularListsBuilder<T> clearScarves() {
+		public BuilderSingularListsWithSetterPrefixBuilder<T> clearScarves() {
 			if (this.scarves != null) this.scarves.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularListsBuilder<T> withRawList(final java.lang.Object rawList) {
+		public BuilderSingularListsWithSetterPrefixBuilder<T> withRawList(final java.lang.Object rawList) {
 			if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>();
 			this.rawList.add(rawList);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularListsBuilder<T> withRawList(final java.util.Collection<?> rawList) {
+		public BuilderSingularListsWithSetterPrefixBuilder<T> withRawList(final java.util.Collection<?> rawList) {
 			if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>();
 			this.rawList.addAll(rawList);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularListsBuilder<T> clearRawList() {
+		public BuilderSingularListsWithSetterPrefixBuilder<T> clearRawList() {
 			if (this.rawList != null) this.rawList.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularLists<T> build() {
+		public BuilderSingularListsWithSetterPrefix<T> build() {
 			java.util.List<T> children;
 			switch (this.children == null ? 0 : this.children.size()) {
 			case 0: 
@@ -108,16 +108,16 @@ class BuilderSingularLists<T> {
 			default: 
 				rawList = java.util.Collections.unmodifiableList(new java.util.ArrayList<java.lang.Object>(this.rawList));
 			}
-			return new BuilderSingularLists<T>(children, scarves, rawList);
+			return new BuilderSingularListsWithSetterPrefix<T>(children, scarves, rawList);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")";
+			return "BuilderSingularListsWithSetterPrefix.BuilderSingularListsWithSetterPrefixBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static <T> BuilderSingularListsBuilder<T> builder() {
-		return new BuilderSingularListsBuilder<T>();
+	public static <T> BuilderSingularListsWithSetterPrefixBuilder<T> builder() {
+		return new BuilderSingularListsWithSetterPrefixBuilder<T>();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java
index 4b250994..361a9f09 100644
--- a/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java
@@ -1,6 +1,6 @@
 import java.util.Map;
 import java.util.SortedMap;
-class BuilderSingularMaps<K, V> {
+class BuilderSingularMapsWithSetterPrefix<K, V> {
 	private Map<K, V> women;
 	private SortedMap<K, ? extends Number> men;
 	@SuppressWarnings("all")
@@ -14,7 +14,7 @@ class BuilderSingularMaps<K, V> {
 		this.stringMap = stringMap;
 	}
 	@SuppressWarnings("all")
-	public static class BuilderSingularMapsBuilder<K, V> {
+	public static class BuilderSingularMapsWithSetterPrefixBuilder<K, V> {
 		@SuppressWarnings("all")
 		private java.util.ArrayList<K> women$key;
 		@SuppressWarnings("all")
@@ -35,7 +35,7 @@ class BuilderSingularMaps<K, V> {
 		BuilderSingularMapsBuilder() {
 		}
 		@SuppressWarnings("all")
-		public BuilderSingularMapsBuilder<K, V> withWoman(K womanKey, V womanValue) {
+		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withWoman(K womanKey, V womanValue) {
 			if (this.women$key == null) {
 				this.women$key = new java.util.ArrayList<K>();
 				this.women$value = new java.util.ArrayList<V>();
@@ -45,7 +45,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@SuppressWarnings("all")
-		public BuilderSingularMapsBuilder<K, V> withWomen(java.util.Map<? extends K, ? extends V> women) {
+		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withWomen(java.util.Map<? extends K, ? extends V> women) {
 			if (this.women$key == null) {
 				this.women$key = new java.util.ArrayList<K>();
 				this.women$value = new java.util.ArrayList<V>();
@@ -57,7 +57,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@SuppressWarnings("all")
-		public BuilderSingularMapsBuilder<K, V> clearWomen() {
+		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearWomen() {
 			if (this.women$key != null) {
 				this.women$key.clear();
 				this.women$value.clear();
@@ -65,7 +65,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@SuppressWarnings("all")
-		public BuilderSingularMapsBuilder<K, V> withMan(K manKey, Number manValue) {
+		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withMan(K manKey, Number manValue) {
 			if (this.men$key == null) {
 				this.men$key = new java.util.ArrayList<K>();
 				this.men$value = new java.util.ArrayList<Number>();
@@ -75,7 +75,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@SuppressWarnings("all")
-		public BuilderSingularMapsBuilder<K, V> withMen(java.util.Map<? extends K, ? extends Number> men) {
+		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withMen(java.util.Map<? extends K, ? extends Number> men) {
 			if (this.men$key == null) {
 				this.men$key = new java.util.ArrayList<K>();
 				this.men$value = new java.util.ArrayList<Number>();
@@ -87,7 +87,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@SuppressWarnings("all")
-		public BuilderSingularMapsBuilder<K, V> clearMen() {
+		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearMen() {
 			if (this.men$key != null) {
 				this.men$key.clear();
 				this.men$value.clear();
@@ -95,7 +95,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@SuppressWarnings("all")
-		public BuilderSingularMapsBuilder<K, V> withRawMan(Object rawMapKey, Object rawMapValue) {
+		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withRawMan(Object rawMapKey, Object rawMapValue) {
 			if (this.rawMap$key == null) {
 				this.rawMap$key = new java.util.ArrayList<Object>();
 				this.rawMap$value = new java.util.ArrayList<Object>();
@@ -105,7 +105,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@SuppressWarnings("all")
-		public BuilderSingularMapsBuilder<K, V> withRawMap(java.util.Map<?, ?> rawMap) {
+		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withRawMap(java.util.Map<?, ?> rawMap) {
 			if (this.rawMap$key == null) {
 				this.rawMap$key = new java.util.ArrayList<Object>();
 				this.rawMap$value = new java.util.ArrayList<Object>();
@@ -117,7 +117,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@SuppressWarnings("all")
-		public BuilderSingularMapsBuilder<K, V> clearRawMap() {
+		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearRawMap() {
 			if (this.rawMap$key != null) {
 				this.rawMap$key.clear();
 				this.rawMap$value.clear();
@@ -125,7 +125,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@SuppressWarnings("all")
-		public BuilderSingularMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) {
+		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) {
 			if (this.stringMap$key == null) {
 				this.stringMap$key = new java.util.ArrayList<String>();
 				this.stringMap$value = new java.util.ArrayList<V>();
@@ -135,7 +135,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@SuppressWarnings("all")
-		public BuilderSingularMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) {
+		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) {
 			if (this.stringMap$key == null) {
 				this.stringMap$key = new java.util.ArrayList<String>();
 				this.stringMap$value = new java.util.ArrayList<V>();
@@ -147,7 +147,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@SuppressWarnings("all")
-		public BuilderSingularMapsBuilder<K, V> clearStringMap() {
+		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearStringMap() {
 			if (this.stringMap$key != null) {
 				this.stringMap$key.clear();
 				this.stringMap$value.clear();
@@ -155,7 +155,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@SuppressWarnings("all")
-		public BuilderSingularMaps<K, V> build() {
+		public BuilderSingularMapsWithSetterPrefix<K, V> build() {
 			java.util.Map<K, V> women;
 			switch (this.women$key == null ? 0 : this.women$key.size()) {
 			case 0:
@@ -198,16 +198,16 @@ class BuilderSingularMaps<K, V> {
 				for (int $i = 0; $i < this.stringMap$key.size(); $i++) stringMap.put(this.stringMap$key.get($i), (V) this.stringMap$value.get($i));
 				stringMap = java.util.Collections.unmodifiableMap(stringMap);
 			}
-			return new BuilderSingularMaps<K, V>(women, men, rawMap, stringMap);
+			return new BuilderSingularMapsWithSetterPrefix<K, V>(women, men, rawMap, stringMap);
 		}
 		@Override
 		@SuppressWarnings("all")
 		public String toString() {
-			return "BuilderSingularMaps.BuilderSingularMapsBuilder(women$key=" + this.women$key + ", women$value=" + this.women$value + ", men$key=" + this.men$key + ", men$value=" + this.men$value + ", rawMap$key=" + this.rawMap$key + ", rawMap$value=" + this.rawMap$value + ", stringMap$key=" + this.stringMap$key + ", stringMap$value=" + this.stringMap$value + ")";
+			return "BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder(women$key=" + this.women$key + ", women$value=" + this.women$value + ", men$key=" + this.men$key + ", men$value=" + this.men$value + ", rawMap$key=" + this.rawMap$key + ", rawMap$value=" + this.rawMap$value + ", stringMap$key=" + this.stringMap$key + ", stringMap$value=" + this.stringMap$value + ")";
 		}
 	}
 	@SuppressWarnings("all")
-	public static <K, V> BuilderSingularMapsBuilder<K, V> builder() {
-		return new BuilderSingularMapsBuilder<K, V>();
+	public static <K, V> BuilderSingularMapsWithSetterPrefixBuilder<K, V> builder() {
+		return new BuilderSingularMapsWithSetterPrefixBuilder<K, V>();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java
index 453b9d74..6a22152b 100644
--- a/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java
@@ -1,16 +1,16 @@
 import java.util.List;
-class BuilderSingularNoAuto {
+class BuilderSingularNoAutoWithSetterPrefix {
 	private List<String> things;
 	private List<String> widgets;
 	private List<String> items;
 	@java.lang.SuppressWarnings("all")
-	BuilderSingularNoAuto(final List<String> things, final List<String> widgets, final List<String> items) {
+	BuilderSingularNoAutoWithSetterPrefix(final List<String> things, final List<String> widgets, final List<String> items) {
 		this.things = things;
 		this.widgets = widgets;
 		this.items = items;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderSingularNoAutoBuilder {
+	public static class BuilderSingularNoAutoWithSetterPrefixBuilder {
 		@java.lang.SuppressWarnings("all")
 		private java.util.ArrayList<String> things;
 		@java.lang.SuppressWarnings("all")
@@ -21,58 +21,58 @@ class BuilderSingularNoAuto {
 		BuilderSingularNoAutoBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularNoAutoBuilder withThings(final String things) {
+		public BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final String things) {
 			if (this.things == null) this.things = new java.util.ArrayList<String>();
 			this.things.add(things);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularNoAutoBuilder withThings(final java.util.Collection<? extends String> things) {
+		public BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final java.util.Collection<? extends String> things) {
 			if (this.things == null) this.things = new java.util.ArrayList<String>();
 			this.things.addAll(things);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularNoAutoBuilder clearThings() {
+		public BuilderSingularNoAutoWithSetterPrefixBuilder clearThings() {
 			if (this.things != null) this.things.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularNoAutoBuilder withWidget(final String widget) {
+		public BuilderSingularNoAutoWithSetterPrefixBuilder withWidget(final String widget) {
 			if (this.widgets == null) this.widgets = new java.util.ArrayList<String>();
 			this.widgets.add(widget);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularNoAutoBuilder withWidgets(final java.util.Collection<? extends String> widgets) {
+		public BuilderSingularNoAutoWithSetterPrefixBuilder withWidgets(final java.util.Collection<? extends String> widgets) {
 			if (this.widgets == null) this.widgets = new java.util.ArrayList<String>();
 			this.widgets.addAll(widgets);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularNoAutoBuilder clearWidgets() {
+		public BuilderSingularNoAutoWithSetterPrefixBuilder clearWidgets() {
 			if (this.widgets != null) this.widgets.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularNoAutoBuilder withItems(final String items) {
+		public BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final String items) {
 			if (this.items == null) this.items = new java.util.ArrayList<String>();
 			this.items.add(items);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularNoAutoBuilder withItems(final java.util.Collection<? extends String> items) {
+		public BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final java.util.Collection<? extends String> items) {
 			if (this.items == null) this.items = new java.util.ArrayList<String>();
 			this.items.addAll(items);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularNoAutoBuilder clearItems() {
+		public BuilderSingularNoAutoWithSetterPrefixBuilder clearItems() {
 			if (this.items != null) this.items.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularNoAuto build() {
+		public BuilderSingularNoAutoWithSetterPrefix build() {
 			java.util.List<String> things;
 			switch (this.things == null ? 0 : this.things.size()) {
 			case 0: 
@@ -106,16 +106,16 @@ class BuilderSingularNoAuto {
 			default: 
 				items = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.items));
 			}
-			return new BuilderSingularNoAuto(things, widgets, items);
+			return new BuilderSingularNoAutoWithSetterPrefix(things, widgets, items);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(things=" + this.things + ", widgets=" + this.widgets + ", items=" + this.items + ")";
+			return "BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder(things=" + this.things + ", widgets=" + this.widgets + ", items=" + this.items + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderSingularNoAutoBuilder builder() {
-		return new BuilderSingularNoAutoBuilder();
+	public static BuilderSingularNoAutoWithSetterPrefixBuilder builder() {
+		return new BuilderSingularNoAutoWithSetterPrefixBuilder();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuavaWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuavaWithSetterPrefix.java
index 4b1b3d70..b0fe8135 100644
--- a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuavaWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuavaWithSetterPrefix.java
@@ -1,18 +1,18 @@
 import java.util.Set;
 import java.util.NavigableMap;
 import java.util.Collection;
-class BuilderSingularRedirectToGuava {
+class BuilderSingularRedirectToGuavaWithSetterPrefix {
 	private Set<String> dangerMice;
 	private NavigableMap<Integer, Number> things;
 	private Collection<Class<?>> doohickeys;
 	@java.lang.SuppressWarnings("all")
-	BuilderSingularRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) {
+	BuilderSingularRedirectToGuavaWithSetterPrefix(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) {
 		this.dangerMice = dangerMice;
 		this.things = things;
 		this.doohickeys = doohickeys;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderSingularRedirectToGuavaBuilder {
+	public static class BuilderSingularRedirectToGuavaWithSetterPrefixBuilder {
 		@java.lang.SuppressWarnings("all")
 		private com.google.common.collect.ImmutableSet.Builder<String> dangerMice;
 		@java.lang.SuppressWarnings("all")
@@ -20,74 +20,74 @@ class BuilderSingularRedirectToGuava {
 		@java.lang.SuppressWarnings("all")
 		private com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys;
 		@java.lang.SuppressWarnings("all")
-		BuilderSingularRedirectToGuavaBuilder() {
+		BuilderSingularRedirectToGuavaWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularRedirectToGuavaBuilder withDangerMouse(final String dangerMouse) {
+		public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withDangerMouse(final String dangerMouse) {
 			if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder();
 			this.dangerMice.add(dangerMouse);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularRedirectToGuavaBuilder withDangerMice(final java.lang.Iterable<? extends String> dangerMice) {
+		public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withDangerMice(final java.lang.Iterable<? extends String> dangerMice) {
 			if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder();
 			this.dangerMice.addAll(dangerMice);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularRedirectToGuavaBuilder clearDangerMice() {
+		public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder clearDangerMice() {
 			this.dangerMice = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularRedirectToGuavaBuilder withThing(final Integer key, final Number value) {
+		public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withThing(final Integer key, final Number value) {
 			if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder();
 			this.things.put(key, value);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularRedirectToGuavaBuilder withThings(final java.util.Map<? extends Integer, ? extends Number> things) {
+		public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withThings(final java.util.Map<? extends Integer, ? extends Number> things) {
 			if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder();
 			this.things.putAll(things);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularRedirectToGuavaBuilder clearThings() {
+		public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder clearThings() {
 			this.things = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularRedirectToGuavaBuilder withDoohickey(final Class<?> doohickey) {
+		public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withDoohickey(final Class<?> doohickey) {
 			if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder();
 			this.doohickeys.add(doohickey);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularRedirectToGuavaBuilder withDoohickeys(final java.lang.Iterable<? extends Class<?>> doohickeys) {
+		public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withDoohickeys(final java.lang.Iterable<? extends Class<?>> doohickeys) {
 			if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder();
 			this.doohickeys.addAll(doohickeys);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularRedirectToGuavaBuilder clearDoohickeys() {
+		public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder clearDoohickeys() {
 			this.doohickeys = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularRedirectToGuava build() {
+		public BuilderSingularRedirectToGuavaWithSetterPrefix build() {
 			java.util.Set<String> dangerMice = this.dangerMice == null ? com.google.common.collect.ImmutableSet.<String>of() : this.dangerMice.build();
 			java.util.NavigableMap<Integer, Number> things = this.things == null ? com.google.common.collect.ImmutableSortedMap.<Integer, Number>of() : this.things.build();
 			java.util.Collection<Class<?>> doohickeys = this.doohickeys == null ? com.google.common.collect.ImmutableList.<Class<?>>of() : this.doohickeys.build();
-			return new BuilderSingularRedirectToGuava(dangerMice, things, doohickeys);
+			return new BuilderSingularRedirectToGuavaWithSetterPrefix(dangerMice, things, doohickeys);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")";
+			return "BuilderSingularRedirectToGuavaWithSetterPrefix.BuilderSingularRedirectToGuavaWithSetterPrefixBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderSingularRedirectToGuavaBuilder builder() {
-		return new BuilderSingularRedirectToGuavaBuilder();
+	public static BuilderSingularRedirectToGuavaWithSetterPrefixBuilder builder() {
+		return new BuilderSingularRedirectToGuavaWithSetterPrefixBuilder();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java
index 83e58e1d..043cf25c 100644
--- a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java
@@ -1,38 +1,38 @@
-class BuilderSingularToBuilderWithNull {
+class BuilderSingularToBuilderWithNullWithSetterPrefix {
 	private java.util.List<String> elems;
 	public static void test() {
-		new BuilderSingularToBuilderWithNull(null).toBuilder();
+		new BuilderSingularToBuilderWithNullWithSetterPrefix(null).toBuilder();
 	}
 	@java.lang.SuppressWarnings("all")
-	BuilderSingularToBuilderWithNull(final java.util.List<String> elems) {
+	BuilderSingularToBuilderWithNullWithSetterPrefix(final java.util.List<String> elems) {
 		this.elems = elems;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderSingularToBuilderWithNullBuilder {
+	public static class BuilderSingularToBuilderWithNullWithSetterPrefixBuilder {
 		@java.lang.SuppressWarnings("all")
 		private java.util.ArrayList<String> elems;
 		@java.lang.SuppressWarnings("all")
-		BuilderSingularToBuilderWithNullBuilder() {
+		BuilderSingularToBuilderWithNullWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularToBuilderWithNullBuilder withElem(final String elem) {
+		public BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElem(final String elem) {
 			if (this.elems == null) this.elems = new java.util.ArrayList<String>();
 			this.elems.add(elem);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularToBuilderWithNullBuilder withElems(final java.util.Collection<? extends String> elems) {
+		public BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElems(final java.util.Collection<? extends String> elems) {
 			if (this.elems == null) this.elems = new java.util.ArrayList<String>();
 			this.elems.addAll(elems);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularToBuilderWithNullBuilder clearElems() {
+		public BuilderSingularToBuilderWithNullWithSetterPrefixBuilder clearElems() {
 			if (this.elems != null) this.elems.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularToBuilderWithNull build() {
+		public BuilderSingularToBuilderWithNullWithSetterPrefix build() {
 			java.util.List<String> elems;
 			switch (this.elems == null ? 0 : this.elems.size()) {
 			case 0: 
@@ -44,21 +44,21 @@ class BuilderSingularToBuilderWithNull {
 			default: 
 				elems = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.elems));
 			}
-			return new BuilderSingularToBuilderWithNull(elems);
+			return new BuilderSingularToBuilderWithNullWithSetterPrefix(elems);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(elems=" + this.elems + ")";
+			return "BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(elems=" + this.elems + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderSingularToBuilderWithNullBuilder builder() {
-		return new BuilderSingularToBuilderWithNullBuilder();
+	public static BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder() {
+		return new BuilderSingularToBuilderWithNullWithSetterPrefixBuilder();
 	}
 	@java.lang.SuppressWarnings("all")
-	public BuilderSingularToBuilderWithNullBuilder toBuilder() {
-		final BuilderSingularToBuilderWithNullBuilder builder = new BuilderSingularToBuilderWithNullBuilder();
+	public BuilderSingularToBuilderWithNullWithSetterPrefixBuilder toBuilder() {
+		final BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder = new BuilderSingularToBuilderWithNullWithSetterPrefixBuilder();
 		if (this.elems != null) builder.elems(this.elems);
 		return builder;
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
index 583d4df0..c061a726 100644
--- a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
@@ -1,58 +1,58 @@
 import java.util.List;
 import java.util.Collection;
-class BuilderSingularWildcardListsWithToBuilder {
+class BuilderSingularWildcardListsWithToBuilderWithSetterPrefix {
 	private List<?> objects;
 	private Collection<? extends Number> numbers;
 	@java.lang.SuppressWarnings("all")
-	BuilderSingularWildcardListsWithToBuilder(final List<?> objects, final Collection<? extends Number> numbers) {
+	BuilderSingularWildcardListsWithToBuilderWithSetterPrefix(final List<?> objects, final Collection<? extends Number> numbers) {
 		this.objects = objects;
 		this.numbers = numbers;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderSingularWildcardListsWithToBuilderBuilder {
+	public static class BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder {
 		@java.lang.SuppressWarnings("all")
 		private java.util.ArrayList<java.lang.Object> objects;
 		@java.lang.SuppressWarnings("all")
 		private java.util.ArrayList<Number> numbers;
 		@java.lang.SuppressWarnings("all")
-		BuilderSingularWildcardListsWithToBuilderBuilder() {
+		BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularWildcardListsWithToBuilderBuilder withObject(final java.lang.Object object) {
+		public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withObject(final java.lang.Object object) {
 			if (this.objects == null) this.objects = new java.util.ArrayList<java.lang.Object>();
 			this.objects.add(object);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularWildcardListsWithToBuilderBuilder withObjects(final java.util.Collection<?> objects) {
+		public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withObjects(final java.util.Collection<?> objects) {
 			if (this.objects == null) this.objects = new java.util.ArrayList<java.lang.Object>();
 			this.objects.addAll(objects);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularWildcardListsWithToBuilderBuilder clearObjects() {
+		public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder clearObjects() {
 			if (this.objects != null) this.objects.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularWildcardListsWithToBuilderBuilder withNumber(final Number number) {
+		public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withNumber(final Number number) {
 			if (this.numbers == null) this.numbers = new java.util.ArrayList<Number>();
 			this.numbers.add(number);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularWildcardListsWithToBuilderBuilder withNumbers(final java.util.Collection<? extends Number> numbers) {
+		public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withNumbers(final java.util.Collection<? extends Number> numbers) {
 			if (this.numbers == null) this.numbers = new java.util.ArrayList<Number>();
 			this.numbers.addAll(numbers);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularWildcardListsWithToBuilderBuilder clearNumbers() {
+		public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder clearNumbers() {
 			if (this.numbers != null) this.numbers.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularWildcardListsWithToBuilder build() {
+		public BuilderSingularWildcardListsWithToBuilderWithSetterPrefix build() {
 			java.util.List<java.lang.Object> objects;
 			switch (this.objects == null ? 0 : this.objects.size()) {
 			case 0: 
@@ -75,21 +75,21 @@ class BuilderSingularWildcardListsWithToBuilder {
 			default: 
 				numbers = java.util.Collections.unmodifiableList(new java.util.ArrayList<Number>(this.numbers));
 			}
-			return new BuilderSingularWildcardListsWithToBuilder(objects, numbers);
+			return new BuilderSingularWildcardListsWithToBuilderWithSetterPrefix(objects, numbers);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(objects=" + this.objects + ", numbers=" + this.numbers + ")";
+			return "BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder(objects=" + this.objects + ", numbers=" + this.numbers + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderSingularWildcardListsWithToBuilderBuilder builder() {
-		return new BuilderSingularWildcardListsWithToBuilderBuilder();
+	public static BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder builder() {
+		return new BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder();
 	}
 	@java.lang.SuppressWarnings("all")
-	public BuilderSingularWildcardListsWithToBuilderBuilder toBuilder() {
-		final BuilderSingularWildcardListsWithToBuilderBuilder builder = new BuilderSingularWildcardListsWithToBuilderBuilder();
+	public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder toBuilder() {
+		final BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder builder = new BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder();
 		if (this.objects != null) builder.objects(this.objects);
 		if (this.numbers != null) builder.numbers(this.numbers);
 		return builder;
diff --git a/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java
index 216cd01f..2f163caf 100644
--- a/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java
@@ -1,35 +1,35 @@
-class BuilderSingularWithPrefixes {
+class BuilderSingularWithPrefixesWithSetterPrefix {
 	private java.util.List<String> _elems;
 	@java.lang.SuppressWarnings("all")
-	BuilderSingularWithPrefixes(final java.util.List<String> elems) {
+	BuilderSingularWithPrefixesWithSetterPrefix(final java.util.List<String> elems) {
 		this._elems = elems;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderSingularWithPrefixesBuilder {
+	public static class BuilderSingularWithPrefixesWithSetterPrefixBuilder {
 		@java.lang.SuppressWarnings("all")
 		private java.util.ArrayList<String> elems;
 		@java.lang.SuppressWarnings("all")
-		BuilderSingularWithPrefixesBuilder() {
+		BuilderSingularWithPrefixesWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularWithPrefixesBuilder withElem(final String elem) {
+		public BuilderSingularWithPrefixesWithSetterPrefixBuilder withElem(final String elem) {
 			if (this.elems == null) this.elems = new java.util.ArrayList<String>();
 			this.elems.add(elem);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularWithPrefixesBuilder withElems(final java.util.Collection<? extends String> elems) {
+		public BuilderSingularWithPrefixesWithSetterPrefixBuilder withElems(final java.util.Collection<? extends String> elems) {
 			if (this.elems == null) this.elems = new java.util.ArrayList<String>();
 			this.elems.addAll(elems);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularWithPrefixesBuilder clearElems() {
+		public BuilderSingularWithPrefixesWithSetterPrefixBuilder clearElems() {
 			if (this.elems != null) this.elems.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingularWithPrefixes build() {
+		public BuilderSingularWithPrefixesWithSetterPrefix build() {
 			java.util.List<String> elems;
 			switch (this.elems == null ? 0 : this.elems.size()) {
 			case 0: 
@@ -41,16 +41,16 @@ class BuilderSingularWithPrefixes {
 			default: 
 				elems = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.elems));
 			}
-			return new BuilderSingularWithPrefixes(elems);
+			return new BuilderSingularWithPrefixesWithSetterPrefix(elems);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(elems=" + this.elems + ")";
+			return "BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder(elems=" + this.elems + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderSingularWithPrefixesBuilder builder() {
-		return new BuilderSingularWithPrefixesBuilder();
+	public static BuilderSingularWithPrefixesWithSetterPrefixBuilder builder() {
+		return new BuilderSingularWithPrefixesWithSetterPrefixBuilder();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java
index b8bb81b7..0d4f8059 100644
--- a/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java
@@ -7,39 +7,39 @@ import java.util.List;
 @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
 @interface TB {
 }
-class BuilderTypeAnnos {
+class BuilderTypeAnnosWithSetterPrefix {
 	@TA
 	@TB
 	private List<String> foo;
 	@java.lang.SuppressWarnings("all")
-	BuilderTypeAnnos(@TA final List<String> foo) {
+	BuilderTypeAnnosWithSetterPrefix(@TA final List<String> foo) {
 		this.foo = foo;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderTypeAnnosBuilder {
+	public static class BuilderTypeAnnosWithSetterPrefixBuilder {
 		@java.lang.SuppressWarnings("all")
 		private List<String> foo;
 		@java.lang.SuppressWarnings("all")
-		BuilderTypeAnnosBuilder() {
+		BuilderTypeAnnosWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderTypeAnnosBuilder withFoo(@TA final List<String> foo) {
+		public BuilderTypeAnnosWithSetterPrefixBuilder withFoo(@TA final List<String> foo) {
 			this.foo = foo;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderTypeAnnos build() {
-			return new BuilderTypeAnnos(foo);
+		public BuilderTypeAnnosWithSetterPrefix build() {
+			return new BuilderTypeAnnosWithSetterPrefix(foo);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo + ")";
+			return "BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder(foo=" + this.foo + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderTypeAnnosBuilder builder() {
-		return new BuilderTypeAnnosBuilder();
+	public static BuilderTypeAnnosWithSetterPrefixBuilder builder() {
+		return new BuilderTypeAnnosWithSetterPrefixBuilder();
 	}
 }
 
diff --git a/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java
index e1c107da..87905208 100644
--- a/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java
@@ -1,27 +1,27 @@
 import java.util.List;
-final class BuilderAndValue {
+final class BuilderAndValueWithSetterPrefix {
 	private final int zero = 0;
 	@java.lang.SuppressWarnings("all")
-	BuilderAndValue() {
+	BuilderAndValueWithSetterPrefix() {
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderAndValueBuilder {
+	public static class BuilderAndValueWithSetterPrefixBuilder {
 		@java.lang.SuppressWarnings("all")
-		BuilderAndValueBuilder() {
+		BuilderAndValueWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderAndValue build() {
-			return new BuilderAndValue();
+		public BuilderAndValueWithSetterPrefix build() {
+			return new BuilderAndValueWithSetterPrefix();
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderAndValue.BuilderAndValueBuilder()";
+			return "BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder()";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderAndValueBuilder builder() {
-		return new BuilderAndValueBuilder();
+	public static BuilderAndValueWithSetterPrefixBuilder builder() {
+		return new BuilderAndValueWithSetterPrefixBuilder();
 	}
 	@java.lang.SuppressWarnings("all")
 	public int getZero() {
@@ -31,8 +31,8 @@ final class BuilderAndValue {
 	@java.lang.SuppressWarnings("all")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
-		if (!(o instanceof BuilderAndValue)) return false;
-		final BuilderAndValue other = (BuilderAndValue) o;
+		if (!(o instanceof BuilderAndValueWithSetterPrefix)) return false;
+		final BuilderAndValueWithSetterPrefix other = (BuilderAndValueWithSetterPrefix) o;
 		if (this.getZero() != other.getZero()) return false;
 		return true;
 	}
@@ -47,33 +47,33 @@ final class BuilderAndValue {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public java.lang.String toString() {
-		return "BuilderAndValue(zero=" + this.getZero() + ")";
+		return "BuilderAndValueWithSetterPrefix(zero=" + this.getZero() + ")";
 	}
 }
 
-class BuilderAndData {
+class BuilderAndDataWithSetterPrefix {
 	private final int zero = 0;
 	@java.lang.SuppressWarnings("all")
-	BuilderAndData() {
+	BuilderAndDataWithSetterPrefix() {
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderAndDataBuilder {
+	public static class BuilderAndDataWithSetterPrefixBuilder {
 		@java.lang.SuppressWarnings("all")
-		BuilderAndDataBuilder() {
+		BuilderAndDataWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderAndData build() {
-			return new BuilderAndData();
+		public BuilderAndDataWithSetterPrefix build() {
+			return new BuilderAndDataWithSetterPrefix();
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderAndData.BuilderAndDataBuilder()";
+			return "BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder()";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderAndDataBuilder builder() {
-		return new BuilderAndDataBuilder();
+	public static BuilderAndDataWithSetterPrefixBuilder builder() {
+		return new BuilderAndDataWithSetterPrefixBuilder();
 	}
 	@java.lang.SuppressWarnings("all")
 	public int getZero() {
@@ -83,15 +83,15 @@ class BuilderAndData {
 	@java.lang.SuppressWarnings("all")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
-		if (!(o instanceof BuilderAndData)) return false;
-		final BuilderAndData other = (BuilderAndData) o;
+		if (!(o instanceof BuilderAndDataWithSetterPrefix)) return false;
+		final BuilderAndDataWithSetterPrefix other = (BuilderAndDataWithSetterPrefix) o;
 		if (!other.canEqual((java.lang.Object) this)) return false;
 		if (this.getZero() != other.getZero()) return false;
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
 	protected boolean canEqual(final java.lang.Object other) {
-		return other instanceof BuilderAndData;
+		return other instanceof BuilderAndDataWithSetterPrefix;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
@@ -104,6 +104,6 @@ class BuilderAndData {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public java.lang.String toString() {
-		return "BuilderAndData(zero=" + this.getZero() + ")";
+		return "BuilderAndDataWithSetterPrefix(zero=" + this.getZero() + ")";
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java
index d8e075b8..be581c47 100644
--- a/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java
@@ -1,17 +1,17 @@
-class BuilderWithAccessors {
+class BuilderWithAccessorsWithSetterPrefix {
 	private final int plower;
 	private final int pUpper;
 	private int _foo;
 	private int __bar;
 	@java.lang.SuppressWarnings("all")
-	BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) {
+	BuilderWithAccessorsWithSetterPrefix(final int plower, final int upper, final int foo, final int _bar) {
 		this.plower = plower;
 		this.pUpper = upper;
 		this._foo = foo;
 		this.__bar = _bar;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderWithAccessorsBuilder {
+	public static class BuilderWithAccessorsWithSetterPrefixBuilder {
 		@java.lang.SuppressWarnings("all")
 		private int plower;
 		@java.lang.SuppressWarnings("all")
@@ -21,40 +21,40 @@ class BuilderWithAccessors {
 		@java.lang.SuppressWarnings("all")
 		private int _bar;
 		@java.lang.SuppressWarnings("all")
-		BuilderWithAccessorsBuilder() {
+		BuilderWithAccessorsWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithAccessorsBuilder withPlower(final int plower) {
+		public BuilderWithAccessorsWithSetterPrefixBuilder withPlower(final int plower) {
 			this.plower = plower;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithAccessorsBuilder withUpper(final int upper) {
+		public BuilderWithAccessorsWithSetterPrefixBuilder withUpper(final int upper) {
 			this.upper = upper;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithAccessorsBuilder withFoo(final int foo) {
+		public BuilderWithAccessorsWithSetterPrefixBuilder withFoo(final int foo) {
 			this.foo = foo;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithAccessorsBuilder with_Bar(final int _bar) {
+		public BuilderWithAccessorsWithSetterPrefixBuilder with_Bar(final int _bar) {
 			this._bar = _bar;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithAccessors build() {
-			return new BuilderWithAccessors(plower, upper, foo, _bar);
+		public BuilderWithAccessorsWithSetterPrefix build() {
+			return new BuilderWithAccessorsWithSetterPrefix(plower, upper, foo, _bar);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower + ", upper=" + this.upper + ", foo=" + this.foo + ", _bar=" + this._bar + ")";
+			return "BuilderWithAccessorsWithSetterPrefix.BuilderWithAccessorsWithSetterPrefixBuilder(plower=" + this.plower + ", upper=" + this.upper + ", foo=" + this.foo + ", _bar=" + this._bar + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderWithAccessorsBuilder builder() {
-		return new BuilderWithAccessorsBuilder();
+	public static BuilderWithAccessorsWithSetterPrefixBuilder builder() {
+		return new BuilderWithAccessorsWithSetterPrefixBuilder();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderWithBadNamesWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithBadNamesWithSetterPrefix.java
index d19bf947..be7a78c7 100644
--- a/test/transform/resource/after-delombok/BuilderWithBadNamesWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderWithBadNamesWithSetterPrefix.java
@@ -1,42 +1,42 @@
-public class BuilderWithBadNames {
+public class BuilderWithBadNamesWithSetterPrefix {
 	String build;
 	String toString;
 	@java.lang.SuppressWarnings("all")
-	BuilderWithBadNames(final String build, final String toString) {
+	BuilderWithBadNamesWithSetterPrefix(final String build, final String toString) {
 		this.build = build;
 		this.toString = toString;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderWithBadNamesBuilder {
+	public static class BuilderWithBadNamesWithSetterPrefixBuilder {
 		@java.lang.SuppressWarnings("all")
 		private String build;
 		@java.lang.SuppressWarnings("all")
 		private String toString;
 		@java.lang.SuppressWarnings("all")
-		BuilderWithBadNamesBuilder() {
+		BuilderWithBadNamesWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithBadNamesBuilder withBuild(final String build) {
+		public BuilderWithBadNamesWithSetterPrefixBuilder withBuild(final String build) {
 			this.build = build;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithBadNamesBuilder withToString(final String toString) {
+		public BuilderWithBadNamesWithSetterPrefixBuilder withToString(final String toString) {
 			this.toString = toString;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithBadNames build() {
-			return new BuilderWithBadNames(build, toString);
+		public BuilderWithBadNamesWithSetterPrefix build() {
+			return new BuilderWithBadNamesWithSetterPrefix(build, toString);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderWithBadNames.BuilderWithBadNamesBuilder(build=" + this.build + ", toString=" + this.toString + ")";
+			return "BuilderWithBadNamesWithSetterPrefix.BuilderWithBadNamesWithSetterPrefixBuilder(build=" + this.build + ", toString=" + this.toString + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderWithBadNamesBuilder builder() {
-		return new BuilderWithBadNamesBuilder();
+	public static BuilderWithBadNamesWithSetterPrefixBuilder builder() {
+		return new BuilderWithBadNamesWithSetterPrefixBuilder();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderWithDeprecatedWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithDeprecatedWithSetterPrefix.java
index 2045c1a5..5f6f2c32 100644
--- a/test/transform/resource/after-delombok/BuilderWithDeprecatedWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderWithDeprecatedWithSetterPrefix.java
@@ -1,5 +1,5 @@
 import com.google.common.collect.ImmutableList;
-public class BuilderWithDeprecated {
+public class BuilderWithDeprecatedWithSetterPrefix {
 	/**
 	 * @deprecated since always
 	 */
@@ -11,14 +11,14 @@ public class BuilderWithDeprecated {
 	@Deprecated
 	ImmutableList<Integer> numbers;
 	@java.lang.SuppressWarnings("all")
-	BuilderWithDeprecated(final String dep1, final int dep2, final java.util.List<String> strings, final ImmutableList<Integer> numbers) {
+	BuilderWithDeprecatedWithSetterPrefix(final String dep1, final int dep2, final java.util.List<String> strings, final ImmutableList<Integer> numbers) {
 		this.dep1 = dep1;
 		this.dep2 = dep2;
 		this.strings = strings;
 		this.numbers = numbers;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderWithDeprecatedBuilder {
+	public static class BuilderWithDeprecatedWithSetterPrefixBuilder {
 		@java.lang.SuppressWarnings("all")
 		private String dep1;
 		@java.lang.SuppressWarnings("all")
@@ -28,65 +28,65 @@ public class BuilderWithDeprecated {
 		@java.lang.SuppressWarnings("all")
 		private com.google.common.collect.ImmutableList.Builder<Integer> numbers;
 		@java.lang.SuppressWarnings("all")
-		BuilderWithDeprecatedBuilder() {
+		BuilderWithDeprecatedWithSetterPrefixBuilder() {
 		}
 		/**
 		 * @deprecated since always
 		 */
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithDeprecatedBuilder withDep1(final String dep1) {
+		public BuilderWithDeprecatedWithSetterPrefixBuilder withDep1(final String dep1) {
 			this.dep1 = dep1;
 			return this;
 		}
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithDeprecatedBuilder withDep2(final int dep2) {
+		public BuilderWithDeprecatedWithSetterPrefixBuilder withDep2(final int dep2) {
 			this.dep2 = dep2;
 			return this;
 		}
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithDeprecatedBuilder withString(final String string) {
+		public BuilderWithDeprecatedWithSetterPrefixBuilder withString(final String string) {
 			if (this.strings == null) this.strings = new java.util.ArrayList<String>();
 			this.strings.add(string);
 			return this;
 		}
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithDeprecatedBuilder withStrings(final java.util.Collection<? extends String> strings) {
+		public BuilderWithDeprecatedWithSetterPrefixBuilder withStrings(final java.util.Collection<? extends String> strings) {
 			if (this.strings == null) this.strings = new java.util.ArrayList<String>();
 			this.strings.addAll(strings);
 			return this;
 		}
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithDeprecatedBuilder clearStrings() {
+		public BuilderWithDeprecatedWithSetterPrefixBuilder clearStrings() {
 			if (this.strings != null) this.strings.clear();
 			return this;
 		}
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithDeprecatedBuilder withNumber(final Integer number) {
+		public BuilderWithDeprecatedWithSetterPrefixBuilder withNumber(final Integer number) {
 			if (this.numbers == null) this.numbers = com.google.common.collect.ImmutableList.builder();
 			this.numbers.add(number);
 			return this;
 		}
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithDeprecatedBuilder withNumbers(final java.lang.Iterable<? extends Integer> numbers) {
+		public BuilderWithDeprecatedWithSetterPrefixBuilder withNumbers(final java.lang.Iterable<? extends Integer> numbers) {
 			if (this.numbers == null) this.numbers = com.google.common.collect.ImmutableList.builder();
 			this.numbers.addAll(numbers);
 			return this;
 		}
 		@java.lang.Deprecated
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithDeprecatedBuilder clearNumbers() {
+		public BuilderWithDeprecatedWithSetterPrefixBuilder clearNumbers() {
 			this.numbers = null;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithDeprecated build() {
+		public BuilderWithDeprecatedWithSetterPrefix build() {
 			java.util.List<String> strings;
 			switch (this.strings == null ? 0 : this.strings.size()) {
 			case 0: 
@@ -99,16 +99,16 @@ public class BuilderWithDeprecated {
 				strings = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.strings));
 			}
 			com.google.common.collect.ImmutableList<Integer> numbers = this.numbers == null ? com.google.common.collect.ImmutableList.<Integer>of() : this.numbers.build();
-			return new BuilderWithDeprecated(dep1, dep2, strings, numbers);
+			return new BuilderWithDeprecatedWithSetterPrefix(dep1, dep2, strings, numbers);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderWithDeprecated.BuilderWithDeprecatedBuilder(dep1=" + this.dep1 + ", dep2=" + this.dep2 + ", strings=" + this.strings + ", numbers=" + this.numbers + ")";
+			return "BuilderWithDeprecatedWithSetterPrefix.BuilderWithDeprecatedWithSetterPrefixBuilder(dep1=" + this.dep1 + ", dep2=" + this.dep2 + ", strings=" + this.strings + ", numbers=" + this.numbers + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderWithDeprecatedBuilder builder() {
-		return new BuilderWithDeprecatedBuilder();
+	public static BuilderWithDeprecatedWithSetterPrefixBuilder builder() {
+		return new BuilderWithDeprecatedWithSetterPrefixBuilder();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java
index fd9504c2..95f89c9d 100644
--- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java
@@ -1,8 +1,8 @@
-class BuilderWithExistingBuilderClass<T, K extends Number> {
-	public static <Z extends Number> BuilderWithExistingBuilderClass<String, Z> staticMethod(Z arg1, boolean arg2, String arg3) {
+class BuilderWithExistingBuilderClassWithSetterPrefix<T, K extends Number> {
+	public static <Z extends Number> BuilderWithExistingBuilderClassWithSetterPrefix<String, Z> staticMethod(Z arg1, boolean arg2, String arg3) {
 		return null;
 	}
-	public static class BuilderWithExistingBuilderClassBuilder<Z extends Number> {
+	public static class BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z extends Number> {
 		@java.lang.SuppressWarnings("all")
 		private boolean arg2;
 		@java.lang.SuppressWarnings("all")
@@ -11,30 +11,30 @@ class BuilderWithExistingBuilderClass<T, K extends Number> {
 		public void withArg2(boolean arg) {
 		}
 		@java.lang.SuppressWarnings("all")
-		BuilderWithExistingBuilderClassBuilder() {
+		BuilderWithExistingBuilderClassWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithExistingBuilderClassBuilder<Z> withArg1(final Z arg1) {
+		public BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg1(final Z arg1) {
 			this.arg1 = arg1;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithExistingBuilderClassBuilder<Z> withArg3(final String arg3) {
+		public BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg3(final String arg3) {
 			this.arg3 = arg3;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithExistingBuilderClass<String, Z> build() {
-			return BuilderWithExistingBuilderClass.<Z>staticMethod(arg1, arg2, arg3);
+		public BuilderWithExistingBuilderClassWithSetterPrefix<String, Z> build() {
+			return BuilderWithExistingBuilderClassWithSetterPrefix.<Z>staticMethod(arg1, arg2, arg3);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1 + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ")";
+			return "BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder(arg1=" + this.arg1 + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static <Z extends Number> BuilderWithExistingBuilderClassBuilder<Z> builder() {
-		return new BuilderWithExistingBuilderClassBuilder<Z>();
+	public static <Z extends Number> BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> builder() {
+		return new BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z>();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java
index ec0ccb28..0f478ed1 100644
--- a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java
@@ -1,33 +1,33 @@
-class BuilderWithNoBuilderMethod {
+class BuilderWithNoBuilderMethodWithSetterPrefix {
 	private String a = "";
 	@java.lang.SuppressWarnings("all")
-	BuilderWithNoBuilderMethod(final String a) {
+	BuilderWithNoBuilderMethodWithSetterPrefix(final String a) {
 		this.a = a;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderWithNoBuilderMethodBuilder {
+	public static class BuilderWithNoBuilderMethodWithSetterPrefixBuilder {
 		@java.lang.SuppressWarnings("all")
 		private String a;
 		@java.lang.SuppressWarnings("all")
-		BuilderWithNoBuilderMethodBuilder() {
+		BuilderWithNoBuilderMethodWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithNoBuilderMethodBuilder withA(final String a) {
+		public BuilderWithNoBuilderMethodWithSetterPrefixBuilder withA(final String a) {
 			this.a = a;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithNoBuilderMethod build() {
-			return new BuilderWithNoBuilderMethod(a);
+		public BuilderWithNoBuilderMethodWithSetterPrefix build() {
+			return new BuilderWithNoBuilderMethodWithSetterPrefix(a);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder(a=" + this.a + ")";
+			return "BuilderWithNoBuilderMethodWithSetterPrefix.BuilderWithNoBuilderMethodWithSetterPrefixBuilder(a=" + this.a + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public BuilderWithNoBuilderMethodBuilder toBuilder() {
-		return new BuilderWithNoBuilderMethodBuilder().withA(this.a);
+	public BuilderWithNoBuilderMethodWithSetterPrefixBuilder toBuilder() {
+		return new BuilderWithNoBuilderMethodWithSetterPrefixBuilder().withA(this.a);
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java
index 29f1b792..49be1717 100644
--- a/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java
@@ -1,22 +1,22 @@
-class BuilderWithNonNull {
+class BuilderWithNonNullWithSetterPrefix {
 	@lombok.NonNull
 	private final String id;
 	@java.lang.SuppressWarnings("all")
-	BuilderWithNonNull(@lombok.NonNull final String id) {
+	BuilderWithNonNullWithSetterPrefix(@lombok.NonNull final String id) {
 		if (id == null) {
 			throw new java.lang.NullPointerException("id is marked non-null but is null");
 		}
 		this.id = id;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderWithNonNullBuilder {
+	public static class BuilderWithNonNullWithSetterPrefixBuilder {
 		@java.lang.SuppressWarnings("all")
 		private String id;
 		@java.lang.SuppressWarnings("all")
-		BuilderWithNonNullBuilder() {
+		BuilderWithNonNullWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithNonNullBuilder withId(@lombok.NonNull final String id) {
+		public BuilderWithNonNullWithSetterPrefixBuilder withId(@lombok.NonNull final String id) {
 			if (id == null) {
 				throw new java.lang.NullPointerException("id is marked non-null but is null");
 			}
@@ -24,17 +24,17 @@ class BuilderWithNonNull {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithNonNull build() {
-			return new BuilderWithNonNull(id);
+		public BuilderWithNonNullWithSetterPrefix build() {
+			return new BuilderWithNonNullWithSetterPrefix(id);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderWithNonNull.BuilderWithNonNullBuilder(id=" + this.id + ")";
+			return "BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder(id=" + this.id + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderWithNonNullBuilder builder() {
-		return new BuilderWithNonNullBuilder();
+	public static BuilderWithNonNullWithSetterPrefixBuilder builder() {
+		return new BuilderWithNonNullWithSetterPrefixBuilder();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderWithRecursiveGenericsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithRecursiveGenericsWithSetterPrefix.java
index d0ca7c05..04494ff9 100644
--- a/test/transform/resource/after-delombok/BuilderWithRecursiveGenericsWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderWithRecursiveGenericsWithSetterPrefix.java
@@ -1,5 +1,5 @@
 import java.util.Set;
-public class BuilderWithRecursiveGenerics {
+public class BuilderWithRecursiveGenericsWithSetterPrefix {
 	interface Inter<T, U extends Inter<T, U>> {
 	}
 	public static final class Test<Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> {
@@ -36,7 +36,7 @@ public class BuilderWithRecursiveGenerics {
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
 			public java.lang.String toString() {
-				return "BuilderWithRecursiveGenerics.Test.TestBuilder(foo=" + this.foo + ", bar=" + this.bar + ")";
+				return "BuilderWithRecursiveGenericsWithSetterPrefix.Test.TestBuilder(foo=" + this.foo + ", bar=" + this.bar + ")";
 			}
 		}
 		@java.lang.SuppressWarnings("all")
@@ -55,8 +55,8 @@ public class BuilderWithRecursiveGenerics {
 		@java.lang.SuppressWarnings("all")
 		public boolean equals(final java.lang.Object o) {
 			if (o == this) return true;
-			if (!(o instanceof BuilderWithRecursiveGenerics.Test)) return false;
-			final BuilderWithRecursiveGenerics.Test<?, ?, ?> other = (BuilderWithRecursiveGenerics.Test<?, ?, ?>) o;
+			if (!(o instanceof BuilderWithRecursiveGenericsWithSetterPrefix.Test)) return false;
+			final BuilderWithRecursiveGenericsWithSetterPrefix.Test<?, ?, ?> other = (BuilderWithRecursiveGenericsWithSetterPrefix.Test<?, ?, ?>) o;
 			final java.lang.Object this$foo = this.getFoo();
 			final java.lang.Object other$foo = other.getFoo();
 			if (this$foo == null ? other$foo != null : !this$foo.equals(other$foo)) return false;
@@ -79,7 +79,7 @@ public class BuilderWithRecursiveGenerics {
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderWithRecursiveGenerics.Test(foo=" + this.getFoo() + ", bar=" + this.getBar() + ")";
+			return "BuilderWithRecursiveGenericsWithSetterPrefix.Test(foo=" + this.getFoo() + ", bar=" + this.getBar() + ")";
 		}
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java
index ac8264d3..322c667c 100644
--- a/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java
@@ -1,21 +1,21 @@
 import java.util.List;
-class BuilderWithToBuilder<T> {
+class BuilderWithToBuilderWithSetterPrefix<T> {
 	private String mOne;
 	private String mTwo;
 	private T foo;
 	private List<T> bars;
-	public static <K> K rrr(BuilderWithToBuilder<K> x) {
+	public static <K> K rrr(BuilderWithToBuilderWithSetterPrefix<K> x) {
 		return x.foo;
 	}
 	@java.lang.SuppressWarnings("all")
-	BuilderWithToBuilder(final String one, final String two, final T foo, final List<T> bars) {
+	BuilderWithToBuilderWithSetterPrefix(final String one, final String two, final T foo, final List<T> bars) {
 		this.mOne = one;
 		this.mTwo = two;
 		this.foo = foo;
 		this.bars = bars;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderWithToBuilderBuilder<T> {
+	public static class BuilderWithToBuilderWithSetterPrefixBuilder<T> {
 		@java.lang.SuppressWarnings("all")
 		private String one;
 		@java.lang.SuppressWarnings("all")
@@ -25,42 +25,42 @@ class BuilderWithToBuilder<T> {
 		@java.lang.SuppressWarnings("all")
 		private java.util.ArrayList<T> bars;
 		@java.lang.SuppressWarnings("all")
-		BuilderWithToBuilderBuilder() {
+		BuilderWithToBuilderWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithToBuilderBuilder<T> withOne(final String one) {
+		public BuilderWithToBuilderWithSetterPrefixBuilder<T> withOne(final String one) {
 			this.one = one;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithToBuilderBuilder<T> withTwo(final String two) {
+		public BuilderWithToBuilderWithSetterPrefixBuilder<T> withTwo(final String two) {
 			this.two = two;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithToBuilderBuilder<T> withFoo(final T foo) {
+		public BuilderWithToBuilderWithSetterPrefixBuilder<T> withFoo(final T foo) {
 			this.foo = foo;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithToBuilderBuilder<T> withBar(final T bar) {
+		public BuilderWithToBuilderWithSetterPrefixBuilder<T> withBar(final T bar) {
 			if (this.bars == null) this.bars = new java.util.ArrayList<T>();
 			this.bars.add(bar);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithToBuilderBuilder<T> withBars(final java.util.Collection<? extends T> bars) {
+		public BuilderWithToBuilderWithSetterPrefixBuilder<T> withBars(final java.util.Collection<? extends T> bars) {
 			if (this.bars == null) this.bars = new java.util.ArrayList<T>();
 			this.bars.addAll(bars);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithToBuilderBuilder<T> clearBars() {
+		public BuilderWithToBuilderWithSetterPrefixBuilder<T> clearBars() {
 			if (this.bars != null) this.bars.clear();
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithToBuilder<T> build() {
+		public BuilderWithToBuilderWithSetterPrefix<T> build() {
 			java.util.List<T> bars;
 			switch (this.bars == null ? 0 : this.bars.size()) {
 			case 0: 
@@ -72,35 +72,35 @@ class BuilderWithToBuilder<T> {
 			default: 
 				bars = java.util.Collections.unmodifiableList(new java.util.ArrayList<T>(this.bars));
 			}
-			return new BuilderWithToBuilder<T>(one, two, foo, bars);
+			return new BuilderWithToBuilderWithSetterPrefix<T>(one, two, foo, bars);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderWithToBuilder.BuilderWithToBuilderBuilder(one=" + this.one + ", two=" + this.two + ", foo=" + this.foo + ", bars=" + this.bars + ")";
+			return "BuilderWithToBuilderWithSetterPrefix.BuilderWithToBuilderWithSetterPrefixBuilder(one=" + this.one + ", two=" + this.two + ", foo=" + this.foo + ", bars=" + this.bars + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static <T> BuilderWithToBuilderBuilder<T> builder() {
-		return new BuilderWithToBuilderBuilder<T>();
+	public static <T> BuilderWithToBuilderWithSetterPrefixBuilder<T> builder() {
+		return new BuilderWithToBuilderWithSetterPrefixBuilder<T>();
 	}
 	@java.lang.SuppressWarnings("all")
-	public BuilderWithToBuilderBuilder<T> toBuilder() {
-		final BuilderWithToBuilderBuilder<T> builder = new BuilderWithToBuilderBuilder<T>().withOne(this.mOne).withTwo(this.mTwo).withFoo(BuilderWithToBuilder.<T>rrr(this));
+	public BuilderWithToBuilderWithSetterPrefixBuilder<T> toBuilder() {
+		final BuilderWithToBuilderWithSetterPrefixBuilder<T> builder = new BuilderWithToBuilderWithSetterPrefixBuilder<T>().withOne(this.mOne).withTwo(this.mTwo).withFoo(BuilderWithToBuilderWithSetterPrefix.<T>rrr(this));
 		if (this.bars != null) builder.withBars(this.bars);
 		return builder;
 	}
 }
-class ConstructorWithToBuilder<T> {
+class ConstructorWithToBuilderWithSetterPrefix<T> {
 	private String mOne;
 	private String mTwo;
 	private T foo;
 	@lombok.Singular
 	private com.google.common.collect.ImmutableList<T> bars;
-	public ConstructorWithToBuilder(String mOne, T baz, com.google.common.collect.ImmutableList<T> bars) {
+	public ConstructorWithToBuilderWithSetterPrefix(String mOne, T baz, com.google.common.collect.ImmutableList<T> bars) {
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class ConstructorWithToBuilderBuilder<T> {
+	public static class ConstructorWithToBuilderWithSetterPrefixBuilder<T> {
 		@java.lang.SuppressWarnings("all")
 		private String mOne;
 		@java.lang.SuppressWarnings("all")
@@ -108,39 +108,39 @@ class ConstructorWithToBuilder<T> {
 		@java.lang.SuppressWarnings("all")
 		private com.google.common.collect.ImmutableList<T> bars;
 		@java.lang.SuppressWarnings("all")
-		ConstructorWithToBuilderBuilder() {
+		ConstructorWithToBuilderWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public ConstructorWithToBuilderBuilder<T> withMOne(final String mOne) {
+		public ConstructorWithToBuilderWithSetterPrefixBuilder<T> withMOne(final String mOne) {
 			this.mOne = mOne;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public ConstructorWithToBuilderBuilder<T> withBaz(final T baz) {
+		public ConstructorWithToBuilderWithSetterPrefixBuilder<T> withBaz(final T baz) {
 			this.baz = baz;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public ConstructorWithToBuilderBuilder<T> withBars(final com.google.common.collect.ImmutableList<T> bars) {
+		public ConstructorWithToBuilderWithSetterPrefixBuilder<T> withBars(final com.google.common.collect.ImmutableList<T> bars) {
 			this.bars = bars;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public ConstructorWithToBuilder<T> build() {
-			return new ConstructorWithToBuilder<T>(mOne, baz, bars);
+		public ConstructorWithToBuilderWithSetterPrefix<T> build() {
+			return new ConstructorWithToBuilderWithSetterPrefix<T>(mOne, baz, bars);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne + ", baz=" + this.baz + ", bars=" + this.bars + ")";
+			return "ConstructorWithToBuilderWithSetterPrefix.ConstructorWithToBuilderWithSetterPrefixBuilder(mOne=" + this.mOne + ", baz=" + this.baz + ", bars=" + this.bars + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static <T> ConstructorWithToBuilderBuilder<T> builder() {
-		return new ConstructorWithToBuilderBuilder<T>();
+	public static <T> ConstructorWithToBuilderWithSetterPrefixBuilder<T> builder() {
+		return new ConstructorWithToBuilderWithSetterPrefixBuilder<T>();
 	}
 	@java.lang.SuppressWarnings("all")
-	public ConstructorWithToBuilderBuilder<T> toBuilder() {
-		return new ConstructorWithToBuilderBuilder<T>().withMOne(this.mOne).withBaz(this.foo).withBars(this.bars);
+	public ConstructorWithToBuilderWithSetterPrefixBuilder<T> toBuilder() {
+		return new ConstructorWithToBuilderWithSetterPrefixBuilder<T>().withMOne(this.mOne).withBaz(this.foo).withBars(this.bars);
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderWithTolerateWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithTolerateWithSetterPrefix.java
index a3ae2c6d..70394d09 100644
--- a/test/transform/resource/after-delombok/BuilderWithTolerateWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderWithTolerateWithSetterPrefix.java
@@ -1,40 +1,40 @@
 import lombok.experimental.Tolerate;
-public class BuilderWithTolerate {
+public class BuilderWithTolerateWithSetterPrefix {
 	private final int value;
 	public static void main(String[] args) {
-		BuilderWithTolerate.builder().withValue("42").build();
+		BuilderWithTolerateWithSetterPrefix.builder().withValue("42").build();
 	}
-	public static class BuilderWithTolerateBuilder {
+	public static class BuilderWithTolerateWithSetterPrefixBuilder {
 		@java.lang.SuppressWarnings("all")
 		private int value;
 		@Tolerate
-		public BuilderWithTolerateBuilder withValue(String s) {
+		public BuilderWithTolerateWithSetterPrefixBuilder withValue(String s) {
 			return this.withValue(Integer.parseInt(s));
 		}
 		@java.lang.SuppressWarnings("all")
-		BuilderWithTolerateBuilder() {
+		BuilderWithTolerateWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithTolerateBuilder withValue(final int value) {
+		public BuilderWithTolerateWithSetterPrefixBuilder withValue(final int value) {
 			this.value = value;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithTolerate build() {
-			return new BuilderWithTolerate(value);
+		public BuilderWithTolerateWithSetterPrefix build() {
+			return new BuilderWithTolerateWithSetterPrefix(value);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value + ")";
+			return "BuilderWithTolerateWithSetterPrefix.BuilderWithTolerateWithSetterPrefixBuilder(value=" + this.value + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	BuilderWithTolerate(final int value) {
+	BuilderWithTolerateWithSetterPrefix(final int value) {
 		this.value = value;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderWithTolerateBuilder builder() {
-		return new BuilderWithTolerateBuilder();
+	public static BuilderWithTolerateWithSetterPrefixBuilder builder() {
+		return new BuilderWithTolerateWithSetterPrefixBuilder();
 	}
 }