brainfarted ‘singleton’ where I meant ‘singular’ in all the test files. Whoops!

18 files changed, 198 insertions, 198 deletions

diff --git a/test/transform/resource/after-delombok/BuilderSingletonGuavaListsSets.java b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
index 4503f2bb..3fc969ef 100644
--- a/test/transform/resource/after-delombok/BuilderSingletonGuavaListsSets.java
+++ b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
@@ -2,92 +2,92 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
-class BuilderSingletonGuavaListsSets<T> {
+class BuilderSingularGuavaListsSets<T> {
 	private ImmutableList<T> cards;
 	private ImmutableCollection<? extends Number> frogs;
 	@SuppressWarnings("all")
 	private ImmutableSet rawSet;
 	private ImmutableSortedSet<String> passes;
 	@java.lang.SuppressWarnings("all")
-	BuilderSingletonGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes) {
+	BuilderSingularGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes) {
 		this.cards = cards;
 		this.frogs = frogs;
 		this.rawSet = rawSet;
 		this.passes = passes;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderSingletonGuavaListsSetsBuilder<T> {
+	public static class BuilderSingularGuavaListsSetsBuilder<T> {
 		private com.google.common.collect.ImmutableList.Builder<T> cards;
 		private com.google.common.collect.ImmutableList.Builder<Number> frogs;
 		private com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet;
 		private com.google.common.collect.ImmutableSortedSet.Builder<String> passes;
 		@java.lang.SuppressWarnings("all")
-		BuilderSingletonGuavaListsSetsBuilder() {
+		BuilderSingularGuavaListsSetsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonGuavaListsSetsBuilder<T> card(final T card) {
+		public BuilderSingularGuavaListsSetsBuilder<T> card(final T card) {
 			if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder();
 			this.cards.add(card);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonGuavaListsSetsBuilder<T> cards(final java.lang.Iterable<? extends T> cards) {
+		public BuilderSingularGuavaListsSetsBuilder<T> cards(final java.lang.Iterable<? extends T> cards) {
 			if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder();
 			this.cards.addAll(cards);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonGuavaListsSetsBuilder<T> frog(final Number frog) {
+		public BuilderSingularGuavaListsSetsBuilder<T> frog(final Number frog) {
 			if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder();
 			this.frogs.add(frog);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonGuavaListsSetsBuilder<T> frogs(final java.lang.Iterable<? extends Number> frogs) {
+		public BuilderSingularGuavaListsSetsBuilder<T> frogs(final java.lang.Iterable<? extends Number> frogs) {
 			if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder();
 			this.frogs.addAll(frogs);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonGuavaListsSetsBuilder<T> rawSet(final java.lang.Object rawSet) {
+		public BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Object rawSet) {
 			if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder();
 			this.rawSet.add(rawSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonGuavaListsSetsBuilder<T> rawSet(final java.lang.Iterable<?> rawSet) {
+		public BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Iterable<?> rawSet) {
 			if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder();
 			this.rawSet.addAll(rawSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonGuavaListsSetsBuilder<T> pass(final String pass) {
+		public BuilderSingularGuavaListsSetsBuilder<T> pass(final String pass) {
 			if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
 			this.passes.add(pass);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonGuavaListsSetsBuilder<T> passes(final java.lang.Iterable<? extends String> passes) {
+		public BuilderSingularGuavaListsSetsBuilder<T> passes(final java.lang.Iterable<? extends String> passes) {
 			if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
 			this.passes.addAll(passes);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonGuavaListsSets<T> build() {
+		public BuilderSingularGuavaListsSets<T> build() {
 			com.google.common.collect.ImmutableList<T> cards = this.cards == null ? com.google.common.collect.ImmutableList.of() : this.cards.build();
 			com.google.common.collect.ImmutableCollection<Number> frogs = this.frogs == null ? com.google.common.collect.ImmutableList.of() : this.frogs.build();
 			com.google.common.collect.ImmutableSet<java.lang.Object> rawSet = this.rawSet == null ? com.google.common.collect.ImmutableSet.of() : this.rawSet.build();
 			com.google.common.collect.ImmutableSortedSet<String> passes = this.passes == null ? com.google.common.collect.ImmutableSortedSet.of() : this.passes.build();
-			return new BuilderSingletonGuavaListsSets<T>(cards, frogs, rawSet, passes);
+			return new BuilderSingularGuavaListsSets<T>(cards, frogs, rawSet, passes);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderSingletonGuavaListsSets.BuilderSingletonGuavaListsSetsBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ")";
+			return "BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static <T> BuilderSingletonGuavaListsSetsBuilder<T> builder() {
-		return new BuilderSingletonGuavaListsSetsBuilder<T>();
+	public static <T> BuilderSingularGuavaListsSetsBuilder<T> builder() {
+		return new BuilderSingularGuavaListsSetsBuilder<T>();
 	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/BuilderSingletonGuavaMaps.java b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java
index ff39da32..c55dff28 100644
--- a/test/transform/resource/after-delombok/BuilderSingletonGuavaMaps.java
+++ b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java
@@ -1,76 +1,76 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableSortedMap;
-class BuilderSingletonGuavaMaps<K, V> {
+class BuilderSingularGuavaMaps<K, V> {
 	private ImmutableMap<K, V> battleaxes;
 	private ImmutableSortedMap<Integer, ? extends V> vertices;
 	@SuppressWarnings("all")
 	private ImmutableBiMap rawMap;
 	@java.lang.SuppressWarnings("all")
-	BuilderSingletonGuavaMaps(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) {
+	BuilderSingularGuavaMaps(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) {
 		this.battleaxes = battleaxes;
 		this.vertices = vertices;
 		this.rawMap = rawMap;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderSingletonGuavaMapsBuilder<K, V> {
+	public static class BuilderSingularGuavaMapsBuilder<K, V> {
 		private com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes;
 		private com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices;
 		private com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap;
 		@java.lang.SuppressWarnings("all")
-		BuilderSingletonGuavaMapsBuilder() {
+		BuilderSingularGuavaMapsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonGuavaMapsBuilder<K, V> battleaxe(final K battleaxe$key, final V battleaxe$value) {
+		public BuilderSingularGuavaMapsBuilder<K, V> battleaxe(final K battleaxe$key, final V battleaxe$value) {
 			if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder();
 			this.battleaxes.put(battleaxe$key, battleaxe$value);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonGuavaMapsBuilder<K, V> battleaxes(final java.util.Map<? extends K, ? extends V> battleaxes) {
+		public BuilderSingularGuavaMapsBuilder<K, V> battleaxes(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;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonGuavaMapsBuilder<K, V> vertex(final Integer vertex$key, final V vertex$value) {
+		public BuilderSingularGuavaMapsBuilder<K, V> vertex(final Integer vertex$key, final V vertex$value) {
 			if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
 			this.vertices.put(vertex$key, vertex$value);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonGuavaMapsBuilder<K, V> vertices(final java.util.Map<? extends Integer, ? extends V> vertices) {
+		public BuilderSingularGuavaMapsBuilder<K, V> vertices(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;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonGuavaMapsBuilder<K, V> rawMap(final java.lang.Object rawMap$key, final java.lang.Object rawMap$value) {
+		public BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.lang.Object rawMap$key, final java.lang.Object rawMap$value) {
 			if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
 			this.rawMap.put(rawMap$key, rawMap$value);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonGuavaMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) {
+		public BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) {
 			if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
 			this.rawMap.putAll(rawMap);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonGuavaMaps<K, V> build() {
+		public BuilderSingularGuavaMaps<K, V> build() {
 			com.google.common.collect.ImmutableMap<K, V> battleaxes = this.battleaxes == null ? com.google.common.collect.ImmutableMap.of() : this.battleaxes.build();
 			com.google.common.collect.ImmutableSortedMap<Integer, V> vertices = this.vertices == null ? com.google.common.collect.ImmutableSortedMap.of() : this.vertices.build();
 			com.google.common.collect.ImmutableBiMap<java.lang.Object, java.lang.Object> rawMap = this.rawMap == null ? com.google.common.collect.ImmutableBiMap.of() : this.rawMap.build();
-			return new BuilderSingletonGuavaMaps<K, V>(battleaxes, vertices, rawMap);
+			return new BuilderSingularGuavaMaps<K, V>(battleaxes, vertices, rawMap);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderSingletonGuavaMaps.BuilderSingletonGuavaMapsBuilder(battleaxes=" + this.battleaxes + ", vertices=" + this.vertices + ", rawMap=" + this.rawMap + ")";
+			return "BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes + ", vertices=" + this.vertices + ", rawMap=" + this.rawMap + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static <K, V> BuilderSingletonGuavaMapsBuilder<K, V> builder() {
-		return new BuilderSingletonGuavaMapsBuilder<K, V>();
+	public static <K, V> BuilderSingularGuavaMapsBuilder<K, V> builder() {
+		return new BuilderSingularGuavaMapsBuilder<K, V>();
 	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/BuilderSingletonLists.java b/test/transform/resource/after-delombok/BuilderSingularLists.java
index 1c93f40a..aa5382c1 100644
--- a/test/transform/resource/after-delombok/BuilderSingletonLists.java
+++ b/test/transform/resource/after-delombok/BuilderSingularLists.java
@@ -1,62 +1,62 @@
 import java.util.List;
 import java.util.Collection;
-class BuilderSingletonLists<T> {
+class BuilderSingularLists<T> {
 	private List<T> children;
 	private Collection<? extends Number> scarves;
 	@SuppressWarnings("all")
 	private List rawList;
 	@java.lang.SuppressWarnings("all")
-	BuilderSingletonLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) {
+	BuilderSingularLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) {
 		this.children = children;
 		this.scarves = scarves;
 		this.rawList = rawList;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderSingletonListsBuilder<T> {
+	public static class BuilderSingularListsBuilder<T> {
 		private java.util.ArrayList<T> children;
 		private java.util.ArrayList<Number> scarves;
 		private java.util.ArrayList<java.lang.Object> rawList;
 		@java.lang.SuppressWarnings("all")
-		BuilderSingletonListsBuilder() {
+		BuilderSingularListsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonListsBuilder<T> child(final T child) {
+		public BuilderSingularListsBuilder<T> child(final T child) {
 			if (this.children == null) this.children = new java.util.ArrayList<T>();
 			this.children.add(child);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonListsBuilder<T> children(final java.util.Collection<? extends T> children) {
+		public BuilderSingularListsBuilder<T> children(final java.util.Collection<? extends T> children) {
 			if (this.children == null) this.children = new java.util.ArrayList<T>();
 			this.children.addAll(children);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonListsBuilder<T> scarf(final Number scarf) {
+		public BuilderSingularListsBuilder<T> scarf(final Number scarf) {
 			if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>();
 			this.scarves.add(scarf);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonListsBuilder<T> scarves(final java.util.Collection<? extends Number> scarves) {
+		public BuilderSingularListsBuilder<T> scarves(final java.util.Collection<? extends Number> scarves) {
 			if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>();
 			this.scarves.addAll(scarves);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonListsBuilder<T> rawList(final java.lang.Object rawList) {
+		public BuilderSingularListsBuilder<T> rawList(final java.lang.Object rawList) {
 			if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>();
 			this.rawList.add(rawList);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonListsBuilder<T> rawList(final java.util.Collection<?> rawList) {
+		public BuilderSingularListsBuilder<T> rawList(final java.util.Collection<?> rawList) {
 			if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>();
 			this.rawList.addAll(rawList);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonLists<T> build() {
+		public BuilderSingularLists<T> build() {
 			java.util.List<T> children;
 			switch (this.children == null ? 0 : this.children.size()) {
 			case 0: 
@@ -96,16 +96,16 @@ class BuilderSingletonLists<T> {
 				rawList.addAll(this.rawList);
 				rawList = java.util.Collections.unmodifiableList(rawList);
 			}
-			return new BuilderSingletonLists<T>(children, scarves, rawList);
+			return new BuilderSingularLists<T>(children, scarves, rawList);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderSingletonLists.BuilderSingletonListsBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")";
+			return "BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static <T> BuilderSingletonListsBuilder<T> builder() {
-		return new BuilderSingletonListsBuilder<T>();
+	public static <T> BuilderSingularListsBuilder<T> builder() {
+		return new BuilderSingularListsBuilder<T>();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderSingletonMaps.java b/test/transform/resource/after-delombok/BuilderSingularMaps.java
index a6474975..640ddb94 100644
--- a/test/transform/resource/after-delombok/BuilderSingletonMaps.java
+++ b/test/transform/resource/after-delombok/BuilderSingularMaps.java
@@ -1,20 +1,20 @@
 import java.util.Map;
 import java.util.SortedMap;
-class BuilderSingletonMaps<K, V> {
+class BuilderSingularMaps<K, V> {
 	private Map<K, V> women;
 	private SortedMap<K, ? extends Number> men;
 	@SuppressWarnings("all")
 	private Map rawMap;
 	private Map<String, V> stringMap;
 	@java.lang.SuppressWarnings("all")
-	BuilderSingletonMaps(final Map<K, V> women, final SortedMap<K, ? extends Number> men, final Map rawMap, final Map<String, V> stringMap) {
+	BuilderSingularMaps(final Map<K, V> women, final SortedMap<K, ? extends Number> men, final Map rawMap, final Map<String, V> stringMap) {
 		this.women = women;
 		this.men = men;
 		this.rawMap = rawMap;
 		this.stringMap = stringMap;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderSingletonMapsBuilder<K, V> {
+	public static class BuilderSingularMapsBuilder<K, V> {
 		private java.util.ArrayList<K> women$key;
 		private java.util.ArrayList<V> women$value;
 		private java.util.ArrayList<K> men$key;
@@ -24,10 +24,10 @@ class BuilderSingletonMaps<K, V> {
 		private java.util.ArrayList<String> stringMap$key;
 		private java.util.ArrayList<V> stringMap$value;
 		@java.lang.SuppressWarnings("all")
-		BuilderSingletonMapsBuilder() {
+		BuilderSingularMapsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonMapsBuilder<K, V> woman(final K womanKey, final V womanValue) {
+		public BuilderSingularMapsBuilder<K, V> woman(final K womanKey, final V womanValue) {
 			if (this.women$key == null) {
 				this.women$key = new java.util.ArrayList<K>();
 				this.women$value = new java.util.ArrayList<V>();
@@ -37,7 +37,7 @@ class BuilderSingletonMaps<K, V> {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonMapsBuilder<K, V> women(final java.util.Map<? extends K, ? extends V> women) {
+		public BuilderSingularMapsBuilder<K, V> women(final java.util.Map<? extends K, ? extends V> women) {
 			if (this.women$key == null) {
 				this.women$key = new java.util.ArrayList<K>();
 				this.women$value = new java.util.ArrayList<V>();
@@ -49,7 +49,7 @@ class BuilderSingletonMaps<K, V> {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonMapsBuilder<K, V> man(final K manKey, final Number manValue) {
+		public BuilderSingularMapsBuilder<K, V> man(final K manKey, final Number manValue) {
 			if (this.men$key == null) {
 				this.men$key = new java.util.ArrayList<K>();
 				this.men$value = new java.util.ArrayList<Number>();
@@ -59,7 +59,7 @@ class BuilderSingletonMaps<K, V> {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonMapsBuilder<K, V> men(final java.util.Map<? extends K, ? extends Number> men) {
+		public BuilderSingularMapsBuilder<K, V> men(final java.util.Map<? extends K, ? extends Number> men) {
 			if (this.men$key == null) {
 				this.men$key = new java.util.ArrayList<K>();
 				this.men$value = new java.util.ArrayList<Number>();
@@ -71,7 +71,7 @@ class BuilderSingletonMaps<K, V> {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonMapsBuilder<K, V> rawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) {
+		public BuilderSingularMapsBuilder<K, V> rawMap(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>();
 				this.rawMap$value = new java.util.ArrayList<java.lang.Object>();
@@ -81,7 +81,7 @@ class BuilderSingletonMaps<K, V> {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) {
+		public BuilderSingularMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) {
 			if (this.rawMap$key == null) {
 				this.rawMap$key = new java.util.ArrayList<java.lang.Object>();
 				this.rawMap$value = new java.util.ArrayList<java.lang.Object>();
@@ -93,7 +93,7 @@ class BuilderSingletonMaps<K, V> {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonMapsBuilder<K, V> stringMap(final String stringMapKey, final V stringMapValue) {
+		public BuilderSingularMapsBuilder<K, V> stringMap(final String stringMapKey, final V stringMapValue) {
 			if (this.stringMap$key == null) {
 				this.stringMap$key = new java.util.ArrayList<String>();
 				this.stringMap$value = new java.util.ArrayList<V>();
@@ -103,7 +103,7 @@ class BuilderSingletonMaps<K, V> {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonMapsBuilder<K, V> stringMap(final java.util.Map<? extends String, ? extends V> stringMap) {
+		public BuilderSingularMapsBuilder<K, V> stringMap(final java.util.Map<? extends String, ? extends V> stringMap) {
 			if (this.stringMap$key == null) {
 				this.stringMap$key = new java.util.ArrayList<String>();
 				this.stringMap$value = new java.util.ArrayList<V>();
@@ -115,7 +115,7 @@ class BuilderSingletonMaps<K, V> {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonMaps<K, V> build() {
+		public BuilderSingularMaps<K, V> build() {
 			java.util.Map<K, V> women;
 			switch (this.women$key == null ? 0 : this.women$key.size()) {
 			case 0:
@@ -158,16 +158,16 @@ class BuilderSingletonMaps<K, V> {
 				for (int $i = 0; $i < this.stringMap$key.size(); $i++) stringMap.put(this.stringMap$key.get($i), this.stringMap$value.get($i));
 				stringMap = java.util.Collections.unmodifiableMap(stringMap);
 			}
-			return new BuilderSingletonMaps<K, V>(women, men, rawMap, stringMap);
+			return new BuilderSingularMaps<K, V>(women, men, rawMap, stringMap);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderSingletonMaps.BuilderSingletonMapsBuilder(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 "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 + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static <K, V> BuilderSingletonMapsBuilder<K, V> builder() {
-		return new BuilderSingletonMapsBuilder<K, V>();
+	public static <K, V> BuilderSingularMapsBuilder<K, V> builder() {
+		return new BuilderSingularMapsBuilder<K, V>();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderSingletonRedirectToGuava.java b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java
index a2d230a1..84dc9a26 100644
--- a/test/transform/resource/after-delombok/BuilderSingletonRedirectToGuava.java
+++ b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java
@@ -1,75 +1,75 @@
 import java.util.Set;
 import java.util.NavigableMap;
 import java.util.Collection;
-class BuilderSingletonRedirectToGuava {
+class BuilderSingularRedirectToGuava {
 	private Set<String> dangerMice;
 	private NavigableMap<Integer, Number> things;
 	private Collection<Class<?>> doohickeys;
 	@java.lang.SuppressWarnings("all")
-	BuilderSingletonRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) {
+	BuilderSingularRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) {
 		this.dangerMice = dangerMice;
 		this.things = things;
 		this.doohickeys = doohickeys;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderSingletonRedirectToGuavaBuilder {
+	public static class BuilderSingularRedirectToGuavaBuilder {
 		private com.google.common.collect.ImmutableSet.Builder<String> dangerMice;
 		private com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things;
 		private com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys;
 		@java.lang.SuppressWarnings("all")
-		BuilderSingletonRedirectToGuavaBuilder() {
+		BuilderSingularRedirectToGuavaBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonRedirectToGuavaBuilder dangerMouse(final String dangerMouse) {
+		public BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMouse) {
 			if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder();
 			this.dangerMice.add(dangerMouse);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonRedirectToGuavaBuilder dangerMice(final java.lang.Iterable<? extends String> dangerMice) {
+		public BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable<? extends String> dangerMice) {
 			if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder();
 			this.dangerMice.addAll(dangerMice);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonRedirectToGuavaBuilder thing(final Integer thing$key, final Number thing$value) {
+		public BuilderSingularRedirectToGuavaBuilder thing(final Integer thing$key, final Number thing$value) {
 			if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder();
 			this.things.put(thing$key, thing$value);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonRedirectToGuavaBuilder things(final java.util.Map<? extends Integer, ? extends Number> things) {
+		public BuilderSingularRedirectToGuavaBuilder things(final java.util.Map<? extends Integer, ? extends Number> things) {
 			if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder();
 			this.things.putAll(things);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonRedirectToGuavaBuilder doohickey(final Class<?> doohickey) {
+		public BuilderSingularRedirectToGuavaBuilder doohickey(final Class<?> doohickey) {
 			if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder();
 			this.doohickeys.add(doohickey);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonRedirectToGuavaBuilder doohickeys(final java.lang.Iterable<? extends Class<?>> doohickeys) {
+		public BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable<? extends Class<?>> doohickeys) {
 			if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder();
 			this.doohickeys.addAll(doohickeys);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonRedirectToGuava build() {
+		public BuilderSingularRedirectToGuava build() {
 			java.util.Set<String> dangerMice = this.dangerMice == null ? com.google.common.collect.ImmutableSet.of() : this.dangerMice.build();
 			java.util.NavigableMap<Integer, Number> things = this.things == null ? com.google.common.collect.ImmutableSortedMap.of() : this.things.build();
 			java.util.Collection<Class<?>> doohickeys = this.doohickeys == null ? com.google.common.collect.ImmutableList.of() : this.doohickeys.build();
-			return new BuilderSingletonRedirectToGuava(dangerMice, things, doohickeys);
+			return new BuilderSingularRedirectToGuava(dangerMice, things, doohickeys);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderSingletonRedirectToGuava.BuilderSingletonRedirectToGuavaBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")";
+			return "BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderSingletonRedirectToGuavaBuilder builder() {
-		return new BuilderSingletonRedirectToGuavaBuilder();
+	public static BuilderSingularRedirectToGuavaBuilder builder() {
+		return new BuilderSingularRedirectToGuavaBuilder();
 	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/BuilderSingletonSets.java b/test/transform/resource/after-delombok/BuilderSingularSets.java
index c57331a5..d75c0fbf 100644
--- a/test/transform/resource/after-delombok/BuilderSingletonSets.java
+++ b/test/transform/resource/after-delombok/BuilderSingularSets.java
@@ -1,77 +1,77 @@
 import java.util.Set;
 import java.util.SortedSet;
-class BuilderSingletonSets<T> {
+class BuilderSingularSets<T> {
 	private Set<T> dangerMice;
 	private SortedSet<? extends Number> octopodes;
 	@SuppressWarnings("all")
 	private Set rawSet;
 	private Set<String> stringSet;
 	@java.lang.SuppressWarnings("all")
-	BuilderSingletonSets(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) {
+	BuilderSingularSets(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) {
 		this.dangerMice = dangerMice;
 		this.octopodes = octopodes;
 		this.rawSet = rawSet;
 		this.stringSet = stringSet;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static class BuilderSingletonSetsBuilder<T> {
+	public static class BuilderSingularSetsBuilder<T> {
 		private java.util.ArrayList<T> dangerMice;
 		private java.util.ArrayList<Number> octopodes;
 		private java.util.ArrayList<java.lang.Object> rawSet;
 		private java.util.ArrayList<String> stringSet;
 		@java.lang.SuppressWarnings("all")
-		BuilderSingletonSetsBuilder() {
+		BuilderSingularSetsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonSetsBuilder<T> dangerMouse(final T dangerMouse) {
+		public BuilderSingularSetsBuilder<T> dangerMouse(final T dangerMouse) {
 			if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>();
 			this.dangerMice.add(dangerMouse);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonSetsBuilder<T> dangerMice(final java.util.Collection<? extends T> dangerMice) {
+		public BuilderSingularSetsBuilder<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;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonSetsBuilder<T> octopus(final Number octopus) {
+		public BuilderSingularSetsBuilder<T> octopus(final Number octopus) {
 			if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>();
 			this.octopodes.add(octopus);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonSetsBuilder<T> octopodes(final java.util.Collection<? extends Number> octopodes) {
+		public BuilderSingularSetsBuilder<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;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonSetsBuilder<T> rawSet(final java.lang.Object rawSet) {
+		public BuilderSingularSetsBuilder<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;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonSetsBuilder<T> rawSet(final java.util.Collection<?> rawSet) {
+		public BuilderSingularSetsBuilder<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;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonSetsBuilder<T> stringSet(final String stringSet) {
+		public BuilderSingularSetsBuilder<T> stringSet(final String stringSet) {
 			if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>();
 			this.stringSet.add(stringSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonSetsBuilder<T> stringSet(final java.util.Collection<? extends String> stringSet) {
+		public BuilderSingularSetsBuilder<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;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderSingletonSets<T> build() {
+		public BuilderSingularSets<T> build() {
 			java.util.Set<T> dangerMice;
 			switch (this.dangerMice == null ? 0 : this.dangerMice.size()) {
 			case 0: 
@@ -114,16 +114,16 @@ class BuilderSingletonSets<T> {
 				stringSet.addAll(this.stringSet);
 				stringSet = java.util.Collections.unmodifiableSet(stringSet);
 			}
-			return new BuilderSingletonSets<T>(dangerMice, octopodes, rawSet, stringSet);
+			return new BuilderSingularSets<T>(dangerMice, octopodes, rawSet, stringSet);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
-			return "BuilderSingletonSets.BuilderSingletonSetsBuilder(dangerMice=" + this.dangerMice + ", octopodes=" + this.octopodes + ", rawSet=" + this.rawSet + ", stringSet=" + this.stringSet + ")";
+			return "BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice + ", octopodes=" + this.octopodes + ", rawSet=" + this.rawSet + ", stringSet=" + this.stringSet + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static <T> BuilderSingletonSetsBuilder<T> builder() {
-		return new BuilderSingletonSetsBuilder<T>();
+	public static <T> BuilderSingularSetsBuilder<T> builder() {
+		return new BuilderSingularSetsBuilder<T>();
 	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderSingletonGuavaListsSets.java b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java
index d14cb049..f95ce1ea 100644
--- a/test/transform/resource/after-ecj/BuilderSingletonGuavaListsSets.java
+++ b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java
@@ -3,86 +3,86 @@ import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
 import lombok.Singular;
-@lombok.Builder class BuilderSingletonGuavaListsSets<T> {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingletonGuavaListsSetsBuilder<T> {
+@lombok.Builder class BuilderSingularGuavaListsSets<T> {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaListsSetsBuilder<T> {
     private com.google.common.collect.ImmutableList.Builder<T> cards;
     private com.google.common.collect.ImmutableList.Builder<Number> frogs;
     private com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet;
     private com.google.common.collect.ImmutableSortedSet.Builder<String> passes;
-    @java.lang.SuppressWarnings("all") BuilderSingletonGuavaListsSetsBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaListsSetsBuilder<T> card(T card) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> card(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") BuilderSingletonGuavaListsSetsBuilder<T> cards(java.lang.Iterable<? extends T> cards) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> cards(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") BuilderSingletonGuavaListsSetsBuilder<T> frog(Number frog) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> frog(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") BuilderSingletonGuavaListsSetsBuilder<T> frogs(java.lang.Iterable<? extends Number> frogs) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> frogs(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") BuilderSingletonGuavaListsSetsBuilder<T> rawSet(java.lang.Object rawSet) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> rawSet(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") BuilderSingletonGuavaListsSetsBuilder<T> rawSet(java.lang.Iterable<?> rawSet) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> rawSet(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") BuilderSingletonGuavaListsSetsBuilder<T> pass(String pass) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> pass(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") BuilderSingletonGuavaListsSetsBuilder<T> passes(java.lang.Iterable<? extends String> passes) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> passes(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") BuilderSingletonGuavaListsSets<T> build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets<T> build() {
       com.google.common.collect.ImmutableList<T> cards = ((this.cards == null) ? com.google.common.collect.ImmutableList.of() : this.cards.build());
       com.google.common.collect.ImmutableCollection<Number> frogs = ((this.frogs == null) ? com.google.common.collect.ImmutableList.of() : this.frogs.build());
       com.google.common.collect.ImmutableSet<java.lang.Object> rawSet = ((this.rawSet == null) ? com.google.common.collect.ImmutableSet.of() : this.rawSet.build());
       com.google.common.collect.ImmutableSortedSet<String> passes = ((this.passes == null) ? com.google.common.collect.ImmutableSortedSet.of() : this.passes.build());
-      return new BuilderSingletonGuavaListsSets<T>(cards, frogs, rawSet, passes);
+      return new BuilderSingularGuavaListsSets<T>(cards, frogs, rawSet, passes);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (((((((("BuilderSingletonGuavaListsSets.BuilderSingletonGuavaListsSetsBuilder(cards=" + this.cards) + ", frogs=") + this.frogs) + ", rawSet=") + this.rawSet) + ", passes=") + this.passes) + ")");
+      return (((((((("BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards) + ", frogs=") + this.frogs) + ", rawSet=") + this.rawSet) + ", passes=") + this.passes) + ")");
     }
   }
   private @Singular ImmutableList<T> cards;
   private @Singular ImmutableCollection<? extends Number> frogs;
   private @SuppressWarnings("all") @Singular("rawSet") ImmutableSet rawSet;
   private @Singular ImmutableSortedSet<String> passes;
-  @java.lang.SuppressWarnings("all") BuilderSingletonGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes) {
+  @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes) {
     super();
     this.cards = cards;
     this.frogs = frogs;
     this.rawSet = rawSet;
     this.passes = passes;
   }
-  public static @java.lang.SuppressWarnings("all") <T>BuilderSingletonGuavaListsSetsBuilder<T> builder() {
-    return new BuilderSingletonGuavaListsSetsBuilder<T>();
+  public static @java.lang.SuppressWarnings("all") <T>BuilderSingularGuavaListsSetsBuilder<T> builder() {
+    return new BuilderSingularGuavaListsSetsBuilder<T>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingletonGuavaMaps.java b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java
index 33788df9..64f287bf 100644
--- a/test/transform/resource/after-ecj/BuilderSingletonGuavaMaps.java
+++ b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java
@@ -2,70 +2,70 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableSortedMap;
 import lombok.Singular;
-@lombok.Builder class BuilderSingletonGuavaMaps<K, V> {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingletonGuavaMapsBuilder<K, V> {
+@lombok.Builder class BuilderSingularGuavaMaps<K, V> {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaMapsBuilder<K, V> {
     private com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes;
     private com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices;
     private com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap;
-    @java.lang.SuppressWarnings("all") BuilderSingletonGuavaMapsBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaMapsBuilder<K, V> battleaxe(K battleaxe$key, V battleaxe$value) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> battleaxe(K battleaxe$key, V battleaxe$value) {
       if ((this.battleaxes == null))
           this.battleaxes = com.google.common.collect.ImmutableMap.builder();
       this.battleaxes.put(battleaxe$key, battleaxe$value);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaMapsBuilder<K, V> battleaxes(java.util.Map<? extends K, ? extends V> battleaxes) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> battleaxes(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") BuilderSingletonGuavaMapsBuilder<K, V> vertex(Integer vertex$key, V vertex$value) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> vertex(Integer vertex$key, V vertex$value) {
       if ((this.vertices == null))
           this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
       this.vertices.put(vertex$key, vertex$value);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaMapsBuilder<K, V> vertices(java.util.Map<? extends Integer, ? extends V> vertices) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> vertices(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") BuilderSingletonGuavaMapsBuilder<K, V> rawMap(java.lang.Object rawMap$key, java.lang.Object rawMap$value) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> rawMap(java.lang.Object rawMap$key, java.lang.Object rawMap$value) {
       if ((this.rawMap == null))
           this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
       this.rawMap.put(rawMap$key, rawMap$value);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> rawMap(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") BuilderSingletonGuavaMaps<K, V> build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps<K, V> build() {
       com.google.common.collect.ImmutableMap<K, V> battleaxes = ((this.battleaxes == null) ? com.google.common.collect.ImmutableMap.of() : this.battleaxes.build());
       com.google.common.collect.ImmutableSortedMap<Integer, V> vertices = ((this.vertices == null) ? com.google.common.collect.ImmutableSortedMap.of() : this.vertices.build());
       com.google.common.collect.ImmutableBiMap<java.lang.Object, java.lang.Object> rawMap = ((this.rawMap == null) ? com.google.common.collect.ImmutableBiMap.of() : this.rawMap.build());
-      return new BuilderSingletonGuavaMaps<K, V>(battleaxes, vertices, rawMap);
+      return new BuilderSingularGuavaMaps<K, V>(battleaxes, vertices, rawMap);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (((((("BuilderSingletonGuavaMaps.BuilderSingletonGuavaMapsBuilder(battleaxes=" + this.battleaxes) + ", vertices=") + this.vertices) + ", rawMap=") + this.rawMap) + ")");
+      return (((((("BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(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") BuilderSingletonGuavaMaps(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) {
+  @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps(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>BuilderSingletonGuavaMapsBuilder<K, V> builder() {
-    return new BuilderSingletonGuavaMapsBuilder<K, V>();
+  public static @java.lang.SuppressWarnings("all") <K, V>BuilderSingularGuavaMapsBuilder<K, V> builder() {
+    return new BuilderSingularGuavaMapsBuilder<K, V>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingletonLists.java b/test/transform/resource/after-ecj/BuilderSingularLists.java
index 05f6e6e9..c0a3ef9a 100644
--- a/test/transform/resource/after-ecj/BuilderSingletonLists.java
+++ b/test/transform/resource/after-ecj/BuilderSingularLists.java
@@ -2,51 +2,51 @@ import java.util.List;
 import java.util.Collection;
 
 import lombok.Singular;
-@lombok.Builder class BuilderSingletonLists<T> {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingletonListsBuilder<T> {
+@lombok.Builder class BuilderSingularLists<T> {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularListsBuilder<T> {
     private java.util.ArrayList<T> children;
     private java.util.ArrayList<Number> scarves;
     private java.util.ArrayList<java.lang.Object> rawList;
-    @java.lang.SuppressWarnings("all") BuilderSingletonListsBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonListsBuilder<T> child(T child) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> child(T child) {
       if ((this.children == null))
           this.children = new java.util.ArrayList<T>();
       this.children.add(child);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonListsBuilder<T> children(java.util.Collection<? extends T> children) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> children(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") BuilderSingletonListsBuilder<T> scarf(Number scarf) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> scarf(Number scarf) {
       if ((this.scarves == null))
           this.scarves = new java.util.ArrayList<Number>();
       this.scarves.add(scarf);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonListsBuilder<T> scarves(java.util.Collection<? extends Number> scarves) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> scarves(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") BuilderSingletonListsBuilder<T> rawList(java.lang.Object rawList) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> rawList(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") BuilderSingletonListsBuilder<T> rawList(java.util.Collection<?> rawList) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> rawList(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") BuilderSingletonLists<T> build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularLists<T> build() {
       java.util.List<T> children;
       switch (((this.children == null) ? 0 : this.children.size())) {
       case 0 :
@@ -86,22 +86,22 @@ import lombok.Singular;
           rawList.addAll(this.rawList);
           rawList = java.util.Collections.unmodifiableList(rawList);
       }
-      return new BuilderSingletonLists<T>(children, scarves, rawList);
+      return new BuilderSingularLists<T>(children, scarves, rawList);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (((((("BuilderSingletonLists.BuilderSingletonListsBuilder(children=" + this.children) + ", scarves=") + this.scarves) + ", rawList=") + this.rawList) + ")");
+      return (((((("BuilderSingularLists.BuilderSingularListsBuilder(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") BuilderSingletonLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) {
+  @java.lang.SuppressWarnings("all") BuilderSingularLists(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>BuilderSingletonListsBuilder<T> builder() {
-    return new BuilderSingletonListsBuilder<T>();
+  public static @java.lang.SuppressWarnings("all") <T>BuilderSingularListsBuilder<T> builder() {
+    return new BuilderSingularListsBuilder<T>();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderSingletonMaps.java b/test/transform/resource/after-ecj/BuilderSingularMaps.java
index ccd57193..0ce5a0a9 100644
--- a/test/transform/resource/after-ecj/BuilderSingletonMaps.java
+++ b/test/transform/resource/after-ecj/BuilderSingularMaps.java
@@ -1,8 +1,8 @@
 import java.util.Map;
 import java.util.SortedMap;
 import lombok.Singular;
-@lombok.Builder class BuilderSingletonMaps<K, V> {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingletonMapsBuilder<K, V> {
+@lombok.Builder class BuilderSingularMaps<K, V> {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularMapsBuilder<K, V> {
     private java.util.ArrayList<K> women$key;
     private java.util.ArrayList<V> women$value;
     private java.util.ArrayList<K> men$key;
@@ -11,10 +11,10 @@ import lombok.Singular;
     private java.util.ArrayList<java.lang.Object> rawMap$value;
     private java.util.ArrayList<String> stringMap$key;
     private java.util.ArrayList<V> stringMap$value;
-    @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder<K, V> woman(K womanKey, V womanValue) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> woman(K womanKey, 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") BuilderSingletonMapsBuilder<K, V> women(java.util.Map<? extends K, ? extends V> women) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> women(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") BuilderSingletonMapsBuilder<K, V> man(K manKey, Number manValue) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> man(K manKey, Number manValue) {
       if ((this.men$key == null))
           {
             this.men$key = new java.util.ArrayList<K>();
@@ -47,7 +47,7 @@ import lombok.Singular;
       this.men$value.add(manValue);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder<K, V> men(java.util.Map<? extends K, ? extends Number> men) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> men(java.util.Map<? extends K, ? extends Number> men) {
       if ((this.men$key == null))
           {
             this.men$key = new java.util.ArrayList<K>();
@@ -60,7 +60,7 @@ import lombok.Singular;
         }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder<K, V> rawMap(java.lang.Object rawMapKey, java.lang.Object rawMapValue) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> rawMap(java.lang.Object rawMapKey, java.lang.Object rawMapValue) {
       if ((this.rawMap$key == null))
           {
             this.rawMap$key = new java.util.ArrayList<java.lang.Object>();
@@ -70,7 +70,7 @@ import lombok.Singular;
       this.rawMap$value.add(rawMapValue);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) {
       if ((this.rawMap$key == null))
           {
             this.rawMap$key = new java.util.ArrayList<java.lang.Object>();
@@ -83,7 +83,7 @@ import lombok.Singular;
         }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) {
       if ((this.stringMap$key == null))
           {
             this.stringMap$key = new java.util.ArrayList<String>();
@@ -93,7 +93,7 @@ import lombok.Singular;
       this.stringMap$value.add(stringMapValue);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) {
       if ((this.stringMap$key == null))
           {
             this.stringMap$key = new java.util.ArrayList<String>();
@@ -106,7 +106,7 @@ import lombok.Singular;
         }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonMaps<K, V> build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularMaps<K, V> build() {
       java.util.Map<K, V> women;
       switch (((this.women$key == null) ? 0 : this.women$key.size())) {
       case 0 :
@@ -154,24 +154,24 @@ import lombok.Singular;
             stringMap.put(this.stringMap$key.get($i), this.stringMap$value.get($i));
           stringMap = java.util.Collections.unmodifiableMap(stringMap);
       }
-      return new BuilderSingletonMaps<K, V>(women, men, rawMap, stringMap);
+      return new BuilderSingularMaps<K, V>(women, men, rawMap, stringMap);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (((((((((((((((("BuilderSingletonMaps.BuilderSingletonMapsBuilder(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 (((((((((((((((("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) + ")");
     }
   }
   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") BuilderSingletonMaps(final Map<K, V> women, final SortedMap<K, ? extends Number> men, final Map rawMap, final 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) {
     super();
     this.women = women;
     this.men = men;
     this.rawMap = rawMap;
     this.stringMap = stringMap;
   }
-  public static @java.lang.SuppressWarnings("all") <K, V>BuilderSingletonMapsBuilder<K, V> builder() {
-    return new BuilderSingletonMapsBuilder<K, V>();
+  public static @java.lang.SuppressWarnings("all") <K, V>BuilderSingularMapsBuilder<K, V> builder() {
+    return new BuilderSingularMapsBuilder<K, V>();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderSingletonRedirectToGuava.java b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java
index ce8fab10..eeff550b 100644
--- a/test/transform/resource/after-ecj/BuilderSingletonRedirectToGuava.java
+++ b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java
@@ -2,70 +2,70 @@ import java.util.Set;
 import java.util.NavigableMap;
 import java.util.Collection;
 import lombok.Singular;
-@lombok.Builder class BuilderSingletonRedirectToGuava {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingletonRedirectToGuavaBuilder {
+@lombok.Builder class BuilderSingularRedirectToGuava {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularRedirectToGuavaBuilder {
     private com.google.common.collect.ImmutableSet.Builder<String> dangerMice;
     private com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things;
     private com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys;
-    @java.lang.SuppressWarnings("all") BuilderSingletonRedirectToGuavaBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonRedirectToGuavaBuilder dangerMouse(String dangerMouse) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder dangerMouse(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") BuilderSingletonRedirectToGuavaBuilder dangerMice(java.lang.Iterable<? extends String> dangerMice) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder dangerMice(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") BuilderSingletonRedirectToGuavaBuilder thing(Integer thing$key, Number thing$value) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder thing(Integer thing$key, Number thing$value) {
       if ((this.things == null))
           this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder();
       this.things.put(thing$key, thing$value);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonRedirectToGuavaBuilder things(java.util.Map<? extends Integer, ? extends Number> things) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder things(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") BuilderSingletonRedirectToGuavaBuilder doohickey(Class<?> doohickey) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder doohickey(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") BuilderSingletonRedirectToGuavaBuilder doohickeys(java.lang.Iterable<? extends Class<?>> doohickeys) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder doohickeys(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") BuilderSingletonRedirectToGuava build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava build() {
       java.util.Set<String> dangerMice = ((this.dangerMice == null) ? com.google.common.collect.ImmutableSet.of() : this.dangerMice.build());
       java.util.NavigableMap<Integer, Number> things = ((this.things == null) ? com.google.common.collect.ImmutableSortedMap.of() : this.things.build());
       java.util.Collection<Class<?>> doohickeys = ((this.doohickeys == null) ? com.google.common.collect.ImmutableList.of() : this.doohickeys.build());
-      return new BuilderSingletonRedirectToGuava(dangerMice, things, doohickeys);
+      return new BuilderSingularRedirectToGuava(dangerMice, things, doohickeys);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (((((("BuilderSingletonRedirectToGuava.BuilderSingletonRedirectToGuavaBuilder(dangerMice=" + this.dangerMice) + ", things=") + this.things) + ", doohickeys=") + this.doohickeys) + ")");
+      return (((((("BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(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") BuilderSingletonRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) {
+  @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava(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") BuilderSingletonRedirectToGuavaBuilder builder() {
-    return new BuilderSingletonRedirectToGuavaBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder builder() {
+    return new BuilderSingularRedirectToGuavaBuilder();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderSingletonSets.java b/test/transform/resource/after-ecj/BuilderSingularSets.java
index 7b6f6425..5d2fcc59 100644
--- a/test/transform/resource/after-ecj/BuilderSingletonSets.java
+++ b/test/transform/resource/after-ecj/BuilderSingularSets.java
@@ -1,64 +1,64 @@
 import java.util.Set;
 import java.util.SortedSet;
 import lombok.Singular;
-@lombok.Builder class BuilderSingletonSets<T> {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingletonSetsBuilder<T> {
+@lombok.Builder class BuilderSingularSets<T> {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularSetsBuilder<T> {
     private java.util.ArrayList<T> dangerMice;
     private java.util.ArrayList<Number> octopodes;
     private java.util.ArrayList<java.lang.Object> rawSet;
     private java.util.ArrayList<String> stringSet;
-    @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder<T> dangerMouse(T dangerMouse) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> dangerMouse(T dangerMouse) {
       if ((this.dangerMice == null))
           this.dangerMice = new java.util.ArrayList<T>();
       this.dangerMice.add(dangerMouse);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder<T> dangerMice(java.util.Collection<? extends T> dangerMice) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> dangerMice(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") BuilderSingletonSetsBuilder<T> octopus(Number octopus) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> octopus(Number octopus) {
       if ((this.octopodes == null))
           this.octopodes = new java.util.ArrayList<Number>();
       this.octopodes.add(octopus);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder<T> octopodes(java.util.Collection<? extends Number> octopodes) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> octopodes(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") BuilderSingletonSetsBuilder<T> rawSet(java.lang.Object rawSet) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> rawSet(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") BuilderSingletonSetsBuilder<T> rawSet(java.util.Collection<?> rawSet) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> rawSet(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") BuilderSingletonSetsBuilder<T> stringSet(String stringSet) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> stringSet(String stringSet) {
       if ((this.stringSet == null))
           this.stringSet = new java.util.ArrayList<String>();
       this.stringSet.add(stringSet);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder<T> stringSet(java.util.Collection<? extends String> stringSet) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> stringSet(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") BuilderSingletonSets<T> build() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularSets<T> build() {
       java.util.Set<T> dangerMice;
       switch (((this.dangerMice == null) ? 0 : this.dangerMice.size())) {
       case 0 :
@@ -102,24 +102,24 @@ import lombok.Singular;
           stringSet.addAll(this.stringSet);
           stringSet = java.util.Collections.unmodifiableSet(stringSet);
       }
-      return new BuilderSingletonSets<T>(dangerMice, octopodes, rawSet, stringSet);
+      return new BuilderSingularSets<T>(dangerMice, octopodes, rawSet, stringSet);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (((((((("BuilderSingletonSets.BuilderSingletonSetsBuilder(dangerMice=" + this.dangerMice) + ", octopodes=") + this.octopodes) + ", rawSet=") + this.rawSet) + ", stringSet=") + this.stringSet) + ")");
+      return (((((((("BuilderSingularSets.BuilderSingularSetsBuilder(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") BuilderSingletonSets(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) {
+  @java.lang.SuppressWarnings("all") BuilderSingularSets(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>BuilderSingletonSetsBuilder<T> builder() {
-    return new BuilderSingletonSetsBuilder<T>();
+  public static @java.lang.SuppressWarnings("all") <T>BuilderSingularSetsBuilder<T> builder() {
+    return new BuilderSingularSetsBuilder<T>();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/BuilderSingletonGuavaListsSets.java b/test/transform/resource/before/BuilderSingularGuavaListsSets.java
index e94d84b6..995c00e8 100644
--- a/test/transform/resource/before/BuilderSingletonGuavaListsSets.java
+++ b/test/transform/resource/before/BuilderSingularGuavaListsSets.java
@@ -6,7 +6,7 @@ import com.google.common.collect.ImmutableSortedSet;
 import lombok.Singular;
 
 @lombok.Builder
-class BuilderSingletonGuavaListsSets<T> {
+class BuilderSingularGuavaListsSets<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/BuilderSingletonGuavaMaps.java b/test/transform/resource/before/BuilderSingularGuavaMaps.java
index 1ff00c5b..64a53570 100644
--- a/test/transform/resource/before/BuilderSingletonGuavaMaps.java
+++ b/test/transform/resource/before/BuilderSingularGuavaMaps.java
@@ -5,7 +5,7 @@ import com.google.common.collect.ImmutableSortedMap;
 import lombok.Singular;
 
 @lombok.Builder
-class BuilderSingletonGuavaMaps<K, V> {
+class BuilderSingularGuavaMaps<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/BuilderSingletonLists.java b/test/transform/resource/before/BuilderSingularLists.java
index ed57a5a8..93fced8e 100644
--- a/test/transform/resource/before/BuilderSingletonLists.java
+++ b/test/transform/resource/before/BuilderSingularLists.java
@@ -4,7 +4,7 @@ import java.util.Collection;
 import lombok.Singular;
 
 @lombok.Builder
-class BuilderSingletonLists<T> {
+class BuilderSingularLists<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/BuilderSingletonMaps.java b/test/transform/resource/before/BuilderSingularMaps.java
index 92750c0a..e17f74fc 100644
--- a/test/transform/resource/before/BuilderSingletonMaps.java
+++ b/test/transform/resource/before/BuilderSingularMaps.java
@@ -4,7 +4,7 @@ import java.util.SortedMap;
 import lombok.Singular;
 
 @lombok.Builder
-class BuilderSingletonMaps<K, V> {
+class BuilderSingularMaps<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/BuilderSingletonRedirectToGuava.java b/test/transform/resource/before/BuilderSingularRedirectToGuava.java
index 0429f0ed..7e1e2c23 100644
--- a/test/transform/resource/before/BuilderSingletonRedirectToGuava.java
+++ b/test/transform/resource/before/BuilderSingularRedirectToGuava.java
@@ -6,7 +6,7 @@ import java.util.Collection;
 import lombok.Singular;
 
 @lombok.Builder
-class BuilderSingletonRedirectToGuava {
+class BuilderSingularRedirectToGuava {
 	@Singular private Set<String> dangerMice;
 	@Singular private NavigableMap<Integer, Number> things;
 	@Singular private Collection<Class<?>> doohickeys;
diff --git a/test/transform/resource/before/BuilderSingletonSets.java b/test/transform/resource/before/BuilderSingularSets.java
index 42cac0dc..68c4510a 100644
--- a/test/transform/resource/before/BuilderSingletonSets.java
+++ b/test/transform/resource/before/BuilderSingularSets.java
@@ -4,7 +4,7 @@ import java.util.SortedSet;
 import lombok.Singular;
 
 @lombok.Builder
-class BuilderSingletonSets<T> {
+class BuilderSingularSets<T> {
 	@Singular private Set<T> dangerMice;
 	@Singular private SortedSet<? extends Number> octopodes;
 	@SuppressWarnings("all") @Singular("rawSet") private Set rawSet;