Merge branch 'feature/builder-setter-prefixes' of https://github.com/floralvikings/lombok into feature/builder-setter-prefixes

45 files changed, 373 insertions, 373 deletions

diff --git a/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypesWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypesWithSetterPrefix.java
index 02369861..c978ff40 100644
--- a/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypesWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSingularAnnotatedTypesWithSetterPrefix.java
@@ -6,15 +6,15 @@ import lombok.NonNull;
 import lombok.Singular;
 @Target(ElementType.TYPE_USE) @interface MyAnnotation {
 }
-@lombok.Builder(setterPrefix = "with") class BuilderSingularAnnotatedTypes {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularAnnotatedTypesBuilder {
+@lombok.Builder(setterPrefix = "with") class BuilderSingularAnnotatedTypesWithSetterPrefix {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularAnnotatedTypesWithSetterPrefixBuilder {
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull String> foos;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull String> bars$key;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value;
-    @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder withFoo(final @MyAnnotation @NonNull String foo) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoo(final @MyAnnotation @NonNull String foo) {
       if ((foo == null))
           {
             throw new java.lang.NullPointerException("foo is marked non-null but is null");
@@ -24,18 +24,18 @@ import lombok.Singular;
       this.foos.add(foo);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder withFoos(final java.util.Collection<? extends @MyAnnotation @NonNull String> foos) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder clearFoos() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearFoos() {
       if ((this.foos != null))
           this.foos.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder withBar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBar(final @MyAnnotation @NonNull String barKey, final @MyAnnotation @NonNull Integer barValue) {
       if ((barKey == null))
           {
             throw new java.lang.NullPointerException("barKey is marked non-null but is null");
@@ -53,7 +53,7 @@ import lombok.Singular;
       this.bars$value.add(barValue);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder withBars(final java.util.Map<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> bars) {
+    public @java.lang.SuppressWarnings("all") 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>();
@@ -66,7 +66,7 @@ import lombok.Singular;
         }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder clearBars() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearBars() {
       if ((this.bars$key != null))
           {
             this.bars$key.clear();
@@ -74,7 +74,7 @@ import lombok.Singular;
           }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypes build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix build() {
       java.util.Set<@MyAnnotation @NonNull String> foos;
       switch (((this.foos == null) ? 0 : this.foos.size())) {
       case 0 :
@@ -102,20 +102,20 @@ import lombok.Singular;
             bars.put(this.bars$key.get($i), this.bars$value.get($i));
           bars = java.util.Collections.unmodifiableMap(bars);
       }
-      return new BuilderSingularAnnotatedTypes(foos, bars);
+      return new BuilderSingularAnnotatedTypesWithSetterPrefix(foos, bars);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") 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) + ")");
     }
   }
   private @Singular Set<@MyAnnotation @NonNull String> foos;
   private @Singular 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) {
+  @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefix(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) {
     super();
     this.foos = foos;
     this.bars = bars;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesBuilder builder() {
-    return new BuilderSingularAnnotatedTypesBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderSingularAnnotatedTypesWithSetterPrefixBuilder builder() {
+    return new BuilderSingularAnnotatedTypesWithSetterPrefixBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingularGuavaListsSetsWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSetsWithSetterPrefix.java
index e9b0205d..ec700874 100644
--- a/test/transform/resource/after-ecj/BuilderSingularGuavaListsSetsWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSetsWithSetterPrefix.java
@@ -4,106 +4,106 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.ImmutableTable;
 import lombok.Singular;
-@lombok.Builder(setterPrefix = "with") class BuilderSingularGuavaListsSets<T> {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaListsSetsBuilder<T> {
+@lombok.Builder(setterPrefix = "with") class BuilderSingularGuavaListsSetsWithSetterPrefix<T> {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> {
     private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder<T> cards;
     private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder<Number> frogs;
     private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet;
     private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSortedSet.Builder<String> passes;
     private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableTable.Builder<Number, Number, String> users;
-    @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> withCard(final T card) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withCard(final T card) {
       if ((this.cards == null))
           this.cards = com.google.common.collect.ImmutableList.builder();
       this.cards.add(card);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> withCards(final java.lang.Iterable<? extends T> cards) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> clearCards() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearCards() {
       this.cards = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> withFrog(final Number frog) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withFrog(final Number frog) {
       if ((this.frogs == null))
           this.frogs = com.google.common.collect.ImmutableList.builder();
       this.frogs.add(frog);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> withFrogs(final java.lang.Iterable<? extends Number> frogs) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearFrogs() {
       this.frogs = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> withRawSet(final java.lang.Object rawSet) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> withRawSet(final java.lang.Iterable<?> rawSet) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearRawSet() {
       this.rawSet = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> withPass(final String pass) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> withPass(final String pass) {
       if ((this.passes == null))
           this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
       this.passes.add(pass);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> withPasses(final java.lang.Iterable<? extends String> passes) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> clearPasses() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearPasses() {
       this.passes = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> withUser(final Number rowKey, final Number columnKey, final String value) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> withUsers(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> clearUsers() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> clearUsers() {
       this.users = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets<T> build() {
+    public @java.lang.SuppressWarnings("all") 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);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") 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) + ")");
     }
   }
   private @Singular ImmutableList<T> cards;
@@ -111,7 +111,7 @@ import lombok.Singular;
   private @SuppressWarnings("all") @Singular("rawSet") ImmutableSet rawSet;
   private @Singular ImmutableSortedSet<String> passes;
   private @Singular 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) {
+  @java.lang.SuppressWarnings("all") 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) {
     super();
     this.cards = cards;
     this.frogs = frogs;
@@ -119,7 +119,7 @@ import lombok.Singular;
     this.passes = passes;
     this.users = users;
   }
-  public static @java.lang.SuppressWarnings("all") <T>BuilderSingularGuavaListsSetsBuilder<T> builder() {
-    return new BuilderSingularGuavaListsSetsBuilder<T>();
+  public static @java.lang.SuppressWarnings("all") <T>BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> builder() {
+    return new BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingularGuavaMapsWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularGuavaMapsWithSetterPrefix.java
index fe1f0036..0f58f7a4 100644
--- a/test/transform/resource/after-ecj/BuilderSingularGuavaMapsWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSingularGuavaMapsWithSetterPrefix.java
@@ -2,82 +2,82 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableSortedMap;
 import lombok.Singular;
-@lombok.Builder(setterPrefix = "with") class BuilderSingularGuavaMaps<K, V> {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaMapsBuilder<K, V> {
+@lombok.Builder(setterPrefix = "with") class BuilderSingularGuavaMapsWithSetterPrefix<K, V> {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> {
     private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes;
     private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices;
     private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap;
-    @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> withBattleaxe(final K key, final V value) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withBattleaxe(final K key, final V value) {
       if ((this.battleaxes == null))
           this.battleaxes = com.google.common.collect.ImmutableMap.builder();
       this.battleaxes.put(key, value);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> withBattleaxes(final java.util.Map<? extends K, ? extends V> battleaxes) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withBattleaxes(final java.util.Map<? extends K, ? extends V> battleaxes) {
       if ((this.battleaxes == null))
           this.battleaxes = com.google.common.collect.ImmutableMap.builder();
       this.battleaxes.putAll(battleaxes);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> clearBattleaxes() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> clearBattleaxes() {
       this.battleaxes = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> withVertex(final Integer key, final V value) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withVertex(final Integer key, final V value) {
       if ((this.vertices == null))
           this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
       this.vertices.put(key, value);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> withVertices(final java.util.Map<? extends Integer, ? extends V> vertices) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withVertices(final java.util.Map<? extends Integer, ? extends V> vertices) {
       if ((this.vertices == null))
           this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
       this.vertices.putAll(vertices);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> clearVertices() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> clearVertices() {
       this.vertices = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> withRawMap(final java.lang.Object key, final java.lang.Object value) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withRawMap(final java.lang.Object key, final java.lang.Object value) {
       if ((this.rawMap == null))
           this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
       this.rawMap.put(key, value);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> withRawMap(final java.util.Map<?, ?> rawMap) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> withRawMap(final java.util.Map<?, ?> rawMap) {
       if ((this.rawMap == null))
           this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
       this.rawMap.putAll(rawMap);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> clearRawMap() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> clearRawMap() {
       this.rawMap = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps<K, V> build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefix<K, V> build() {
       com.google.common.collect.ImmutableMap<K, V> battleaxes = ((this.battleaxes == null) ? com.google.common.collect.ImmutableMap.<K, V>of() : this.battleaxes.build());
       com.google.common.collect.ImmutableSortedMap<Integer, V> vertices = ((this.vertices == null) ? com.google.common.collect.ImmutableSortedMap.<Integer, V>of() : this.vertices.build());
       com.google.common.collect.ImmutableBiMap<java.lang.Object, java.lang.Object> rawMap = ((this.rawMap == null) ? com.google.common.collect.ImmutableBiMap.<java.lang.Object, java.lang.Object>of() : this.rawMap.build());
-      return new BuilderSingularGuavaMaps<K, V>(battleaxes, vertices, rawMap);
+      return new BuilderSingularGuavaMapsWithSetterPrefix<K, V>(battleaxes, vertices, rawMap);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (((((("BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes) + ", vertices=") + this.vertices) + ", rawMap=") + this.rawMap) + ")");
+      return (((((("BuilderSingularGuavaMapsWithSetterPrefix.BuilderSingularGuavaMapsWithSetterPrefixBuilder(battleaxes=" + this.battleaxes) + ", vertices=") + this.vertices) + ", rawMap=") + this.rawMap) + ")");
     }
   }
   private @Singular ImmutableMap<K, V> battleaxes;
   private @Singular ImmutableSortedMap<Integer, ? extends V> vertices;
   private @SuppressWarnings("all") @Singular("rawMap") ImmutableBiMap rawMap;
-  @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) {
+  @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsWithSetterPrefix(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) {
     super();
     this.battleaxes = battleaxes;
     this.vertices = vertices;
     this.rawMap = rawMap;
   }
-  public static @java.lang.SuppressWarnings("all") <K, V>BuilderSingularGuavaMapsBuilder<K, V> builder() {
-    return new BuilderSingularGuavaMapsBuilder<K, V>();
+  public static @java.lang.SuppressWarnings("all") <K, V>BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> builder() {
+    return new BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingularListsWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularListsWithSetterPrefix.java
index 110cc2c3..ab90cb48 100644
--- a/test/transform/resource/after-ecj/BuilderSingularListsWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSingularListsWithSetterPrefix.java
@@ -2,66 +2,66 @@ import java.util.List;
 import java.util.Collection;
 
 import lombok.Singular;
-@lombok.Builder(setterPrefix = "with") class BuilderSingularLists<T> {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularListsBuilder<T> {
+@lombok.Builder(setterPrefix = "with") class BuilderSingularListsWithSetterPrefix<T> {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularListsWithSetterPrefixBuilder<T> {
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<T> children;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<Number> scarves;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<java.lang.Object> rawList;
-    @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> withChild(final T child) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefixBuilder<T> withChild(final T child) {
       if ((this.children == null))
           this.children = new java.util.ArrayList<T>();
       this.children.add(child);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> withChildren(final java.util.Collection<? extends T> children) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> clearChildren() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefixBuilder<T> clearChildren() {
       if ((this.children != null))
           this.children.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> withScarf(final Number scarf) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefixBuilder<T> withScarf(final Number scarf) {
       if ((this.scarves == null))
           this.scarves = new java.util.ArrayList<Number>();
       this.scarves.add(scarf);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> withScarves(final java.util.Collection<? extends Number> scarves) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> clearScarves() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefixBuilder<T> clearScarves() {
       if ((this.scarves != null))
           this.scarves.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> withRawList(final java.lang.Object rawList) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> withRawList(final java.util.Collection<?> rawList) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> clearRawList() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefixBuilder<T> clearRawList() {
       if ((this.rawList != null))
           this.rawList.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularLists<T> build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefix<T> build() {
       java.util.List<T> children;
       switch (((this.children == null) ? 0 : this.children.size())) {
       case 0 :
@@ -95,22 +95,22 @@ import lombok.Singular;
       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);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") 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) + ")");
     }
   }
   private @Singular List<T> children;
   private @Singular Collection<? extends Number> scarves;
   private @SuppressWarnings("all") @Singular("rawList") List rawList;
-  @java.lang.SuppressWarnings("all") BuilderSingularLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) {
+  @java.lang.SuppressWarnings("all") BuilderSingularListsWithSetterPrefix(final List<T> children, final Collection<? extends Number> scarves, final List rawList) {
     super();
     this.children = children;
     this.scarves = scarves;
     this.rawList = rawList;
   }
-  public static @java.lang.SuppressWarnings("all") <T>BuilderSingularListsBuilder<T> builder() {
-    return new BuilderSingularListsBuilder<T>();
+  public static @java.lang.SuppressWarnings("all") <T>BuilderSingularListsWithSetterPrefixBuilder<T> builder() {
+    return new BuilderSingularListsWithSetterPrefixBuilder<T>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingularMapsWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularMapsWithSetterPrefix.java
index 9193ccf9..7848b154 100644
--- a/test/transform/resource/after-ecj/BuilderSingularMapsWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSingularMapsWithSetterPrefix.java
@@ -1,8 +1,8 @@
 import java.util.Map;
 import java.util.SortedMap;
 import lombok.Singular;
-@lombok.Builder(setterPrefix = "with") class BuilderSingularMaps<K, V> {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularMapsBuilder<K, V> {
+@lombok.Builder(setterPrefix = "with") class BuilderSingularMapsWithSetterPrefix<K, V> {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularMapsWithSetterPrefixBuilder<K, V> {
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<K> women$key;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<V> women$value;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<K> men$key;
@@ -11,10 +11,10 @@ import lombok.Singular;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<java.lang.Object> rawMap$value;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> stringMap$key;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<V> stringMap$value;
-    @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> withWoman(final K womanKey, final V womanValue) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefixBuilder<K, V> withWoman(final K womanKey, final V womanValue) {
       if ((this.women$key == null))
           {
             this.women$key = new java.util.ArrayList<K>();
@@ -24,7 +24,7 @@ import lombok.Singular;
       this.women$value.add(womanValue);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> withWomen(final java.util.Map<? extends K, ? extends V> women) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefixBuilder<K, V> withWomen(final java.util.Map<? extends K, ? extends V> women) {
       if ((this.women$key == null))
           {
             this.women$key = new java.util.ArrayList<K>();
@@ -37,7 +37,7 @@ import lombok.Singular;
         }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> clearWomen() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearWomen() {
       if ((this.women$key != null))
           {
             this.women$key.clear();
@@ -45,7 +45,7 @@ import lombok.Singular;
           }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> withMan(final K manKey, final Number manValue) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefixBuilder<K, V> withMan(final K manKey, final Number manValue) {
       if ((this.men$key == null))
           {
             this.men$key = new java.util.ArrayList<K>();
@@ -55,7 +55,7 @@ import lombok.Singular;
       this.men$value.add(manValue);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> withMen(final java.util.Map<? extends K, ? extends Number> men) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefixBuilder<K, V> withMen(final java.util.Map<? extends K, ? extends Number> men) {
       if ((this.men$key == null))
           {
             this.men$key = new java.util.ArrayList<K>();
@@ -68,7 +68,7 @@ import lombok.Singular;
         }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> clearMen() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearMen() {
       if ((this.men$key != null))
           {
             this.men$key.clear();
@@ -76,7 +76,7 @@ import lombok.Singular;
           }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> withRawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefixBuilder<K, V> withRawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) {
       if ((this.rawMap$key == null))
           {
             this.rawMap$key = new java.util.ArrayList<java.lang.Object>();
@@ -86,7 +86,7 @@ import lombok.Singular;
       this.rawMap$value.add(rawMapValue);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> withRawMap(final java.util.Map<?, ?> rawMap) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefixBuilder<K, V> withRawMap(final java.util.Map<?, ?> rawMap) {
       if ((this.rawMap$key == null))
           {
             this.rawMap$key = new java.util.ArrayList<java.lang.Object>();
@@ -99,7 +99,7 @@ import lombok.Singular;
         }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> clearRawMap() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearRawMap() {
       if ((this.rawMap$key != null))
           {
             this.rawMap$key.clear();
@@ -107,7 +107,7 @@ import lombok.Singular;
           }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> withStringMap(final String stringMapKey, final V stringMapValue) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefixBuilder<K, V> withStringMap(final String stringMapKey, final V stringMapValue) {
       if ((this.stringMap$key == null))
           {
             this.stringMap$key = new java.util.ArrayList<String>();
@@ -117,7 +117,7 @@ import lombok.Singular;
       this.stringMap$value.add(stringMapValue);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> withStringMap(final java.util.Map<? extends String, ? extends V> stringMap) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefixBuilder<K, V> withStringMap(final java.util.Map<? extends String, ? extends V> stringMap) {
       if ((this.stringMap$key == null))
           {
             this.stringMap$key = new java.util.ArrayList<String>();
@@ -130,7 +130,7 @@ import lombok.Singular;
         }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> clearStringMap() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearStringMap() {
       if ((this.stringMap$key != null))
           {
             this.stringMap$key.clear();
@@ -138,7 +138,7 @@ import lombok.Singular;
           }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMaps<K, V> build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix<K, V> build() {
       java.util.Map<K, V> women;
       switch (((this.women$key == null) ? 0 : this.women$key.size())) {
       case 0 :
@@ -186,24 +186,24 @@ import lombok.Singular;
             stringMap.put(this.stringMap$key.get($i), 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);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.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) + ")");
     }
   }
   private @Singular Map<K, V> women;
   private @Singular SortedMap<K, ? extends Number> men;
   private @SuppressWarnings("all") @Singular("rawMap") Map rawMap;
   private @Singular("stringMap") Map<String, V> stringMap;
-  @java.lang.SuppressWarnings("all") BuilderSingularMaps(final Map<K, V> women, final SortedMap<K, ? extends Number> men, final Map rawMap, final Map<String, V> stringMap) {
+  @java.lang.SuppressWarnings("all") BuilderSingularMapsWithSetterPrefix(final Map<K, V> women, final SortedMap<K, ? extends Number> men, final Map rawMap, final Map<String, V> stringMap) {
     super();
     this.women = women;
     this.men = men;
     this.rawMap = rawMap;
     this.stringMap = stringMap;
   }
-  public static @java.lang.SuppressWarnings("all") <K, V>BuilderSingularMapsBuilder<K, V> builder() {
-    return new BuilderSingularMapsBuilder<K, V>();
+  public static @java.lang.SuppressWarnings("all") <K, V>BuilderSingularMapsWithSetterPrefixBuilder<K, V> builder() {
+    return new BuilderSingularMapsWithSetterPrefixBuilder<K, V>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingularNoAutoWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularNoAutoWithSetterPrefix.java
index a7754a99..f24b1640 100644
--- a/test/transform/resource/after-ecj/BuilderSingularNoAutoWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSingularNoAutoWithSetterPrefix.java
@@ -1,65 +1,65 @@
 import java.util.List;
 import lombok.Singular;
-@lombok.Builder(setterPrefix = "with") class BuilderSingularNoAuto {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularNoAutoBuilder {
+@lombok.Builder(setterPrefix = "with") class BuilderSingularNoAutoWithSetterPrefix {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularNoAutoWithSetterPrefixBuilder {
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> things;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> widgets;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> items;
-    @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder withThings(final String things) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final String things) {
       if ((this.things == null))
           this.things = new java.util.ArrayList<String>();
       this.things.add(things);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder withThings(final java.util.Collection<? extends String> things) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder clearThings() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefixBuilder clearThings() {
       if ((this.things != null))
           this.things.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder withWidget(final String widget) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefixBuilder withWidget(final String widget) {
       if ((this.widgets == null))
           this.widgets = new java.util.ArrayList<String>();
       this.widgets.add(widget);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder withWidgets(final java.util.Collection<? extends String> widgets) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder clearWidgets() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefixBuilder clearWidgets() {
       if ((this.widgets != null))
           this.widgets.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder withItems(final String items) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final String items) {
       if ((this.items == null))
           this.items = new java.util.ArrayList<String>();
       this.items.add(items);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder withItems(final java.util.Collection<? extends String> items) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder clearItems() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefixBuilder clearItems() {
       if ((this.items != null))
           this.items.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAuto build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix build() {
       java.util.List<String> things;
       switch (((this.things == null) ? 0 : this.things.size())) {
       case 0 :
@@ -93,22 +93,22 @@ import lombok.Singular;
       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);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") 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) + ")");
     }
   }
   private @Singular List<String> things;
   private @Singular("widget") List<String> widgets;
   private @Singular List<String> items;
-  @java.lang.SuppressWarnings("all") BuilderSingularNoAuto(final List<String> things, final List<String> widgets, final List<String> items) {
+  @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefix(final List<String> things, final List<String> widgets, final List<String> items) {
     super();
     this.things = things;
     this.widgets = widgets;
     this.items = items;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderSingularNoAutoBuilder builder() {
-    return new BuilderSingularNoAutoBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderSingularNoAutoWithSetterPrefixBuilder builder() {
+    return new BuilderSingularNoAutoWithSetterPrefixBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingularRedirectToGuavaWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuavaWithSetterPrefix.java
index 6f12f986..c6e163cb 100644
--- a/test/transform/resource/after-ecj/BuilderSingularRedirectToGuavaWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuavaWithSetterPrefix.java
@@ -2,82 +2,82 @@ import java.util.Set;
 import java.util.NavigableMap;
 import java.util.Collection;
 import lombok.Singular;
-@lombok.Builder(setterPrefix = "with") class BuilderSingularRedirectToGuava {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularRedirectToGuavaBuilder {
+@lombok.Builder(setterPrefix = "with") class BuilderSingularRedirectToGuavaWithSetterPrefix {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularRedirectToGuavaWithSetterPrefixBuilder {
     private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSet.Builder<String> dangerMice;
     private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things;
     private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys;
-    @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder withDangerMouse(final String dangerMouse) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withDangerMouse(final String dangerMouse) {
       if ((this.dangerMice == null))
           this.dangerMice = com.google.common.collect.ImmutableSet.builder();
       this.dangerMice.add(dangerMouse);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder withDangerMice(final java.lang.Iterable<? extends String> dangerMice) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder clearDangerMice() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaWithSetterPrefixBuilder clearDangerMice() {
       this.dangerMice = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder withThing(final Integer key, final Number value) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder withThings(final java.util.Map<? extends Integer, ? extends Number> things) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder clearThings() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaWithSetterPrefixBuilder clearThings() {
       this.things = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder withDoohickey(final Class<?> doohickey) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withDoohickey(final Class<?> doohickey) {
       if ((this.doohickeys == null))
           this.doohickeys = com.google.common.collect.ImmutableList.builder();
       this.doohickeys.add(doohickey);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder withDoohickeys(final java.lang.Iterable<? extends Class<?>> doohickeys) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder clearDoohickeys() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaWithSetterPrefixBuilder clearDoohickeys() {
       this.doohickeys = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava build() {
+    public @java.lang.SuppressWarnings("all") 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);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") 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) + ")");
     }
   }
   private @Singular Set<String> dangerMice;
   private @Singular NavigableMap<Integer, Number> things;
   private @Singular Collection<Class<?>> doohickeys;
-  @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) {
+  @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaWithSetterPrefix(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) {
     super();
     this.dangerMice = dangerMice;
     this.things = things;
     this.doohickeys = doohickeys;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder builder() {
-    return new BuilderSingularRedirectToGuavaBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaWithSetterPrefixBuilder builder() {
+    return new BuilderSingularRedirectToGuavaWithSetterPrefixBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingularSetsWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularSetsWithSetterPrefix.java
index 1bf552c5..cb5041a7 100644
--- a/test/transform/resource/after-ecj/BuilderSingularSetsWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSingularSetsWithSetterPrefix.java
@@ -1,84 +1,84 @@
 import java.util.Set;
 import java.util.SortedSet;
 import lombok.Singular;
-@lombok.Builder(setterPrefix = "with") class BuilderSingularSets<T> {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularSetsBuilder<T> {
+@lombok.Builder(setterPrefix = "with") class BuilderSingularSetsWithSetterPrefix<T> {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularSetsWithSetterPrefixBuilder<T> {
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<T> dangerMice;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<Number> octopodes;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<java.lang.Object> rawSet;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> stringSet;
-    @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> dangerMouse(final T dangerMouse) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder<T> dangerMouse(final T dangerMouse) {
       if ((this.dangerMice == null))
           this.dangerMice = new java.util.ArrayList<T>();
       this.dangerMice.add(dangerMouse);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> dangerMice(final java.util.Collection<? extends T> dangerMice) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder<T> dangerMice(final java.util.Collection<? extends T> dangerMice) {
       if ((this.dangerMice == null))
           this.dangerMice = new java.util.ArrayList<T>();
       this.dangerMice.addAll(dangerMice);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> clearDangerMice() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder<T> clearDangerMice() {
       if ((this.dangerMice != null))
           this.dangerMice.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> octopus(final Number octopus) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder<T> octopus(final Number octopus) {
       if ((this.octopodes == null))
           this.octopodes = new java.util.ArrayList<Number>();
       this.octopodes.add(octopus);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> octopodes(final java.util.Collection<? extends Number> octopodes) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder<T> octopodes(final java.util.Collection<? extends Number> octopodes) {
       if ((this.octopodes == null))
           this.octopodes = new java.util.ArrayList<Number>();
       this.octopodes.addAll(octopodes);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> clearOctopodes() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder<T> clearOctopodes() {
       if ((this.octopodes != null))
           this.octopodes.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> rawSet(final java.lang.Object rawSet) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder<T> rawSet(final java.lang.Object rawSet) {
       if ((this.rawSet == null))
           this.rawSet = new java.util.ArrayList<java.lang.Object>();
       this.rawSet.add(rawSet);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> rawSet(final java.util.Collection<?> rawSet) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder<T> rawSet(final java.util.Collection<?> rawSet) {
       if ((this.rawSet == null))
           this.rawSet = new java.util.ArrayList<java.lang.Object>();
       this.rawSet.addAll(rawSet);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> clearRawSet() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder<T> clearRawSet() {
       if ((this.rawSet != null))
           this.rawSet.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> stringSet(final String stringSet) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder<T> stringSet(final String stringSet) {
       if ((this.stringSet == null))
           this.stringSet = new java.util.ArrayList<String>();
       this.stringSet.add(stringSet);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> stringSet(final java.util.Collection<? extends String> stringSet) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder<T> stringSet(final java.util.Collection<? extends String> stringSet) {
       if ((this.stringSet == null))
           this.stringSet = new java.util.ArrayList<String>();
       this.stringSet.addAll(stringSet);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> clearStringSet() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder<T> clearStringSet() {
       if ((this.stringSet != null))
           this.stringSet.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularSets<T> build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix<T> build() {
       java.util.Set<T> dangerMice;
       switch (((this.dangerMice == null) ? 0 : this.dangerMice.size())) {
       case 0 :
@@ -122,24 +122,24 @@ import lombok.Singular;
           stringSet.addAll(this.stringSet);
           stringSet = java.util.Collections.unmodifiableSet(stringSet);
       }
-      return new BuilderSingularSets<T>(dangerMice, octopodes, rawSet, stringSet);
+      return new BuilderSingularSetsWithSetterPrefix<T>(dangerMice, octopodes, rawSet, stringSet);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (((((((("BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice) + ", octopodes=") + this.octopodes) + ", rawSet=") + this.rawSet) + ", stringSet=") + this.stringSet) + ")");
+      return (((((((("BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder(dangerMice=" + this.dangerMice) + ", octopodes=") + this.octopodes) + ", rawSet=") + this.rawSet) + ", stringSet=") + this.stringSet) + ")");
     }
   }
   private @Singular Set<T> dangerMice;
   private @Singular SortedSet<? extends Number> octopodes;
   private @SuppressWarnings("all") @Singular("rawSet") Set rawSet;
   private @Singular("stringSet") Set<String> stringSet;
-  @java.lang.SuppressWarnings("all") BuilderSingularSets(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) {
+  @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefix(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) {
     super();
     this.dangerMice = dangerMice;
     this.octopodes = octopodes;
     this.rawSet = rawSet;
     this.stringSet = stringSet;
   }
-  public static @java.lang.SuppressWarnings("all") <T>BuilderSingularSetsBuilder<T> builder() {
-    return new BuilderSingularSetsBuilder<T>();
+  public static @java.lang.SuppressWarnings("all") <T>BuilderSingularSetsWithSetterPrefixBuilder<T> builder() {
+    return new BuilderSingularSetsWithSetterPrefixBuilder<T>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java
index 086e0701..03f8adf9 100644
--- a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java
@@ -1,28 +1,28 @@
 import lombok.Singular;
-@lombok.Builder(toBuilder = true, setterPrefix = "with") class BuilderSingularToBuilderWithNull {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularToBuilderWithNullBuilder {
+@lombok.Builder(toBuilder = true, setterPrefix = "with") class BuilderSingularToBuilderWithNullWithSetterPrefix {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularToBuilderWithNullWithSetterPrefixBuilder {
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> elems;
-    @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullBuilder withElem(final String elem) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElem(final String elem) {
       if ((this.elems == null))
           this.elems = new java.util.ArrayList<String>();
       this.elems.add(elem);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullBuilder withElems(final java.util.Collection<? extends String> elems) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullBuilder clearElems() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefixBuilder clearElems() {
       if ((this.elems != null))
           this.elems.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNull build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefix build() {
       java.util.List<String> elems;
       switch (((this.elems == null) ? 0 : this.elems.size())) {
       case 0 :
@@ -34,25 +34,25 @@ import lombok.Singular;
       default :
           elems = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.elems));
       }
-      return new BuilderSingularToBuilderWithNull(elems);
+      return new BuilderSingularToBuilderWithNullWithSetterPrefix(elems);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (("BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(elems=" + this.elems) + ")");
+      return (("BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(elems=" + this.elems) + ")");
     }
   }
   private @Singular 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) {
+  @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefix(final java.util.List<String> elems) {
     super();
     this.elems = elems;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullBuilder builder() {
-    return new BuilderSingularToBuilderWithNullBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder() {
+    return new BuilderSingularToBuilderWithNullWithSetterPrefixBuilder();
   }
-  public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullBuilder toBuilder() {
-    final BuilderSingularToBuilderWithNullBuilder builder = new BuilderSingularToBuilderWithNullBuilder();
+  public @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefixBuilder toBuilder() {
+    final BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder = new BuilderSingularToBuilderWithNullWithSetterPrefixBuilder();
     if ((this.elems != null))
         builder.elems(this.elems);
     return builder;
diff --git a/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
index 635b6a79..358e6910 100644
--- a/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
@@ -1,48 +1,48 @@
 import java.util.List;
 import java.util.Collection;
 import lombok.Singular;
-@lombok.Builder(toBuilder = true, setterPrefix = "with") class BuilderSingularWildcardListsWithToBuilder {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularWildcardListsWithToBuilderBuilder {
+@lombok.Builder(toBuilder = true, setterPrefix = "with") class BuilderSingularWildcardListsWithToBuilderWithSetterPrefix {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder {
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<java.lang.Object> objects;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<Number> numbers;
-    @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderBuilder withObject(final java.lang.Object object) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderBuilder withObjects(final java.util.Collection<?> objects) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderBuilder clearObjects() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder clearObjects() {
       if ((this.objects != null))
           this.objects.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderBuilder withNumber(final Number number) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withNumber(final Number number) {
       if ((this.numbers == null))
           this.numbers = new java.util.ArrayList<Number>();
       this.numbers.add(number);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderBuilder withNumbers(final java.util.Collection<? extends Number> numbers) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderBuilder clearNumbers() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder clearNumbers() {
       if ((this.numbers != null))
           this.numbers.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderWithSetterPrefix build() {
       java.util.List<java.lang.Object> objects;
       switch (((this.objects == null) ? 0 : this.objects.size())) {
       case 0 :
@@ -65,24 +65,24 @@ import lombok.Singular;
       default :
           numbers = java.util.Collections.unmodifiableList(new java.util.ArrayList<Number>(this.numbers));
       }
-      return new BuilderSingularWildcardListsWithToBuilder(objects, numbers);
+      return new BuilderSingularWildcardListsWithToBuilderWithSetterPrefix(objects, numbers);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (((("BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(objects=" + this.objects) + ", numbers=") + this.numbers) + ")");
+      return (((("BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder(objects=" + this.objects) + ", numbers=") + this.numbers) + ")");
     }
   }
   private @Singular List<?> objects;
   private @Singular Collection<? extends Number> numbers;
-  @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilder(final List<?> objects, final Collection<? extends Number> numbers) {
+  @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderWithSetterPrefix(final List<?> objects, final Collection<? extends Number> numbers) {
     super();
     this.objects = objects;
     this.numbers = numbers;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderBuilder builder() {
-    return new BuilderSingularWildcardListsWithToBuilderBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder builder() {
+    return new BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder();
   }
-  public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderBuilder toBuilder() {
-    final BuilderSingularWildcardListsWithToBuilderBuilder builder = new BuilderSingularWildcardListsWithToBuilderBuilder();
+  public @java.lang.SuppressWarnings("all") BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder toBuilder() {
+    final BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder builder = new BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder();
     if ((this.objects != null))
         builder.objects(this.objects);
     if ((this.numbers != null))
diff --git a/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java
index d9cea692..88f64f34 100644
--- a/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java
@@ -1,28 +1,28 @@
 import lombok.Singular;
-@lombok.Builder(setterPrefix = "with") @lombok.experimental.Accessors(prefix = "_") class BuilderSingularWithPrefixes {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularWithPrefixesBuilder {
+@lombok.Builder(setterPrefix = "with") @lombok.experimental.Accessors(prefix = "_") class BuilderSingularWithPrefixesWithSetterPrefixes {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularWithPrefixesWithSetterPrefixesBuilder {
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> elems;
-    @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixesBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesBuilder withElem(final String elem) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixesBuilder withElem(final String elem) {
       if ((this.elems == null))
           this.elems = new java.util.ArrayList<String>();
       this.elems.add(elem);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesBuilder withElems(final java.util.Collection<? extends String> elems) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixesBuilder 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesBuilder clearElems() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixesBuilder clearElems() {
       if ((this.elems != null))
           this.elems.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixes build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixes build() {
       java.util.List<String> elems;
       switch (((this.elems == null) ? 0 : this.elems.size())) {
       case 0 :
@@ -34,18 +34,18 @@ import lombok.Singular;
       default :
           elems = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.elems));
       }
-      return new BuilderSingularWithPrefixes(elems);
+      return new BuilderSingularWithPrefixesWithSetterPrefixes(elems);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (("BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(elems=" + this.elems) + ")");
+      return (("BuilderSingularWithPrefixesWithSetterPrefixes.BuilderSingularWithPrefixesWithSetterPrefixesBuilder(elems=" + this.elems) + ")");
     }
   }
   private @Singular java.util.List<String> _elems;
-  @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixes(final java.util.List<String> elems) {
+  @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixes(final java.util.List<String> elems) {
     super();
     this._elems = elems;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesBuilder builder() {
-    return new BuilderSingularWithPrefixesBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixesBuilder builder() {
+    return new BuilderSingularWithPrefixesWithSetterPrefixesBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java
index ed62dc85..db44aa12 100644
--- a/test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderTypeAnnosWithSetterPrefix.java
@@ -5,29 +5,29 @@ import java.util.List;
 }
 @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB {
 }
-@lombok.Builder(setterPrefix = "with") class BuilderTypeAnnos {
-  public static @java.lang.SuppressWarnings("all") class BuilderTypeAnnosBuilder {
+@lombok.Builder(setterPrefix = "with") class BuilderTypeAnnosWithSetterPrefix {
+  public static @java.lang.SuppressWarnings("all") class BuilderTypeAnnosWithSetterPrefixBuilder {
     private @java.lang.SuppressWarnings("all") List<String> foo;
-    @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder withFoo(final @TA List<String> foo) {
+    public @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefixBuilder withFoo(final @TA List<String> foo) {
       this.foo = foo;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderTypeAnnos build() {
-      return new BuilderTypeAnnos(foo);
+    public @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefix build() {
+      return new BuilderTypeAnnosWithSetterPrefix(foo);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (("BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo) + ")");
+      return (("BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder(foo=" + this.foo) + ")");
     }
   }
   private @TA @TB List<String> foo;
-  @java.lang.SuppressWarnings("all") BuilderTypeAnnos(final @TA List<String> foo) {
+  @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefix(final @TA List<String> foo) {
     super();
     this.foo = foo;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderTypeAnnosBuilder builder() {
-    return new BuilderTypeAnnosBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderTypeAnnosWithSetterPrefixBuilder builder() {
+    return new BuilderTypeAnnosWithSetterPrefixBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java
index ffecad46..679591a4 100644
--- a/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java
@@ -1,22 +1,22 @@
 import java.util.List;
-final @lombok.Builder(setterPrefix = "with") @lombok.Value class BuilderAndValue {
-  public static @java.lang.SuppressWarnings("all") class BuilderAndValueBuilder {
-    @java.lang.SuppressWarnings("all") BuilderAndValueBuilder() {
+final @lombok.Builder(setterPrefix = "with") @lombok.Value class BuilderAndValueWithSetterPrefix {
+  public static @java.lang.SuppressWarnings("all") class BuilderAndValueWithSetterPrefixBuilder {
+    @java.lang.SuppressWarnings("all") BuilderAndValueWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderAndValue build() {
-      return new BuilderAndValue();
+    public @java.lang.SuppressWarnings("all") BuilderAndValueWithSetterPrefix build() {
+      return new BuilderAndValueWithSetterPrefix();
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return "BuilderAndValue.BuilderAndValueBuilder()";
+      return "BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder()";
     }
   }
   private final int zero = 0;
-  @java.lang.SuppressWarnings("all") BuilderAndValue() {
+  @java.lang.SuppressWarnings("all") BuilderAndValueWithSetterPrefix() {
     super();
   }
-  public static @java.lang.SuppressWarnings("all") BuilderAndValueBuilder builder() {
-    return new BuilderAndValueBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderAndValueWithSetterPrefixBuilder builder() {
+    return new BuilderAndValueWithSetterPrefixBuilder();
   }
   public @java.lang.SuppressWarnings("all") int getZero() {
     return this.zero;
@@ -24,9 +24,9 @@ final @lombok.Builder(setterPrefix = "with") @lombok.Value class BuilderAndValue
   public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
-    if ((! (o instanceof BuilderAndValue)))
+    if ((! (o instanceof BuilderAndValueWithSetterPrefix)))
         return false;
-    final BuilderAndValue other = (BuilderAndValue) o;
+    final BuilderAndValueWithSetterPrefix other = (BuilderAndValueWithSetterPrefix) o;
     if ((this.getZero() != other.getZero()))
         return false;
     return true;
@@ -38,27 +38,27 @@ final @lombok.Builder(setterPrefix = "with") @lombok.Value class BuilderAndValue
     return result;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return (("BuilderAndValue(zero=" + this.getZero()) + ")");
+    return (("BuilderAndValueWithSetterPrefix(zero=" + this.getZero()) + ")");
   }
 }
-@lombok.Builder @lombok.Data class BuilderAndData {
-  public static @java.lang.SuppressWarnings("all") class BuilderAndDataBuilder {
-    @java.lang.SuppressWarnings("all") BuilderAndDataBuilder() {
+@lombok.Builder @lombok.Data class BuilderAndDataWithSetterPrefix {
+  public static @java.lang.SuppressWarnings("all") class BuilderAndDataWithSetterPrefixBuilder {
+    @java.lang.SuppressWarnings("all") BuilderAndDataWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderAndData build() {
-      return new BuilderAndData();
+    public @java.lang.SuppressWarnings("all") BuilderAndDataWithSetterPrefix build() {
+      return new BuilderAndDataWithSetterPrefix();
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return "BuilderAndData.BuilderAndDataBuilder()";
+      return "BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder()";
     }
   }
   private final int zero = 0;
-  @java.lang.SuppressWarnings("all") BuilderAndData() {
+  @java.lang.SuppressWarnings("all") BuilderAndDataWithSetterPrefix() {
     super();
   }
-  public static @java.lang.SuppressWarnings("all") BuilderAndDataBuilder builder() {
-    return new BuilderAndDataBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderAndDataWithSetterPrefixBuilder builder() {
+    return new BuilderAndDataWithSetterPrefixBuilder();
   }
   public @java.lang.SuppressWarnings("all") int getZero() {
     return this.zero;
@@ -66,9 +66,9 @@ final @lombok.Builder(setterPrefix = "with") @lombok.Value class BuilderAndValue
   public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
-    if ((! (o instanceof BuilderAndData)))
+    if ((! (o instanceof BuilderAndDataWithSetterPrefix)))
         return false;
-    final BuilderAndData other = (BuilderAndData) o;
+    final BuilderAndDataWithSetterPrefix other = (BuilderAndDataWithSetterPrefix) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getZero() != other.getZero()))
@@ -76,7 +76,7 @@ final @lombok.Builder(setterPrefix = "with") @lombok.Value class BuilderAndValue
     return true;
   }
   protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-    return (other instanceof BuilderAndData);
+    return (other instanceof BuilderAndDataWithSetterPrefix);
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
@@ -85,6 +85,6 @@ final @lombok.Builder(setterPrefix = "with") @lombok.Value class BuilderAndValue
     return result;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return (("BuilderAndData(zero=" + this.getZero()) + ")");
+    return (("BuilderAndDataWithSetterPrefix(zero=" + this.getZero()) + ")");
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderWithAccessorsWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithAccessorsWithSetterPrefix.java
index 388e813d..5894a4a2 100644
--- a/test/transform/resource/after-ecj/BuilderWithAccessorsWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderWithAccessorsWithSetterPrefix.java
@@ -1,47 +1,47 @@
-@lombok.Builder(setterPrefix = "with") @lombok.experimental.Accessors(prefix = {"p", "_"}) class BuilderWithAccessors {
-  public static @java.lang.SuppressWarnings("all") class BuilderWithAccessorsBuilder {
+@lombok.Builder(setterPrefix = "with") @lombok.experimental.Accessors(prefix = {"p", "_"}) class BuilderWithAccessorsWithSetterPrefix {
+  public static @java.lang.SuppressWarnings("all") class BuilderWithAccessorsWithSetterPrefixBuilder {
     private @java.lang.SuppressWarnings("all") int plower;
     private @java.lang.SuppressWarnings("all") int upper;
     private @java.lang.SuppressWarnings("all") int foo;
     private @java.lang.SuppressWarnings("all") int _bar;
-    @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderWithAccessorsWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder withPlower(final int plower) {
+    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsWithSetterPrefixBuilder withPlower(final int plower) {
       this.plower = plower;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder withUpper(final int upper) {
+    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsWithSetterPrefixBuilder withUpper(final int upper) {
       this.upper = upper;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder withFoo(final int foo) {
+    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsWithSetterPrefixBuilder withFoo(final int foo) {
       this.foo = foo;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder with_Bar(final int _bar) {
+    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsWithSetterPrefixBuilder with_Bar(final int _bar) {
       this._bar = _bar;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithAccessors build() {
-      return new BuilderWithAccessors(plower, upper, foo, _bar);
+    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsWithSetterPrefix build() {
+      return new BuilderWithAccessorsWithSetterPrefix(plower, upper, foo, _bar);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") 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) + ")");
     }
   }
   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) {
+  @java.lang.SuppressWarnings("all") BuilderWithAccessorsWithSetterPrefix(final int plower, final int upper, final int foo, final int _bar) {
     super();
     this.plower = plower;
     this.pUpper = upper;
     this._foo = foo;
     this.__bar = _bar;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder builder() {
-    return new BuilderWithAccessorsBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderWithAccessorsWithSetterPrefixBuilder builder() {
+    return new BuilderWithAccessorsWithSetterPrefixBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderWithBadNamesWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithBadNamesWithSetterPrefix.java
index 465517f7..248c77ad 100644
--- a/test/transform/resource/after-ecj/BuilderWithBadNamesWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderWithBadNamesWithSetterPrefix.java
@@ -1,33 +1,33 @@
-public @lombok.Builder(setterPrefix = "with") class BuilderWithBadNames {
-  public static @java.lang.SuppressWarnings("all") class BuilderWithBadNamesBuilder {
+public @lombok.Builder(setterPrefix = "with") class BuilderWithBadNamesWithSetterPrefix {
+  public static @java.lang.SuppressWarnings("all") class BuilderWithBadNamesWithSetterPrefixBuilder {
     private @java.lang.SuppressWarnings("all") String build;
     private @java.lang.SuppressWarnings("all") String toString;
-    @java.lang.SuppressWarnings("all") BuilderWithBadNamesBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderWithBadNamesWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithBadNamesBuilder withBuild(final String build) {
+    public @java.lang.SuppressWarnings("all") BuilderWithBadNamesWithSetterPrefixBuilder withBuild(final String build) {
       this.build = build;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithBadNamesBuilder withToString(final String toString) {
+    public @java.lang.SuppressWarnings("all") BuilderWithBadNamesWithSetterPrefixBuilder withToString(final String toString) {
       this.toString = toString;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithBadNames build() {
-      return new BuilderWithBadNames(build, toString);
+    public @java.lang.SuppressWarnings("all") BuilderWithBadNamesWithSetterPrefix build() {
+      return new BuilderWithBadNamesWithSetterPrefix(build, toString);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (((("BuilderWithBadNames.BuilderWithBadNamesBuilder(build=" + this.build) + ", toString=") + this.toString) + ")");
+      return (((("BuilderWithBadNamesWithSetterPrefix.BuilderWithBadNamesWithSetterPrefixBuilder(build=" + this.build) + ", toString=") + this.toString) + ")");
     }
   }
   String build;
   String toString;
-  @java.lang.SuppressWarnings("all") BuilderWithBadNames(final String build, final String toString) {
+  @java.lang.SuppressWarnings("all") BuilderWithBadNamesWithSetterPrefix(final String build, final String toString) {
     super();
     this.build = build;
     this.toString = toString;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderWithBadNamesBuilder builder() {
-    return new BuilderWithBadNamesBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderWithBadNamesWithSetterPrefixBuilder builder() {
+    return new BuilderWithBadNamesWithSetterPrefixBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderWithDeprecatedWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithDeprecatedWithSetterPrefix.java
index 0d8e023f..83fa2e4e 100644
--- a/test/transform/resource/after-ecj/BuilderWithDeprecatedWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderWithDeprecatedWithSetterPrefix.java
@@ -1,57 +1,57 @@
 import com.google.common.collect.ImmutableList;
 import lombok.Builder;
 import lombok.Singular;
-public @Builder(setterPrefix = "with") class BuilderWithDeprecated {
-  public static @java.lang.SuppressWarnings("all") class BuilderWithDeprecatedBuilder {
+public @Builder(setterPrefix = "with") class BuilderWithDeprecatedWithSetterPrefix {
+  public static @java.lang.SuppressWarnings("all") class BuilderWithDeprecatedWithSetterPrefixBuilder {
     private @java.lang.SuppressWarnings("all") String dep1;
     private @java.lang.SuppressWarnings("all") int dep2;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> strings;
     private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList.Builder<Integer> numbers;
-    @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderWithDeprecatedWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder withDep1(final String dep1) {
+    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedWithSetterPrefixBuilder withDep1(final String dep1) {
       this.dep1 = dep1;
       return this;
     }
-    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder withDep2(final int dep2) {
+    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedWithSetterPrefixBuilder withDep2(final int dep2) {
       this.dep2 = dep2;
       return this;
     }
-    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder withString(final String string) {
+    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedWithSetterPrefixBuilder withString(final String string) {
       if ((this.strings == null))
           this.strings = new java.util.ArrayList<String>();
       this.strings.add(string);
       return this;
     }
-    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder withStrings(final java.util.Collection<? extends String> strings) {
+    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder clearStrings() {
+    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedWithSetterPrefixBuilder clearStrings() {
       if ((this.strings != null))
           this.strings.clear();
       return this;
     }
-    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder withNumber(final Integer number) {
+    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedWithSetterPrefixBuilder withNumber(final Integer number) {
       if ((this.numbers == null))
           this.numbers = com.google.common.collect.ImmutableList.builder();
       this.numbers.add(number);
       return this;
     }
-    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder withNumbers(final java.lang.Iterable<? extends Integer> numbers) {
+    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder clearNumbers() {
+    public @java.lang.Deprecated @java.lang.SuppressWarnings("all") BuilderWithDeprecatedWithSetterPrefixBuilder clearNumbers() {
       this.numbers = null;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithDeprecated build() {
+    public @java.lang.SuppressWarnings("all") BuilderWithDeprecatedWithSetterPrefix build() {
       java.util.List<String> strings;
       switch (((this.strings == null) ? 0 : this.strings.size())) {
       case 0 :
@@ -64,24 +64,24 @@ public @Builder(setterPrefix = "with") 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);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") 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) + ")");
     }
   }
   String dep1;
   @Deprecated int dep2;
   @Singular @Deprecated java.util.List<String> strings;
   @Singular @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) {
+  @java.lang.SuppressWarnings("all") BuilderWithDeprecatedWithSetterPrefix(final String dep1, final int dep2, final java.util.List<String> strings, final ImmutableList<Integer> numbers) {
     super();
     this.dep1 = dep1;
     this.dep2 = dep2;
     this.strings = strings;
     this.numbers = numbers;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderWithDeprecatedBuilder builder() {
-    return new BuilderWithDeprecatedBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderWithDeprecatedWithSetterPrefixBuilder builder() {
+    return new BuilderWithDeprecatedWithSetterPrefixBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java
index 220a8a63..8da2f012 100644
--- a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java
@@ -1,36 +1,36 @@
 import lombok.Builder;
-class BuilderWithExistingBuilderClass<T, K extends Number> {
-  public static class BuilderWithExistingBuilderClassBuilder<Z extends Number> {
+class BuilderWithExistingBuilderClassWithSetterPrefix<T, K extends Number> {
+  public static class BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z extends Number> {
     private @java.lang.SuppressWarnings("all") boolean arg2;
     private @java.lang.SuppressWarnings("all") String arg3;
     private Z arg1;
     public void withArg2(boolean arg) {
     }
-    @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassBuilder<Z> withArg1(final Z arg1) {
+    public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg1(final Z arg1) {
       this.arg1 = arg1;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassBuilder<Z> withArg3(final String arg3) {
+    public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg3(final String arg3) {
       this.arg3 = arg3;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClass<String, Z> build() {
-      return BuilderWithExistingBuilderClass.<Z>staticMethod(arg1, arg2, arg3);
+    public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassWithSetterPrefix<String, Z> build() {
+      return BuilderWithExistingBuilderClassWithSetterPrefix.<Z>staticMethod(arg1, arg2, arg3);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") 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) + ")");
     }
   }
-  BuilderWithExistingBuilderClass() {
+  BuilderWithExistingBuilderClassWithSetterPrefix() {
     super();
   }
-  public static @Builder(setterPrefix = "with") <Z extends Number>BuilderWithExistingBuilderClass<String, Z> staticMethod(Z arg1, boolean arg2, String arg3) {
+  public static @Builder(setterPrefix = "with") <Z extends Number>BuilderWithExistingBuilderClassWithSetterPrefix<String, Z> staticMethod(Z arg1, boolean arg2, String arg3) {
     return null;
   }
-  public static @java.lang.SuppressWarnings("all") <Z extends Number>BuilderWithExistingBuilderClassBuilder<Z> builder() {
-    return new BuilderWithExistingBuilderClassBuilder<Z>();
+  public static @java.lang.SuppressWarnings("all") <Z extends Number>BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> builder() {
+    return new BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderWithNoBuilderMethodWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithNoBuilderMethodWithSetterPrefix.java
index 0b934767..30043dd9 100644
--- a/test/transform/resource/after-ecj/BuilderWithNoBuilderMethodWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderWithNoBuilderMethodWithSetterPrefix.java
@@ -1,27 +1,27 @@
 import lombok.Builder;
-@Builder(toBuilder = true,builderMethodName = "",setterPrefix = "with") class BuilderWithNoBuilderMethod {
-  public static @java.lang.SuppressWarnings("all") class BuilderWithNoBuilderMethodBuilder {
+@Builder(toBuilder = true,builderMethodName = "",setterPrefix = "with") class BuilderWithNoBuilderMethodWithSetterPrefix {
+  public static @java.lang.SuppressWarnings("all") class BuilderWithNoBuilderMethodWithSetterPrefixBuilder {
     private @java.lang.SuppressWarnings("all") String a;
-    @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethodBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethodWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethodBuilder withA(final String a) {
+    public @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethodWithSetterPrefixBuilder withA(final String a) {
       this.a = a;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethod build() {
-      return new BuilderWithNoBuilderMethod(a);
+    public @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethodWithSetterPrefix build() {
+      return new BuilderWithNoBuilderMethodWithSetterPrefix(a);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (("BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder(a=" + this.a) + ")");
+      return (("BuilderWithNoBuilderMethodWithSetterPrefix.BuilderWithNoBuilderMethodWithSetterPrefixBuilder(a=" + this.a) + ")");
     }
   }
   private String a = "";
-  @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethod(final String a) {
+  @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethodWithSetterPrefix(final String a) {
     super();
     this.a = a;
   }
-  public @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethodBuilder toBuilder() {
-    return new BuilderWithNoBuilderMethodBuilder().withA(this.a);
+  public @java.lang.SuppressWarnings("all") BuilderWithNoBuilderMethodWithSetterPrefixBuilder toBuilder() {
+    return new BuilderWithNoBuilderMethodWithSetterPrefixBuilder().withA(this.a);
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java
index 6379e25f..7f8cb80b 100644
--- a/test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderWithNonNullWithSetterPrefix.java
@@ -1,10 +1,10 @@
-@lombok.Builder(setterPrefix = "with") class BuilderWithNonNull {
-  public static @java.lang.SuppressWarnings("all") class BuilderWithNonNullBuilder {
+@lombok.Builder(setterPrefix = "with") class BuilderWithNonNullWithSetterPrefix {
+  public static @java.lang.SuppressWarnings("all") class BuilderWithNonNullWithSetterPrefixBuilder {
     private @java.lang.SuppressWarnings("all") String id;
-    @java.lang.SuppressWarnings("all") BuilderWithNonNullBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithNonNullBuilder withId(final @lombok.NonNull String id) {
+    public @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefixBuilder withId(final @lombok.NonNull String id) {
       if ((id == null))
           {
             throw new java.lang.NullPointerException("id is marked non-null but is null");
@@ -12,15 +12,15 @@
       this.id = id;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithNonNull build() {
-      return new BuilderWithNonNull(id);
+    public @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefix build() {
+      return new BuilderWithNonNullWithSetterPrefix(id);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (("BuilderWithNonNull.BuilderWithNonNullBuilder(id=" + this.id) + ")");
+      return (("BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder(id=" + this.id) + ")");
     }
   }
   private final @lombok.NonNull String id;
-  @java.lang.SuppressWarnings("all") BuilderWithNonNull(final @lombok.NonNull String id) {
+  @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefix(final @lombok.NonNull String id) {
     super();
     if ((id == null))
         {
@@ -28,7 +28,7 @@
         }
     this.id = id;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderWithNonNullBuilder builder() {
-    return new BuilderWithNonNullBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderWithNonNullWithSetterPrefixBuilder builder() {
+    return new BuilderWithNonNullWithSetterPrefixBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderWithRecursiveGenericsWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithRecursiveGenericsWithSetterPrefix.java
index 32b9c20e..2ce25b0a 100644
--- a/test/transform/resource/after-ecj/BuilderWithRecursiveGenericsWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderWithRecursiveGenericsWithSetterPrefix.java
@@ -1,7 +1,7 @@
 import java.util.Set;
 import lombok.Builder;
 import lombok.Value;
-public class BuilderWithRecursiveGenerics {
+public class BuilderWithRecursiveGenericsWithSetterPrefix {
   interface Inter<T, U extends Inter<T, U>> {
   }
   public static final @Builder(setterPrefix = "with(setterPrefix = "with")") @Value class Test<Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> {
@@ -23,7 +23,7 @@ public class BuilderWithRecursiveGenerics {
         return new Test<Foo, Bar, Quz>(foo, bar);
       }
       public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-        return (((("BuilderWithRecursiveGenerics.Test.TestBuilder(foo=" + this.foo) + ", bar=") + this.bar) + ")");
+        return (((("BuilderWithRecursiveGenericsWithSetterPrefix.Test.TestBuilder(foo=" + this.foo) + ", bar=") + this.bar) + ")");
       }
     }
     private final Foo foo;
@@ -45,9 +45,9 @@ public class BuilderWithRecursiveGenerics {
     public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
       if ((o == this))
           return true;
-      if ((! (o instanceof BuilderWithRecursiveGenerics.Test)))
+      if ((! (o instanceof BuilderWithRecursiveGenericsWithSetterPrefix.Test)))
           return false;
-      final BuilderWithRecursiveGenerics.Test<?, ?, ?> other = (BuilderWithRecursiveGenerics.Test<?, ?, ?>) o;
+      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))))
@@ -68,10 +68,10 @@ public class BuilderWithRecursiveGenerics {
       return result;
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (((("BuilderWithRecursiveGenerics.Test(foo=" + this.getFoo()) + ", bar=") + this.getBar()) + ")");
+      return (((("BuilderWithRecursiveGenericsWithSetterPrefix.Test(foo=" + this.getFoo()) + ", bar=") + this.getBar()) + ")");
     }
   }
-  public BuilderWithRecursiveGenerics() {
+  public BuilderWithRecursiveGenericsWithSetterPrefix() {
     super();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithToBuilderWithSetterPrefix.java
index 85378cab..c33315a4 100644
--- a/test/transform/resource/after-ecj/BuilderWithToBuilderWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderWithToBuilderWithSetterPrefix.java
@@ -1,44 +1,44 @@
 import java.util.List;
 import lombok.Builder;
-@Builder(toBuilder = true,setterPrefix = "with") @lombok.experimental.Accessors(prefix = "m") class BuilderWithToBuilder<T> {
-  public static @java.lang.SuppressWarnings("all") class BuilderWithToBuilderBuilder<T> {
+@Builder(toBuilder = true,setterPrefix = "with") @lombok.experimental.Accessors(prefix = "m") class BuilderWithToBuilderWithSetterPrefix<T> {
+  public static @java.lang.SuppressWarnings("all") class BuilderWithToBuilderWithSetterPrefixBuilder<T> {
     private @java.lang.SuppressWarnings("all") String one;
     private @java.lang.SuppressWarnings("all") String two;
     private @java.lang.SuppressWarnings("all") T foo;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<T> bars;
-    @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderWithToBuilderWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder<T> withOne(final String one) {
+    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderWithSetterPrefixBuilder<T> withOne(final String one) {
       this.one = one;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder<T> withTwo(final String two) {
+    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderWithSetterPrefixBuilder<T> withTwo(final String two) {
       this.two = two;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder<T> withFoo(final T foo) {
+    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderWithSetterPrefixBuilder<T> withFoo(final T foo) {
       this.foo = foo;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder<T> withBar(final T bar) {
+    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderWithSetterPrefixBuilder<T> withBar(final T bar) {
       if ((this.bars == null))
           this.bars = new java.util.ArrayList<T>();
       this.bars.add(bar);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder<T> withBars(final java.util.Collection<? extends T> bars) {
+    public @java.lang.SuppressWarnings("all") 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;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder<T> clearBars() {
+    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderWithSetterPrefixBuilder<T> clearBars() {
       if ((this.bars != null))
           this.bars.clear();
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithToBuilder<T> build() {
+    public @java.lang.SuppressWarnings("all") BuilderWithToBuilderWithSetterPrefix<T> build() {
       java.util.List<T> bars;
       switch (((this.bars == null) ? 0 : this.bars.size())) {
       case 0 :
@@ -50,31 +50,31 @@ import lombok.Builder;
       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);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") 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) + ")");
     }
   }
   private String mOne;
   private String mTwo;
   private @Builder.ObtainVia(method = "rrr",isStatic = true) T foo;
   private @lombok.Singular 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) {
+  @java.lang.SuppressWarnings("all") BuilderWithToBuilderWithSetterPrefix(final String one, final String two, final T foo, final List<T> bars) {
     super();
     this.mOne = one;
     this.mTwo = two;
     this.foo = foo;
     this.bars = bars;
   }
-  public static @java.lang.SuppressWarnings("all") <T>BuilderWithToBuilderBuilder<T> builder() {
-    return new BuilderWithToBuilderBuilder<T>();
+  public static @java.lang.SuppressWarnings("all") <T>BuilderWithToBuilderWithSetterPrefixBuilder<T> builder() {
+    return new BuilderWithToBuilderWithSetterPrefixBuilder<T>();
   }
-  public @java.lang.SuppressWarnings("all") BuilderWithToBuilderBuilder<T> toBuilder() {
-    final BuilderWithToBuilderBuilder<T> builder = new BuilderWithToBuilderBuilder<T>().withOne(this.mOne).withTwo(this.mTwo).withFoo(BuilderWithToBuilder.<T>rrr(this));
+  public @java.lang.SuppressWarnings("all") 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;
diff --git a/test/transform/resource/after-ecj/BuilderWithTolerateWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithTolerateWithSetterPrefix.java
index a795bafc..6fa302e5 100644
--- a/test/transform/resource/after-ecj/BuilderWithTolerateWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderWithTolerateWithSetterPrefix.java
@@ -1,34 +1,34 @@
 import lombok.Builder;
 import lombok.experimental.Tolerate;
-public @Builder(setterPrefix = "with") class BuilderWithTolerate {
-  public static class BuilderWithTolerateBuilder {
+public @Builder(setterPrefix = "with") class BuilderWithTolerateWithSetterPrefix {
+  public static class BuilderWithTolerateWithSetterPrefixBuilder {
     private @java.lang.SuppressWarnings("all") int value;
-    public @Tolerate BuilderWithTolerateBuilder withValue(String s) {
+    public @Tolerate BuilderWithTolerateWithSetterPrefixBuilder withValue(String s) {
       return this.withValue(Integer.parseInt(s));
     }
-    @java.lang.SuppressWarnings("all") BuilderWithTolerateBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderWithTolerateWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithTolerateBuilder withValue(final int value) {
+    public @java.lang.SuppressWarnings("all") BuilderWithTolerateWithSetterPrefixBuilder withValue(final int value) {
       this.value = value;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithTolerate build() {
-      return new BuilderWithTolerate(value);
+    public @java.lang.SuppressWarnings("all") BuilderWithTolerateWithSetterPrefix build() {
+      return new BuilderWithTolerateWithSetterPrefix(value);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (("BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value) + ")");
+      return (("BuilderWithTolerateWithSetterPrefix.BuilderWithTolerateWithSetterPrefixBuilder(value=" + this.value) + ")");
     }
   }
   private final int value;
   public static void main(String[] args) {
-    BuilderWithTolerate.builder().withValue("42").build();
+    BuilderWithTolerateWithSetterPrefix.builder().withValue("42").build();
   }
-  @java.lang.SuppressWarnings("all") BuilderWithTolerate(final int value) {
+  @java.lang.SuppressWarnings("all") BuilderWithTolerateWithSetterPrefix(final int value) {
     super();
     this.value = value;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderWithTolerateBuilder builder() {
-    return new BuilderWithTolerateBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderWithTolerateWithSetterPrefixBuilder builder() {
+    return new BuilderWithTolerateWithSetterPrefixBuilder();
   }
 }
diff --git a/test/transform/resource/before/BuilderSimpleWithSetterPrefix.java b/test/transform/resource/before/BuilderSimpleWithSetterPrefix.java
index 38f3c029..19ab7af1 100644
--- a/test/transform/resource/before/BuilderSimpleWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderSimpleWithSetterPrefix.java
@@ -1,6 +1,6 @@
 import java.util.List;
 
 @lombok.Builder(access = lombok.AccessLevel.PROTECTED, setterPrefix = "with")
-class BuilderWithPrefix<T> {
+class BuilderSimpleWithSetterPrefix<T> {
 	private int unprefixed;
 }
diff --git a/test/transform/resource/before/BuilderSingularAnnotatedTypesWithSetterPrefix.java b/test/transform/resource/before/BuilderSingularAnnotatedTypesWithSetterPrefix.java
index 2ef83429..ef8cb2e3 100644
--- a/test/transform/resource/before/BuilderSingularAnnotatedTypesWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderSingularAnnotatedTypesWithSetterPrefix.java
@@ -8,7 +8,7 @@ import lombok.Singular;
 @Target(ElementType.TYPE_USE)
 @interface MyAnnotation {}
 @lombok.Builder(setterPrefix = "with")
-class BuilderSingularAnnotatedTypes {
+class BuilderSingularAnnotatedTypesWithSetterPrefix {
 	@Singular private Set<@MyAnnotation @NonNull String> foos;
 	@Singular private Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars;
 }
diff --git a/test/transform/resource/before/BuilderSingularGuavaListsSetsWithSetterPrefix.java b/test/transform/resource/before/BuilderSingularGuavaListsSetsWithSetterPrefix.java
index 678b2e9f..af02adb6 100644
--- a/test/transform/resource/before/BuilderSingularGuavaListsSetsWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderSingularGuavaListsSetsWithSetterPrefix.java
@@ -7,7 +7,7 @@ import com.google.common.collect.ImmutableTable;
 import lombok.Singular;
 
 @lombok.Builder(setterPrefix = "with")
-class BuilderSingularGuavaListsSets<T> {
+class BuilderSingularGuavaListsSetsWithSetterPrefix<T> {
 	@Singular private ImmutableList<T> cards;
 	@Singular private ImmutableCollection<? extends Number> frogs;
 	@SuppressWarnings("all") @Singular("rawSet") private ImmutableSet rawSet;
diff --git a/test/transform/resource/before/BuilderSingularGuavaMapsWithPrefix.java b/test/transform/resource/before/BuilderSingularGuavaMapsWithPrefix.java
index 89de9a9c..a2b48cb3 100644
--- a/test/transform/resource/before/BuilderSingularGuavaMapsWithPrefix.java
+++ b/test/transform/resource/before/BuilderSingularGuavaMapsWithPrefix.java
@@ -5,7 +5,7 @@ import com.google.common.collect.ImmutableSortedMap;
 import lombok.Singular;
 
 @lombok.Builder(setterPrefix = "with")
-class BuilderSingularGuavaMaps<K, V> {
+class BuilderSingularGuavaMapsWithSetterPrefix<K, V> {
 	@Singular private ImmutableMap<K, V> battleaxes;
 	@Singular private ImmutableSortedMap<Integer, ? extends V> vertices;
 	@SuppressWarnings("all") @Singular("rawMap") private ImmutableBiMap rawMap;
diff --git a/test/transform/resource/before/BuilderSingularListsWithSetterPrefix.java b/test/transform/resource/before/BuilderSingularListsWithSetterPrefix.java
index 101e7972..fd53d97f 100644
--- a/test/transform/resource/before/BuilderSingularListsWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderSingularListsWithSetterPrefix.java
@@ -4,7 +4,7 @@ import java.util.Collection;
 import lombok.Singular;
 
 @lombok.Builder(setterPrefix = "with")
-class BuilderSingularLists<T> {
+class BuilderSingularListsWithSetterPrefix<T> {
 	@Singular private List<T> children;
 	@Singular private Collection<? extends Number> scarves;
 	@SuppressWarnings("all") @Singular("rawList") private List rawList;
diff --git a/test/transform/resource/before/BuilderSingularMapsWithSetterPrefix.java b/test/transform/resource/before/BuilderSingularMapsWithSetterPrefix.java
index e77bcf6e..728ad59a 100644
--- a/test/transform/resource/before/BuilderSingularMapsWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderSingularMapsWithSetterPrefix.java
@@ -7,7 +7,7 @@ import java.util.SortedMap;
 import lombok.Singular;
 
 @lombok.Builder(setterPrefix = "with")
-class BuilderSingularMaps<K, V> {
+class BuilderSingularMapsWithSetterPrefix<K, V> {
 	@Singular private Map<K, V> women;
 	@Singular private SortedMap<K, ? extends Number> men;
 	@SuppressWarnings("all") @Singular("rawMap") private Map rawMap;
diff --git a/test/transform/resource/before/BuilderSingularNoAutoWithSetterPrefix.java b/test/transform/resource/before/BuilderSingularNoAutoWithSetterPrefix.java
index 0474c764..fa55c553 100644
--- a/test/transform/resource/before/BuilderSingularNoAutoWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderSingularNoAutoWithSetterPrefix.java
@@ -4,7 +4,7 @@ import java.util.List;
 import lombok.Singular;
 
 @lombok.Builder(setterPrefix = "with")
-class BuilderSingularNoAuto {
+class BuilderSingularNoAutoWithSetterPrefix {
 	@Singular private List<String> things;
 	@Singular("widget") private List<String> widgets;
 	@Singular private List<String> items;
diff --git a/test/transform/resource/before/BuilderSingularRedirectToGuavaWithSetterPrefix.java b/test/transform/resource/before/BuilderSingularRedirectToGuavaWithSetterPrefix.java
index c3fdc7c6..7281141d 100644
--- a/test/transform/resource/before/BuilderSingularRedirectToGuavaWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderSingularRedirectToGuavaWithSetterPrefix.java
@@ -6,7 +6,7 @@ import java.util.Collection;
 import lombok.Singular;
 
 @lombok.Builder(setterPrefix = "with")
-class BuilderSingularRedirectToGuava {
+class BuilderSingularRedirectToGuavaWithSetterPrefix {
 	@Singular private Set<String> dangerMice;
 	@Singular private NavigableMap<Integer, Number> things;
 	@Singular private Collection<Class<?>> doohickeys;
diff --git a/test/transform/resource/before/BuilderSingularSetsWithSetterPrefix.java b/test/transform/resource/before/BuilderSingularSetsWithSetterPrefix.java
index 16026f2d..d2824109 100644
--- a/test/transform/resource/before/BuilderSingularSetsWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderSingularSetsWithSetterPrefix.java
@@ -4,7 +4,7 @@ import java.util.SortedSet;
 import lombok.Singular;
 
 @lombok.Builder(setterPrefix = "with")
-class BuilderSingularSets<T> {
+class BuilderSingularSetsWithSetterPrefix<T> {
 	@Singular private Set<T> dangerMice;
 	@Singular private SortedSet<? extends Number> octopodes;
 	@SuppressWarnings("all") @Singular("rawSet") private Set rawSet;
diff --git a/test/transform/resource/before/BuilderSingularToBuilderWithNullWithSetterPrefix.java b/test/transform/resource/before/BuilderSingularToBuilderWithNullWithSetterPrefix.java
index f7a411f0..845b38df 100644
--- a/test/transform/resource/before/BuilderSingularToBuilderWithNullWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderSingularToBuilderWithNullWithSetterPrefix.java
@@ -1,7 +1,7 @@
 import lombok.Singular;
 
 @lombok.Builder(toBuilder = true, setterPrefix = "with")
-class BuilderSingularToBuilderWithNull {
+class BuilderSingularToBuilderWithNullWithSetterPrefix {
 	@Singular private java.util.List<String> elems;
 	
 	public static void test() {
diff --git a/test/transform/resource/before/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java b/test/transform/resource/before/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
index 817f4be5..cea10bab 100644
--- a/test/transform/resource/before/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
@@ -4,7 +4,7 @@ import java.util.Collection;
 import lombok.Singular;
 
 @lombok.Builder(toBuilder = true, setterPrefix = "with")
-class BuilderSingularWildcardListsWithToBuilder {
+class BuilderSingularWildcardListsWithToBuilderWithSetterPrefix {
 	@Singular private List<?> objects;
 	@Singular private Collection<? extends Number> numbers;
 }
diff --git a/test/transform/resource/before/BuilderSingularWithPrefixesWithSetterPrefix.java b/test/transform/resource/before/BuilderSingularWithPrefixesWithSetterPrefix.java
index 63df4a71..1b953668 100644
--- a/test/transform/resource/before/BuilderSingularWithPrefixesWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderSingularWithPrefixesWithSetterPrefix.java
@@ -2,6 +2,6 @@ import lombok.Singular;
 
 @lombok.Builder(setterPrefix = "with")
 @lombok.experimental.Accessors(prefix = "_")
-class BuilderSingularWithPrefixes {
+class BuilderSingularWithPrefixesWithSetterPrefix {
 	@Singular private java.util.List<String> _elems;
 }
diff --git a/test/transform/resource/before/BuilderTypeAnnosWithSetterPrefix.java b/test/transform/resource/before/BuilderTypeAnnosWithSetterPrefix.java
index 65faf01d..4adde2a0 100644
--- a/test/transform/resource/before/BuilderTypeAnnosWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderTypeAnnosWithSetterPrefix.java
@@ -9,6 +9,6 @@ import java.util.List;
 @interface TB {
 }
 @lombok.Builder(setterPrefix = "with")
-class BuilderTypeAnnos {
+class BuilderTypeAnnosWithSetterPrefix {
 	private @TA @TB List<String> foo;
 }
diff --git a/test/transform/resource/before/BuilderValueDataWithSetterPrefix.java b/test/transform/resource/before/BuilderValueDataWithSetterPrefix.java
index e5d9dc92..530c24d2 100644
--- a/test/transform/resource/before/BuilderValueDataWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderValueDataWithSetterPrefix.java
@@ -1,11 +1,11 @@
 import java.util.List;
 
-@lombok.Builder @lombok.Value
-class BuilderAndValue {
+@lombok.Builder(setterPrefix = "with") @lombok.Value
+class BuilderAndValueWithSetterPrefix {
 	private final int zero = 0;
 }
 
 @lombok.Builder(setterPrefix = "with") @lombok.Data
-class BuilderAndData {
+class BuilderAndDataWithSetterPrefix {
 	private final int zero = 0;
 }
diff --git a/test/transform/resource/before/BuilderWithAccessorsWithSetterPrefix.java b/test/transform/resource/before/BuilderWithAccessorsWithSetterPrefix.java
index b14527a1..4f4ebb18 100644
--- a/test/transform/resource/before/BuilderWithAccessorsWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderWithAccessorsWithSetterPrefix.java
@@ -1,5 +1,5 @@
 @lombok.Builder(setterPrefix = "with") @lombok.experimental.Accessors(prefix={"p", "_"})
-class BuilderWithAccessors {
+class BuilderWithAccessorsWithSetterPrefix {
 	private final int plower;
 	private final int pUpper;
 	private int _foo;
diff --git a/test/transform/resource/before/BuilderWithBadNamesWithSetterPrefix.java b/test/transform/resource/before/BuilderWithBadNamesWithSetterPrefix.java
index da344f76..69322ee3 100644
--- a/test/transform/resource/before/BuilderWithBadNamesWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderWithBadNamesWithSetterPrefix.java
@@ -1,5 +1,5 @@
 @lombok.Builder(setterPrefix = "with")
-public class BuilderWithBadNames {
+public class BuilderWithBadNamesWithSetterPrefix {
 	String build;
 	String toString;
 }
diff --git a/test/transform/resource/before/BuilderWithDeprecatedWithSetterPrefix.java b/test/transform/resource/before/BuilderWithDeprecatedWithSetterPrefix.java
index 5047de45..77baccd3 100644
--- a/test/transform/resource/before/BuilderWithDeprecatedWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderWithDeprecatedWithSetterPrefix.java
@@ -3,7 +3,7 @@ import lombok.Builder;
 import lombok.Singular;
 
 @Builder(setterPrefix = "with")
-public class BuilderWithDeprecated {
+public class BuilderWithDeprecatedWithSetterPrefix {
 	/** @deprecated since always */ String dep1;
 	@Deprecated int dep2;
 	@Singular @Deprecated java.util.List<String> strings;
diff --git a/test/transform/resource/before/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/before/BuilderWithExistingBuilderClassWithSetterPrefix.java
index f931d507..cb699295 100644
--- a/test/transform/resource/before/BuilderWithExistingBuilderClassWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderWithExistingBuilderClassWithSetterPrefix.java
@@ -1,12 +1,12 @@
 import lombok.Builder;
 
-class BuilderWithExistingBuilderClass<T, K extends Number> {
+class BuilderWithExistingBuilderClassWithSetterPrefix<T, K extends Number> {
 	@Builder(setterPrefix = "with")
-	public static <Z extends Number> BuilderWithExistingBuilderClass<String, Z> staticMethod(Z arg1, boolean arg2, String arg3) {
+	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 BuilderWithExistingBuilderClassBuilderWithSetterPrefix<Z extends Number> {
 		private Z arg1;
 		
 		public void withArg2(boolean arg) {
diff --git a/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java b/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java
index fa8b8f09..b787e303 100644
--- a/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java
@@ -1,5 +1,5 @@
 import lombok.Builder(setterPrefix = "with");
 @Builder(toBuilder = true, builderMethodName = "", setterPrefix = "with")
-class BuilderWithNoBuilderMethod {
+class BuilderWithNoBuilderMethodWithSetterPrefix {
 	private String a = "";
 }
diff --git a/test/transform/resource/before/BuilderWithNonNullWithSetterPrefix.java b/test/transform/resource/before/BuilderWithNonNullWithSetterPrefix.java
index 1a18fbc7..8ef1f70e 100644
--- a/test/transform/resource/before/BuilderWithNonNullWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderWithNonNullWithSetterPrefix.java
@@ -1,5 +1,5 @@
 @lombok.Builder(setterPrefix = "with")
-class BuilderWithNonNull {
+class BuilderWithNonNullWithSetterPrefix {
 	@lombok.NonNull
 	private final String id;
 }
diff --git a/test/transform/resource/before/BuilderWithRecursiveGenericsWithSetterPrefix.java b/test/transform/resource/before/BuilderWithRecursiveGenericsWithSetterPrefix.java
index 85129223..ce8803c0 100644
--- a/test/transform/resource/before/BuilderWithRecursiveGenericsWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderWithRecursiveGenericsWithSetterPrefix.java
@@ -3,7 +3,7 @@ import java.util.Set;
 import lombok.Builder;
 import lombok.Value;
 
-public class BuilderWithRecursiveGenerics {
+public class BuilderWithRecursiveGenericsWithSetterPrefix {
 	interface Inter<T, U extends Inter<T, U>> {}
 	
 	@Builder(setterPrefix = "with") @Value public static class Test<Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> {
diff --git a/test/transform/resource/before/BuilderWithToBuilderWithSetterPrefix.java b/test/transform/resource/before/BuilderWithToBuilderWithSetterPrefix.java
index 8be20f58..b33211e9 100644
--- a/test/transform/resource/before/BuilderWithToBuilderWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderWithToBuilderWithSetterPrefix.java
@@ -1,7 +1,7 @@
 import java.util.List;
 import lombok.Builder;
 @Builder(toBuilder = true, setterPrefix = "with") @lombok.experimental.Accessors(prefix = "m")
-class BuilderWithToBuilder<T> {
+class BuilderWithToBuilderWithSetterPrefix<T> {
 	private String mOne, mTwo;
 	@Builder.ObtainVia(method = "rrr", isStatic = true) private T foo;
 	@lombok.Singular private List<T> bars;
@@ -10,11 +10,11 @@ class BuilderWithToBuilder<T> {
 	}
 }
 @lombok.experimental.Accessors(prefix = "m")
-class ConstructorWithToBuilder<T> {
+class ConstructorWithToBuilderWithSetterPrefix<T> {
 	private String mOne, mTwo;
 	private T foo;
 	@lombok.Singular private com.google.common.collect.ImmutableList<T> bars;
-	@Builder(toBuilder = true)
+	@Builder(toBuilder = true, setterPrefix = "with")
 	public ConstructorWithToBuilder(String mOne, @Builder.ObtainVia(field = "foo") T baz, com.google.common.collect.ImmutableList<T> bars) {
 	}
 }
diff --git a/test/transform/resource/before/BuilderWithTolerateWithSetterPrefix.java b/test/transform/resource/before/BuilderWithTolerateWithSetterPrefix.java
index 2f4db558..fa7c0298 100644
--- a/test/transform/resource/before/BuilderWithTolerateWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderWithTolerateWithSetterPrefix.java
@@ -2,16 +2,16 @@ import lombok.Builder;
 import lombok.experimental.Tolerate;
 		
 @Builder(setterPrefix = "with")
-public class BuilderWithTolerate {
+public class BuilderWithTolerateWithSetterPrefix {
 	private final int value;
 	
 	public static void main(String[] args) {
-		BuilderWithTolerate.builder().value("42").build();
+		BuilderWithTolerateWithSetterPrefix.builder().withValue("42").build();
 	}
 	
-	public static class BuilderWithTolerateBuilder {
+	public static class BuilderWithTolerateWithSetterPrefixBuilder {
 		@Tolerate
-		public BuilderWithTolerateBuilder value(String s) {
+		public BuilderWithTolerateWithSetterPrefixBuilder withValue(String s) {
 			return this.value(Integer.parseInt(s));
 		}
 	}