2 files changed, 46 insertions, 9 deletions
diff --git a/test/transform/resource/after-ecj/BuilderComplex.java b/test/transform/resource/after-ecj/BuilderComplex.java
index 93d70fe9..23dbf058 100644
--- a/test/transform/resource/after-ecj/BuilderComplex.java
+++ b/test/transform/resource/after-ecj/BuilderComplex.java
@@ -1,27 +1,27 @@
 import java.util.List;
 import lombok.Builder;
 class BuilderComplex {
-  public static @java.lang.SuppressWarnings("all") class VoidBuilder<T extends Number> {
+  public static @java.lang.SuppressWarnings("all") class TestVoidName<T extends Number> {
     private @java.lang.SuppressWarnings("all") T number;
     private @java.lang.SuppressWarnings("all") int arg2;
     private @java.lang.SuppressWarnings("all") String arg3;
     private @java.lang.SuppressWarnings("all") BuilderComplex selfRef;
-    @java.lang.SuppressWarnings("all") VoidBuilder() {
+    @java.lang.SuppressWarnings("all") TestVoidName() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") VoidBuilder<T> number(final T number) {
+    public @java.lang.SuppressWarnings("all") TestVoidName<T> number(final T number) {
       this.number = number;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") VoidBuilder<T> arg2(final int arg2) {
+    public @java.lang.SuppressWarnings("all") TestVoidName<T> arg2(final int arg2) {
       this.arg2 = arg2;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") VoidBuilder<T> arg3(final String arg3) {
+    public @java.lang.SuppressWarnings("all") TestVoidName<T> arg3(final String arg3) {
       this.arg3 = arg3;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") VoidBuilder<T> selfRef(final BuilderComplex selfRef) {
+    public @java.lang.SuppressWarnings("all") TestVoidName<T> selfRef(final BuilderComplex selfRef) {
       this.selfRef = selfRef;
       return this;
     }
@@ -29,7 +29,7 @@ class BuilderComplex {
       BuilderComplex.<T>testVoidWithGenerics(number, arg2, arg3, selfRef);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (((((((("BuilderComplex.VoidBuilder(number=" + this.number) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ", selfRef=") + this.selfRef) + ")");
+      return (((((((("BuilderComplex.TestVoidName(number=" + this.number) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ", selfRef=") + this.selfRef) + ")");
     }
   }
   BuilderComplex() {
@@ -37,7 +37,7 @@ class BuilderComplex {
   }
   private static @Builder(buildMethodName = "execute") <T extends Number>void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) {
   }
-  public static @java.lang.SuppressWarnings("all") <T extends Number>VoidBuilder<T> builder() {
-    return new VoidBuilder<T>();
+  public static @java.lang.SuppressWarnings("all") <T extends Number>TestVoidName<T> builder() {
+    return new TestVoidName<T>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderCustomName.java b/test/transform/resource/after-ecj/BuilderCustomName.java
new file mode 100644
index 00000000..1067a9d1
--- /dev/null
+++ b/test/transform/resource/after-ecj/BuilderCustomName.java
@@ -0,0 +1,37 @@
+import java.util.List;
+@lombok.experimental.SuperBuilder class BuilderCustomName<T> {
+  public static abstract @java.lang.SuppressWarnings("all") class SimpleTestBuilder<T, C extends BuilderCustomName<T>, B extends SimpleTestBuilder<T, C, B>> {
+    private @java.lang.SuppressWarnings("all") int field;
+    public SimpleTestBuilder() {
+      super();
+    }
+    protected abstract @java.lang.SuppressWarnings("all") B self();
+    public abstract @java.lang.SuppressWarnings("all") C build();
+    public @java.lang.SuppressWarnings("all") B field(final int field) {
+      this.field = field;
+      return self();
+    }
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+      return (("BuilderCustomName.SimpleTestBuilder(field=" + this.field) + ")");
+    }
+  }
+  private static final @java.lang.SuppressWarnings("all") class SimpleTestBuilderImpl<T> extends SimpleTestBuilder<T, BuilderCustomName<T>, SimpleTestBuilderImpl<T>> {
+    private SimpleTestBuilderImpl() {
+      super();
+    }
+    protected @java.lang.Override @java.lang.SuppressWarnings("all") SimpleTestBuilderImpl<T> self() {
+      return this;
+    }
+    public @java.lang.Override @java.lang.SuppressWarnings("all") BuilderCustomName<T> build() {
+      return new BuilderCustomName<T>(this);
+    }
+  }
+  private final int field;
+  protected @java.lang.SuppressWarnings("all") BuilderCustomName(final SimpleTestBuilder<T, ?, ?> b) {
+    super();
+    this.field = b.field;
+  }
+  public static @java.lang.SuppressWarnings("all") <T>SimpleTestBuilder<T, ?, ?> builder() {
+    return new SimpleTestBuilderImpl<T>();
+  }
+}