diff --git a/src/main/java/lsh/ext/gson/ITypeAdapterFactory.java b/src/main/java/lsh/ext/gson/ITypeAdapterFactory.java
index f4f03446..6d910569 100644
--- a/src/main/java/lsh/ext/gson/ITypeAdapterFactory.java
+++ b/src/main/java/lsh/ext/gson/ITypeAdapterFactory.java
@@ -17,7 +17,7 @@ public interface ITypeAdapterFactory<K>
 	@Nullable
 	<T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken);
 
-	interface ITypeResolver<K> {
+	interface IProvider<K> {
 
 		TypeToken<K> getTypeToken();
 
@@ -30,7 +30,7 @@ interface ITypeResolver<K> {
 	}
 
 	@SuppressWarnings("NewClassNamingConvention")
-	static <K extends RAW_K, RAW_K> ITypeAdapterFactory<K> forClass(final Class<RAW_K> klass, final Function<? super ITypeResolver<K>, ? extends TypeAdapter<K>> createTypeAdapter) {
+	static <K extends RAW_K, RAW_K> ITypeAdapterFactory<K> forClass(final Class<RAW_K> klass, final Function<? super IProvider<K>, ? extends TypeAdapter<K>> createTypeAdapter) {
 		return new ITypeAdapterFactory<>() {
 			@Nullable
 			@Override
@@ -40,7 +40,7 @@ public <T> TypeAdapter<T> create(final Gson gson, final TypeToken<T> typeToken)
 				}
 				@SuppressWarnings("unchecked")
 				final TypeToken<K> castTypeToken = (TypeToken<K>) typeToken;
-				final ITypeResolver<K> typeResolver = new ITypeResolver<K>() {
+				final IProvider<K> provider = new IProvider<>() {
 					private final Type type = castTypeToken.getType();
 
 					@Override
@@ -67,14 +67,14 @@ public <T> TypeAdapter<T> getTypeAdapterForClass(final Class<T> klass) {
 					}
 				};
 				@SuppressWarnings("unchecked")
-				final TypeAdapter<T> castTypeAdapter = (TypeAdapter<T>) createTypeAdapter.apply(typeResolver);
+				final TypeAdapter<T> castTypeAdapter = (TypeAdapter<T>) createTypeAdapter.apply(provider);
 				return castTypeAdapter;
 			}
 		};
 	}
 
 	@SuppressWarnings("NewClassNamingConvention")
-	static <K extends RAW_K, RAW_K> ITypeAdapterFactory<K> forClassHierarchy(final Class<? extends RAW_K> klass, final Function<? super ITypeResolver<K>, ? extends TypeAdapter<K>> createTypeAdapter) {
+	static <K extends RAW_K, RAW_K> ITypeAdapterFactory<K> forClassHierarchy(final Class<? extends RAW_K> klass, final Function<? super IProvider<K>, ? extends TypeAdapter<K>> createTypeAdapter) {
 		return new ITypeAdapterFactory<>() {
 			@Nullable
 			@Override
@@ -84,7 +84,7 @@ public <T> TypeAdapter<T> create(final Gson gson, final TypeToken<T> typeToken)
 				}
 				@SuppressWarnings("unchecked")
 				final TypeToken<K> castTypeToken = (TypeToken<K>) typeToken;
-				final ITypeResolver<K> typeResolver = new ITypeResolver<K>() {
+				final IProvider<K> provider = new IProvider<>() {
 					private final Type type = castTypeToken.getType();
 
 					@Override
@@ -111,7 +111,7 @@ public <T> TypeAdapter<T> getTypeAdapterForClass(final Class<T> klass) {
 					}
 				};
 				@SuppressWarnings("unchecked")
-				final TypeAdapter<T> castTypeAdapter = (TypeAdapter<T>) createTypeAdapter.apply(typeResolver);
+				final TypeAdapter<T> castTypeAdapter = (TypeAdapter<T>) createTypeAdapter.apply(provider);
 				return castTypeAdapter;
 			}
 		};
diff --git a/src/main/java/lsh/ext/gson/domain/encoded/EncodingTypeAdapterFactory.java b/src/main/java/lsh/ext/gson/domain/encoded/EncodingTypeAdapterFactory.java
index f53f583a..c02d5646 100644
--- a/src/main/java/lsh/ext/gson/domain/encoded/EncodingTypeAdapterFactory.java
+++ b/src/main/java/lsh/ext/gson/domain/encoded/EncodingTypeAdapterFactory.java
@@ -12,11 +12,11 @@ public final class EncodingTypeAdapterFactory {
 	public static ITypeAdapterFactory<byte[]> urlForPrimitiveByteArray = forPrimitiveByteArray(EncodingTypeAdapter.urlForPrimitiveByteArray);
 
 	public static ITypeAdapterFactory<byte[]> forPrimitiveByteArray(final TypeAdapter<byte[]> typeAdapter) {
-		return ITypeAdapterFactory.forClass(byte[].class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(byte[].class, provider -> typeAdapter);
 	}
 
 	public static ITypeAdapterFactory<char[]> forPrimitiveCharArray(final TypeAdapter<char[]> typeAdapter) {
-		return ITypeAdapterFactory.forClass(char[].class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(char[].class, provider -> typeAdapter);
 	}
 
 }
diff --git a/src/main/java/lsh/ext/gson/domain/unix/UnixTimeTypeAdapterFactory.java b/src/main/java/lsh/ext/gson/domain/unix/UnixTimeTypeAdapterFactory.java
index f643eb65..7032f597 100644
--- a/src/main/java/lsh/ext/gson/domain/unix/UnixTimeTypeAdapterFactory.java
+++ b/src/main/java/lsh/ext/gson/domain/unix/UnixTimeTypeAdapterFactory.java
@@ -15,12 +15,12 @@ public final class UnixTimeTypeAdapterFactory {
 
 	@SuppressWarnings("UseOfObsoleteDateTimeApi")
 	public static ITypeAdapterFactory<java.util.Date> forJavaUtilDate(final TypeAdapter<java.util.Date> typeAdapter) {
-		return ITypeAdapterFactory.forClass(java.util.Date.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(java.util.Date.class, provider -> typeAdapter);
 	}
 	public static final ITypeAdapterFactory<java.sql.Date> defaultForJavaSqlDate = forJavaSqlDate(UnixTimeTypeAdapter.defaultForJavaSqlDate);
 
 	public static ITypeAdapterFactory<java.sql.Date> forJavaSqlDate(final TypeAdapter<java.sql.Date> typeAdapter) {
-		return ITypeAdapterFactory.forClass(java.sql.Date.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(java.sql.Date.class, provider -> typeAdapter);
 	}
 
 	@SuppressWarnings("UnnecessaryFullyQualifiedName")
@@ -28,7 +28,7 @@ public static ITypeAdapterFactory<java.sql.Date> forJavaSqlDate(final TypeAdapte
 
 	@SuppressWarnings("UnnecessaryFullyQualifiedName")
 	public static ITypeAdapterFactory<java.sql.Time> forJavaSqlTime(final TypeAdapter<java.sql.Time> typeAdapter) {
-		return ITypeAdapterFactory.forClass(java.sql.Time.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(java.sql.Time.class, provider -> typeAdapter);
 	}
 
 	@SuppressWarnings("UnnecessaryFullyQualifiedName")
@@ -36,19 +36,19 @@ public static ITypeAdapterFactory<java.sql.Time> forJavaSqlTime(final TypeAdapte
 
 	@SuppressWarnings("UnnecessaryFullyQualifiedName")
 	public static ITypeAdapterFactory<java.sql.Timestamp> forJavaSqlTimestamp(final TypeAdapter<java.sql.Timestamp> typeAdapter) {
-		return ITypeAdapterFactory.forClass(java.sql.Timestamp.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(java.sql.Timestamp.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<Instant> defaultForJavaTimeInstant = forJavaTimeInstant(UnixTimeTypeAdapter.forJavaTimeInstant);
 
 	public static ITypeAdapterFactory<Instant> forJavaTimeInstant(final TypeAdapter<Instant> typeAdapter) {
-		return ITypeAdapterFactory.forClass(Instant.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(Instant.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<OffsetDateTime> defaultForOffsetDateTime = forJavaTimeOffsetDateTime(UnixTimeTypeAdapter.forJavaTimeOffsetDateTime);
 
 	public static ITypeAdapterFactory<OffsetDateTime> forJavaTimeOffsetDateTime(final TypeAdapter<OffsetDateTime> typeAdapter) {
-		return ITypeAdapterFactory.forClass(OffsetDateTime.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(OffsetDateTime.class, provider -> typeAdapter);
 	}
 
 }
diff --git a/src/main/java/lsh/ext/gson/ext/com/google/common/base/OptionalTypeAdapterFactory.java b/src/main/java/lsh/ext/gson/ext/com/google/common/base/OptionalTypeAdapterFactory.java
index 6c8c5ce4..c9e46f2b 100644
--- a/src/main/java/lsh/ext/gson/ext/com/google/common/base/OptionalTypeAdapterFactory.java
+++ b/src/main/java/lsh/ext/gson/ext/com/google/common/base/OptionalTypeAdapterFactory.java
@@ -7,6 +7,6 @@
 @UtilityClass
 public final class OptionalTypeAdapterFactory {
 
-	public static ITypeAdapterFactory<Optional<Object>> defaultForOptional = ITypeAdapterFactory.forClassHierarchy(Optional.class, typeResolver -> OptionalTypeAdapter.getInstance(typeResolver.getTypeAdapter(0)));
+	public static ITypeAdapterFactory<Optional<Object>> defaultForOptional = ITypeAdapterFactory.forClassHierarchy(Optional.class, provider -> OptionalTypeAdapter.getInstance(provider.getTypeAdapter(0)));
 
 }
diff --git a/src/main/java/lsh/ext/gson/ext/com/google/common/cache/GuavaCacheTypeAdapterFactory.java b/src/main/java/lsh/ext/gson/ext/com/google/common/cache/GuavaCacheTypeAdapterFactory.java
index 9b7fb812..5f86edfc 100644
--- a/src/main/java/lsh/ext/gson/ext/com/google/common/cache/GuavaCacheTypeAdapterFactory.java
+++ b/src/main/java/lsh/ext/gson/ext/com/google/common/cache/GuavaCacheTypeAdapterFactory.java
@@ -32,8 +32,8 @@ public static <K, V, C extends Cache<K, V>> ITypeAdapterFactory<C> forCache(
 	) {
 		return ITypeAdapterFactory.forClassHierarchy(
 				klass,
-				typeResolver -> GuavaCacheTypeAdapter.forCache(
-						typeResolver.getTypeAdapter(1),
+				provider -> GuavaCacheTypeAdapter.forCache(
+						provider.getTypeAdapter(1),
 						toName,
 						fromName,
 						getCache
diff --git a/src/main/java/lsh/ext/gson/ext/com/google/common/collect/GuavaCollectTypeAdapterFactory.java b/src/main/java/lsh/ext/gson/ext/com/google/common/collect/GuavaCollectTypeAdapterFactory.java
index 7d090530..23514435 100644
--- a/src/main/java/lsh/ext/gson/ext/com/google/common/collect/GuavaCollectTypeAdapterFactory.java
+++ b/src/main/java/lsh/ext/gson/ext/com/google/common/collect/GuavaCollectTypeAdapterFactory.java
@@ -40,9 +40,9 @@ public static <K, V> ITypeAdapterFactory<BiMap<K, V>> forBiMap(
 			final Function<? super K, String> encodeKey,
 			final Function<? super String, ? extends K> decodeKey
 	) {
-		return ITypeAdapterFactory.forClassHierarchy(BiMap.class, typeResolver -> GuavaCollectTypeAdapter.forBiMap(
-				typeResolver.getTypeAdapter(1),
-				lookup.lookup(typeResolver.getTypeToken()),
+		return ITypeAdapterFactory.forClassHierarchy(BiMap.class, provider -> GuavaCollectTypeAdapter.forBiMap(
+				provider.getTypeAdapter(1),
+				lookup.lookup(provider.getTypeToken()),
 				encodeKey,
 				decodeKey
 		));
@@ -74,9 +74,9 @@ public static <K, V> ITypeAdapterFactory<Multimap<K, V>> forMultimap(
 			final Function<? super K, String> encodeKey,
 			final Function<? super String, ? extends K> decodeKey
 	) {
-		return ITypeAdapterFactory.forClassHierarchy(Multimap.class, typeResolver -> GuavaCollectTypeAdapter.forMultimap(
-				typeResolver.getTypeAdapter(1),
-				lookup.lookup(typeResolver.getTypeToken()),
+		return ITypeAdapterFactory.forClassHierarchy(Multimap.class, provider -> GuavaCollectTypeAdapter.forMultimap(
+				provider.getTypeAdapter(1),
+				lookup.lookup(provider.getTypeToken()),
 				encodeKey,
 				decodeKey
 		));
@@ -103,9 +103,9 @@ public static <K, V> Supplier<IBuilder2<K, V, Multimap<K, V>>> defaultBuilderFac
 	public static <E> ITypeAdapterFactory<Multiset<E>> forMultiset(
 			final IBuilder1.ILookup<? super E, ? extends Multiset<E>> lookup
 	) {
-		return ITypeAdapterFactory.forClassHierarchy(Multiset.class, typeResolver -> GuavaCollectTypeAdapter.forMultiset(
-				typeResolver.getTypeAdapter(0),
-				lookup.lookup(typeResolver.getTypeToken())
+		return ITypeAdapterFactory.forClassHierarchy(Multiset.class, provider -> GuavaCollectTypeAdapter.forMultiset(
+				provider.getTypeAdapter(0),
+				lookup.lookup(provider.getTypeToken())
 		));
 	}
 
@@ -134,9 +134,9 @@ public static <R, C, V> ITypeAdapterFactory<Table<R, C, V>> forTable(
 			final Function<? super C, String> encodeColumnKey,
 			final Function<? super String, ? extends C> decodeColumnKey
 	) {
-		return ITypeAdapterFactory.forClassHierarchy(Table.class, typeResolver -> TableTypeAdapter.getInstance(
-				typeResolver.getTypeAdapter(0),
-				builderLookup.lookup(typeResolver.getTypeToken()),
+		return ITypeAdapterFactory.forClassHierarchy(Table.class, provider -> TableTypeAdapter.getInstance(
+				provider.getTypeAdapter(0),
+				builderLookup.lookup(provider.getTypeToken()),
 				encodeRowKey,
 				decodeRowKey,
 				encodeColumnKey,
diff --git a/src/main/java/lsh/ext/gson/ext/com/google/common/primitives/GuavaPrimitivesTypeAdapterFactory.java b/src/main/java/lsh/ext/gson/ext/com/google/common/primitives/GuavaPrimitivesTypeAdapterFactory.java
index 410f5613..8d705cd1 100644
--- a/src/main/java/lsh/ext/gson/ext/com/google/common/primitives/GuavaPrimitivesTypeAdapterFactory.java
+++ b/src/main/java/lsh/ext/gson/ext/com/google/common/primitives/GuavaPrimitivesTypeAdapterFactory.java
@@ -13,19 +13,19 @@ public final class GuavaPrimitivesTypeAdapterFactory {
 	public static final ITypeAdapterFactory<ImmutableDoubleArray> defaultForImmutableDoubleArray = forImmutableDoubleArray(ImmutableDoubleArrayTypeAdapter.getInstance());
 
 	public static ITypeAdapterFactory<ImmutableDoubleArray> forImmutableDoubleArray(final TypeAdapter<ImmutableDoubleArray> typeAdapter) {
-		return ITypeAdapterFactory.forClassHierarchy(ImmutableDoubleArray.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClassHierarchy(ImmutableDoubleArray.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<ImmutableIntArray> defaultForImmutableIntegerArray = forImmutableIntArray(ImmutableIntArrayTypeAdapter.getInstance());
 
 	public static ITypeAdapterFactory<ImmutableIntArray> forImmutableIntArray(final TypeAdapter<ImmutableIntArray> typeAdapter) {
-		return ITypeAdapterFactory.forClassHierarchy(ImmutableIntArray.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClassHierarchy(ImmutableIntArray.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<ImmutableLongArray> defaultForImmutableLongArray = forImmutableLongArray(ImmutableLongArrayTypeAdapter.getInstance());
 
 	public static ITypeAdapterFactory<ImmutableLongArray> forImmutableLongArray(final TypeAdapter<ImmutableLongArray> typeAdapter) {
-		return ITypeAdapterFactory.forClassHierarchy(ImmutableLongArray.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClassHierarchy(ImmutableLongArray.class, provider -> typeAdapter);
 	}
 
 }
diff --git a/src/main/java/lsh/ext/gson/ext/jakarta/json/JakartaJsonTypeAdapterFactory.java b/src/main/java/lsh/ext/gson/ext/jakarta/json/JakartaJsonTypeAdapterFactory.java
index f5d19bea..30172757 100644
--- a/src/main/java/lsh/ext/gson/ext/jakarta/json/JakartaJsonTypeAdapterFactory.java
+++ b/src/main/java/lsh/ext/gson/ext/jakarta/json/JakartaJsonTypeAdapterFactory.java
@@ -12,7 +12,7 @@ public final class JakartaJsonTypeAdapterFactory {
 	public static ITypeAdapterFactory<JsonValue> defaultForJsonValue = forJsonValue(JakartaJsonValueTypeAdapter.getInstance(JsonProvider.provider()));
 
 	public static ITypeAdapterFactory<JsonValue> forJsonValue(final TypeAdapter<JsonValue> typeAdapter) {
-		return ITypeAdapterFactory.forClassHierarchy(JsonValue.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClassHierarchy(JsonValue.class, provider -> typeAdapter);
 	}
 
 }
diff --git a/src/main/java/lsh/ext/gson/ext/java/time/Java8TimeTypeAdapterFactory.java b/src/main/java/lsh/ext/gson/ext/java/time/Java8TimeTypeAdapterFactory.java
index f79d735f..206e8e15 100644
--- a/src/main/java/lsh/ext/gson/ext/java/time/Java8TimeTypeAdapterFactory.java
+++ b/src/main/java/lsh/ext/gson/ext/java/time/Java8TimeTypeAdapterFactory.java
@@ -25,85 +25,85 @@ public final class Java8TimeTypeAdapterFactory {
 	public static final ITypeAdapterFactory<DayOfWeek> defaultForDayOfWeek = forDayOfWeek(Java8TimeTypeAdapter.defaultForDayOfWeek);
 
 	public static ITypeAdapterFactory<DayOfWeek> forDayOfWeek(final TypeAdapter<DayOfWeek> typeAdapter) {
-		return ITypeAdapterFactory.forClass(DayOfWeek.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(DayOfWeek.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<Duration> defaultForDuration = forDuration(Java8TimeTypeAdapter.defaultForDuration);
 
 	public static ITypeAdapterFactory<Duration> forDuration(final TypeAdapter<Duration> typeAdapter) {
-		return ITypeAdapterFactory.forClass(Duration.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(Duration.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<Instant> defaultForInstant = forInstant(Java8TimeTypeAdapter.defaultForInstant);
 
 	public static ITypeAdapterFactory<Instant> forInstant(final TypeAdapter<Instant> typeAdapter) {
-		return ITypeAdapterFactory.forClass(Instant.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(Instant.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<LocalDateTime> defaultForLocalDateTime = forLocalDateTime(Java8TimeTypeAdapter.defaultForLocalDateTime);
 
 	public static ITypeAdapterFactory<LocalDateTime> forLocalDateTime(final TypeAdapter<LocalDateTime> typeAdapter) {
-		return ITypeAdapterFactory.forClass(LocalDateTime.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(LocalDateTime.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<LocalDate> defaultForLocalDate = forLocalDate(Java8TimeTypeAdapter.defaultForLocalDate);
 
 	public static ITypeAdapterFactory<LocalDate> forLocalDate(final TypeAdapter<LocalDate> typeAdapter) {
-		return ITypeAdapterFactory.forClass(LocalDate.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(LocalDate.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<LocalTime> defaultForLocalTime = forLocalTime(Java8TimeTypeAdapter.defaultForLocalTime);
 
 	public static ITypeAdapterFactory<LocalTime> forLocalTime(final TypeAdapter<LocalTime> typeAdapter) {
-		return ITypeAdapterFactory.forClass(LocalTime.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(LocalTime.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<MonthDay> defaultForMonthDay = forMonthDay(Java8TimeTypeAdapter.defaulFortMonthDay);
 
 	public static ITypeAdapterFactory<MonthDay> forMonthDay(final TypeAdapter<MonthDay> typeAdapter) {
-		return ITypeAdapterFactory.forClass(MonthDay.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(MonthDay.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<Month> defaultForMonth = forMonth(Java8TimeTypeAdapter.defaultForMonth);
 
 	public static ITypeAdapterFactory<Month> forMonth(final TypeAdapter<Month> typeAdapter) {
-		return ITypeAdapterFactory.forClass(Month.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(Month.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<OffsetDateTime> defaultForOffsetDateTime = forOffsetDateTime(Java8TimeTypeAdapter.defaultForOffsetDateTime);
 
 	public static ITypeAdapterFactory<OffsetDateTime> forOffsetDateTime(final TypeAdapter<OffsetDateTime> typeAdapter) {
-		return ITypeAdapterFactory.forClass(OffsetDateTime.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(OffsetDateTime.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<OffsetTime> defaultForOffsetTime = forOffsetTime(Java8TimeTypeAdapter.defaultForOffsetTime);
 
 	public static ITypeAdapterFactory<OffsetTime> forOffsetTime(final TypeAdapter<OffsetTime> typeAdapter) {
-		return ITypeAdapterFactory.forClass(OffsetTime.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(OffsetTime.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<Period> defaultForPeriod = forPeriod(Java8TimeTypeAdapter.defaultForPeriod);
 
 	public static ITypeAdapterFactory<Period> forPeriod(final TypeAdapter<Period> typeAdapter) {
-		return ITypeAdapterFactory.forClass(Period.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(Period.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<YearMonth> defaultForYearMonth = forYearMonth(Java8TimeTypeAdapter.defaultForYearMonth);
 
 	public static ITypeAdapterFactory<YearMonth> forYearMonth(final TypeAdapter<YearMonth> typeAdapter) {
-		return ITypeAdapterFactory.forClass(YearMonth.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(YearMonth.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<Year> defaultForYear = forYear(Java8TimeTypeAdapter.defaultForYear);
 
 	public static ITypeAdapterFactory<Year> forYear(final TypeAdapter<Year> typeAdapter) {
-		return ITypeAdapterFactory.forClass(Year.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(Year.class, provider -> typeAdapter);
 	}
 
 	public static final ITypeAdapterFactory<ZonedDateTime> defaultForZonedDateTime = forZonedDateTime(Java8TimeTypeAdapter.defaultForZonedDateTime);
 
 	public static ITypeAdapterFactory<ZonedDateTime> forZonedDateTime(final TypeAdapter<ZonedDateTime> typeAdapter) {
-		return ITypeAdapterFactory.forClass(ZonedDateTime.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(ZonedDateTime.class, provider -> typeAdapter);
 	}
 
 }
diff --git a/src/main/java/lsh/ext/gson/ext/java/util/OptionalTypeAdapterFactory.java b/src/main/java/lsh/ext/gson/ext/java/util/OptionalTypeAdapterFactory.java
index fef7159f..7560f52d 100644
--- a/src/main/java/lsh/ext/gson/ext/java/util/OptionalTypeAdapterFactory.java
+++ b/src/main/java/lsh/ext/gson/ext/java/util/OptionalTypeAdapterFactory.java
@@ -16,32 +16,32 @@ public final class OptionalTypeAdapterFactory {
 	public static ITypeAdapterFactory<Optional<Object>> defaultForOptional = forOptional();
 
 	public static <T> ITypeAdapterFactory<Optional<T>> forOptional() {
-		return ITypeAdapterFactory.forClass(Optional.class, typeResolver -> OptionalTypeAdapter.getInstance(typeResolver.getTypeAdapter(0)));
+		return ITypeAdapterFactory.forClass(Optional.class, provider -> OptionalTypeAdapter.getInstance(provider.getTypeAdapter(0)));
 	}
 
 	public static <T> ITypeAdapterFactory<Optional<T>> forOptional(final TypeAdapter<Optional<T>> typeAdapter) {
-		return ITypeAdapterFactory.forClass(Optional.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(Optional.class, provider -> typeAdapter);
 	}
 
 	@Getter
 	private static final ITypeAdapterFactory<OptionalDouble> defaultForOptionalDouble = forOptionalDouble(OptionalDoubleTypeAdapter.getInstance());
 
 	public static ITypeAdapterFactory<OptionalDouble> forOptionalDouble(final TypeAdapter<OptionalDouble> typeAdapter) {
-		return ITypeAdapterFactory.forClass(OptionalDouble.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(OptionalDouble.class, provider -> typeAdapter);
 	}
 
 	@Getter
 	private static final ITypeAdapterFactory<OptionalInt> defaultForOptionalInt = forOptionalInt(OptionalIntTypeAdapter.getInstance());
 
 	public static ITypeAdapterFactory<OptionalInt> forOptionalInt(final TypeAdapter<OptionalInt> typeAdapter) {
-		return ITypeAdapterFactory.forClass(OptionalInt.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(OptionalInt.class, provider -> typeAdapter);
 	}
 
 	@Getter
 	private static final ITypeAdapterFactory<OptionalLong> defaultForOptionalLong = forOptionalLong(OptionalLongTypeAdapter.getInstance());
 
 	public static ITypeAdapterFactory<OptionalLong> forOptionalLong(final TypeAdapter<OptionalLong> typeAdapter) {
-		return ITypeAdapterFactory.forClass(OptionalLong.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(OptionalLong.class, provider -> typeAdapter);
 	}
 
 }
diff --git a/src/main/java/lsh/ext/gson/ext/java/util/UtilTypeAdapterFactory.java b/src/main/java/lsh/ext/gson/ext/java/util/UtilTypeAdapterFactory.java
index 4a01add1..408e6522 100644
--- a/src/main/java/lsh/ext/gson/ext/java/util/UtilTypeAdapterFactory.java
+++ b/src/main/java/lsh/ext/gson/ext/java/util/UtilTypeAdapterFactory.java
@@ -18,17 +18,17 @@
 public final class UtilTypeAdapterFactory {
 
 	public static <E> ITypeAdapterFactory<Iterator<E>> forIterator(final boolean useBeginEnd) {
-		return ITypeAdapterFactory.forClassHierarchy(Iterator.class, typeResolver -> UtilTypeAdapter.forIterator(typeResolver.getTypeAdapter(0), useBeginEnd));
+		return ITypeAdapterFactory.forClassHierarchy(Iterator.class, provider -> UtilTypeAdapter.forIterator(provider.getTypeAdapter(0), useBeginEnd));
 	}
 
 	public static <E> ITypeAdapterFactory<Enumeration<E>> forEnumeration(final boolean useBeginEnd) {
-		return ITypeAdapterFactory.forClassHierarchy(Enumeration.class, typeResolver -> UtilTypeAdapter.forEnumeration(typeResolver.getTypeAdapter(0), useBeginEnd));
+		return ITypeAdapterFactory.forClassHierarchy(Enumeration.class, provider -> UtilTypeAdapter.forEnumeration(provider.getTypeAdapter(0), useBeginEnd));
 	}
 
 	public static ITypeAdapterFactory<Collection<Object>> defaultForCoercedCollection = forCoercedCollection(UtilTypeAdapterFactory::defaultBuilderFactoryForCoercedCollection);
 
 	public static <E> ITypeAdapterFactory<Collection<E>> forCoercedCollection(final IBuilder1.ILookup<? super E, ? extends Collection<E>> builderLookup) {
-		return ITypeAdapterFactory.forClassHierarchy(Collection.class, typeResolver -> CoercedCollectionTypeAdapter.getInstance(typeResolver.getTypeAdapter(0), builderLookup.lookup(typeResolver.getTypeToken())));
+		return ITypeAdapterFactory.forClassHierarchy(Collection.class, provider -> CoercedCollectionTypeAdapter.getInstance(provider.getTypeAdapter(0), builderLookup.lookup(provider.getTypeToken())));
 	}
 
 	public static <E> Supplier<IBuilder1<E, Collection<E>>> defaultBuilderFactoryForCoercedCollection(final TypeToken<? super Collection<E>> typeToken) {
diff --git a/src/main/java/lsh/ext/gson/ext/java/util/regex/RegexTypeAdapterFactory.java b/src/main/java/lsh/ext/gson/ext/java/util/regex/RegexTypeAdapterFactory.java
index d2cb4689..f4a9ee60 100644
--- a/src/main/java/lsh/ext/gson/ext/java/util/regex/RegexTypeAdapterFactory.java
+++ b/src/main/java/lsh/ext/gson/ext/java/util/regex/RegexTypeAdapterFactory.java
@@ -14,7 +14,7 @@ public final class RegexTypeAdapterFactory {
 	public static ITypeAdapterFactory<Pattern> simpleForPattern = forPattern(RegexTypeAdapter.simpleForPattern);
 
 	public static ITypeAdapterFactory<Pattern> forPattern(final TypeAdapter<Pattern> typeAdapter) {
-		return ITypeAdapterFactory.forClass(Pattern.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClass(Pattern.class, provider -> typeAdapter);
 	}
 
 }
diff --git a/src/main/java/lsh/ext/gson/ext/java/util/stream/StreamTypeAdapterFactory.java b/src/main/java/lsh/ext/gson/ext/java/util/stream/StreamTypeAdapterFactory.java
index df349914..ff403dda 100644
--- a/src/main/java/lsh/ext/gson/ext/java/util/stream/StreamTypeAdapterFactory.java
+++ b/src/main/java/lsh/ext/gson/ext/java/util/stream/StreamTypeAdapterFactory.java
@@ -13,25 +13,25 @@
 public final class StreamTypeAdapterFactory {
 
 	public static <E> ITypeAdapterFactory<Stream<E>> forStream(final boolean useBeginEnd, final boolean autoClose) {
-		return ITypeAdapterFactory.forClassHierarchy(Stream.class, typeResolver -> StreamTypeAdapter.forStream(typeResolver.getTypeAdapter(0), useBeginEnd, autoClose));
+		return ITypeAdapterFactory.forClassHierarchy(Stream.class, provider -> StreamTypeAdapter.forStream(provider.getTypeAdapter(0), useBeginEnd, autoClose));
 	}
 
 	public static ITypeAdapterFactory<DoubleStream> defaultForDoubleStream = forDoubleStream(StreamTypeAdapter.forDoubleStream);
 
 	public static ITypeAdapterFactory<DoubleStream> forDoubleStream(final TypeAdapter<DoubleStream> typeAdapter) {
-		return ITypeAdapterFactory.forClassHierarchy(DoubleStream.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClassHierarchy(DoubleStream.class, provider -> typeAdapter);
 	}
 
 	public static ITypeAdapterFactory<IntStream> defaultForIntStream = forIntStream(StreamTypeAdapter.forIntStream);
 
 	public static ITypeAdapterFactory<IntStream> forIntStream(final TypeAdapter<IntStream> typeAdapter) {
-		return ITypeAdapterFactory.forClassHierarchy(IntStream.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClassHierarchy(IntStream.class, provider -> typeAdapter);
 	}
 
 	public static ITypeAdapterFactory<LongStream> defaultForLongStream = forLongStream(StreamTypeAdapter.forLongStream);
 
 	public static ITypeAdapterFactory<LongStream> forLongStream(final TypeAdapter<LongStream> typeAdapter) {
-		return ITypeAdapterFactory.forClassHierarchy(LongStream.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClassHierarchy(LongStream.class, provider -> typeAdapter);
 	}
 
 }
diff --git a/src/main/java/lsh/ext/gson/ext/javax/json/JavaJsonValueTypeAdapterFactory.java b/src/main/java/lsh/ext/gson/ext/javax/json/JavaJsonValueTypeAdapterFactory.java
index f5056bd2..fdc9c332 100644
--- a/src/main/java/lsh/ext/gson/ext/javax/json/JavaJsonValueTypeAdapterFactory.java
+++ b/src/main/java/lsh/ext/gson/ext/javax/json/JavaJsonValueTypeAdapterFactory.java
@@ -13,7 +13,7 @@ public final class JavaJsonValueTypeAdapterFactory {
 	public static ITypeAdapterFactory<JsonValue> defaultForJsonValue = forJsonValue(JavaJsonValueTypeAdapter.getInstance(JsonProvider.provider()));
 
 	public static ITypeAdapterFactory<JsonValue> forJsonValue(final TypeAdapter<JsonValue> typeAdapter) {
-		return ITypeAdapterFactory.forClassHierarchy(JsonValue.class, typeResolver -> typeAdapter);
+		return ITypeAdapterFactory.forClassHierarchy(JsonValue.class, provider -> typeAdapter);
 	}
 
 }
diff --git a/src/main/java/lsh/ext/gson/ext/org/apache/commons/collections4/ApacheCommonsCollections4TypeAdapterFactory.java b/src/main/java/lsh/ext/gson/ext/org/apache/commons/collections4/ApacheCommonsCollections4TypeAdapterFactory.java
index 83b68789..d6b97f6d 100644
--- a/src/main/java/lsh/ext/gson/ext/org/apache/commons/collections4/ApacheCommonsCollections4TypeAdapterFactory.java
+++ b/src/main/java/lsh/ext/gson/ext/org/apache/commons/collections4/ApacheCommonsCollections4TypeAdapterFactory.java
@@ -39,11 +39,11 @@ public static <E> ITypeAdapterFactory<Bag<E>> forBag(
 	) {
 		return ITypeAdapterFactory.forClassHierarchy(
 				Bag.class,
-				typeResolver -> {
-					final TypeAdapter<Integer> integerTypeAdapter = typeResolver.getTypeAdapterForClass(int.class);
+				provider -> {
+					final TypeAdapter<Integer> integerTypeAdapter = provider.getTypeAdapterForClass(int.class);
 					return ApacheCommonsCollections4TypeAdapter.forBagNCopies(
 							integerTypeAdapter,
-							lookup.lookup(typeResolver.getTypeToken()),
+							lookup.lookup(provider.getTypeToken()),
 							toKey,
 							fromKey
 					);
@@ -74,7 +74,7 @@ public static <K, V> ITypeAdapterFactory<BidiMap<K, V>> forBidiMap(
 			final Function<? super K, String> toKey,
 			final Function<? super String, ? extends K> fromKey
 	) {
-		return ITypeAdapterFactory.forClassHierarchy(BiMap.class, typeResolver -> ApacheCommonsCollections4TypeAdapter.forBidiMap(typeResolver.getTypeAdapter(1), lookup.lookup(typeResolver.getTypeToken()), toKey, fromKey));
+		return ITypeAdapterFactory.forClassHierarchy(BiMap.class, provider -> ApacheCommonsCollections4TypeAdapter.forBidiMap(provider.getTypeAdapter(1), lookup.lookup(provider.getTypeToken()), toKey, fromKey));
 	}
 
 	// TODO handle all known implementations
@@ -95,7 +95,7 @@ public static <V> Supplier<IBuilder2<String, V, BidiMap<String, V>>> defaultBuil
 	public static <E> ITypeAdapterFactory<MultiSet<E>> forMultiSet(
 			final IBuilder1.ILookup<? super E, ? extends MultiSet<E>> lookup
 	) {
-		return ITypeAdapterFactory.forClassHierarchy(MultiSet.class, typeResolver -> ApacheCommonsCollections4TypeAdapter.forMultiSet(typeResolver.getTypeAdapter(0), lookup.lookup(typeResolver.getTypeToken())));
+		return ITypeAdapterFactory.forClassHierarchy(MultiSet.class, provider -> ApacheCommonsCollections4TypeAdapter.forMultiSet(provider.getTypeAdapter(0), lookup.lookup(provider.getTypeToken())));
 	}
 
 	// TODO handle all known implementations
@@ -121,7 +121,7 @@ public static <K, V> ITypeAdapterFactory<MultiValuedMap<K, V>> forMultiValueMap(
 			final Function<? super K, String> encodeKey,
 			final Function<? super String, ? extends K> decodeKey
 	) {
-		return ITypeAdapterFactory.forClassHierarchy(MultiValuedMap.class, typeResolver -> ApacheCommonsCollections4TypeAdapter.forMultiValuedMap(typeResolver.getTypeAdapter(1), builderLookup.lookup(typeResolver.getTypeToken()), encodeKey, decodeKey));
+		return ITypeAdapterFactory.forClassHierarchy(MultiValuedMap.class, provider -> ApacheCommonsCollections4TypeAdapter.forMultiValuedMap(provider.getTypeAdapter(1), builderLookup.lookup(provider.getTypeToken()), encodeKey, decodeKey));
 	}
 
 	// TODO handle all known implementations