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 {
 	priv