diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetFunctions.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetFunctions.java
index 48d748c9a..ffa36e476 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetFunctions.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetFunctions.java
@@ -36,7 +36,7 @@ public class SetFunctions implements LongFunction<java.util.Set<Object>> {
     })
 
     public SetFunctions(Object... funcs) {
-        this.valueFuncs = VirtDataConversions.adaptList(funcs, LongFunction.class, Object.class);
+        this.valueFuncs = VirtDataConversions.adaptFunctionList(funcs, LongFunction.class, Object.class);
         this.size = valueFuncs.size();
     }
 
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetHashed.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetHashed.java
index 345ca2a4a..97f56cf62 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetHashed.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetHashed.java
@@ -7,13 +7,9 @@ import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import io.nosqlbench.virtdata.api.bindings.VirtDataConversions;
 import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.function.Function;
 import java.util.function.LongFunction;
-import java.util.function.LongUnaryOperator;
 
 /**
  * Create a Set from a long input based on a set of provided functions.
@@ -36,7 +32,7 @@ public class SetHashed implements LongFunction<java.util.Set<Object>> {
             "Create a hash list of object values of each function output, like ['2945182322382062539','text']"
     })
     public SetHashed(Object... funcs) {
-        this.valueFuncs = VirtDataConversions.adaptList(funcs, LongFunction.class, Object.class);
+        this.valueFuncs = VirtDataConversions.adaptFunctionList(funcs, LongFunction.class, Object.class);
         this.size = valueFuncs.size();
     }
 
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSized.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSized.java
index 9101c8c3b..b861419df 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSized.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSized.java
@@ -6,14 +6,10 @@ import io.nosqlbench.virtdata.api.annotations.Example;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import io.nosqlbench.virtdata.api.bindings.VirtDataConversions;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.function.Function;
 import java.util.function.LongFunction;
 import java.util.function.LongToIntFunction;
-import java.util.function.LongUnaryOperator;
 
 /**
  * Create a Set from a long input based on a set of provided functions.
@@ -37,8 +33,8 @@ public class SetSized implements LongFunction<java.util.Set<Object>> {
             "Create a sized set of object values, like ['one','text'], because 'text' is duplicated 4 times"
     })
     public SetSized(Object sizeFunc, Object... funcs) {
-        this.sizeFunc = VirtDataConversions.adapt(sizeFunc, LongToIntFunction.class);
-        this.valueFuncs = VirtDataConversions.adaptList(funcs, LongFunction.class, Object.class);
+        this.sizeFunc = VirtDataConversions.adaptFunction(sizeFunc, LongToIntFunction.class);
+        this.valueFuncs = VirtDataConversions.adaptFunctionList(funcs, LongFunction.class, Object.class);
     }
 
     @Override
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSizedHashed.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSizedHashed.java
index 5d0a36e8c..04a3f09f9 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSizedHashed.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSizedHashed.java
@@ -7,14 +7,10 @@ import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import io.nosqlbench.virtdata.api.bindings.VirtDataConversions;
 import io.nosqlbench.virtdata.library.basics.shared.from_long.to_long.Hash;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.function.Function;
 import java.util.function.LongFunction;
 import java.util.function.LongToIntFunction;
-import java.util.function.LongUnaryOperator;
 
 /**
  * Create a Set from a long input based on a set of provided functions.
@@ -38,8 +34,8 @@ public class SetSizedHashed implements LongFunction<java.util.Set<Object>> {
         "Create a sized set of values like ['2945182322382062539', 'text', '37945690212757860', '287864597160630738', '3299224200079606887']"
     })
     public SetSizedHashed(Object sizeFunc, Object... funcs) {
-        this.sizeFunc = VirtDataConversions.adapt(sizeFunc, LongToIntFunction.class);
-        this.valueFuncs = VirtDataConversions.adaptList(funcs, LongFunction.class, Object.class);
+        this.sizeFunc = VirtDataConversions.adaptFunction(sizeFunc, LongToIntFunction.class);
+        this.valueFuncs = VirtDataConversions.adaptFunctionList(funcs, LongFunction.class, Object.class);
     }
 
     @Override
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSizedStepped.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSizedStepped.java
index e2e1bfae9..609c7d0c1 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSizedStepped.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSizedStepped.java
@@ -32,8 +32,8 @@ public class SetSizedStepped implements LongFunction<java.util.Set<Object>> {
         "Create a set, like ['three','four']"
     })
     public SetSizedStepped(Object sizeFunc, Object... funcs) {
-        this.sizeFunc = VirtDataConversions.adapt(sizeFunc, LongToIntFunction.class);
-        this.valueFuncs = VirtDataConversions.adaptList(funcs, LongFunction.class, Object.class);
+        this.sizeFunc = VirtDataConversions.adaptFunction(sizeFunc, LongToIntFunction.class);
+        this.valueFuncs = VirtDataConversions.adaptFunctionList(funcs, LongFunction.class, Object.class);
     }
 
     @Override
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetStepped.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetStepped.java
index c0e4bc793..5b267c6c9 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetStepped.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetStepped.java
@@ -6,13 +6,9 @@ import io.nosqlbench.virtdata.api.annotations.Example;
 import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper;
 import io.nosqlbench.virtdata.api.bindings.VirtDataConversions;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.function.Function;
 import java.util.function.LongFunction;
-import java.util.function.LongUnaryOperator;
 
 /**
  * Create a Set from a long input based on a set of provided functions.
@@ -34,7 +30,7 @@ public class SetStepped implements LongFunction<java.util.Set<Object>> {
         "Create a list of ['one','two']"
     })
     public SetStepped(Object... funcs) {
-        this.valueFuncs = VirtDataConversions.adaptList(funcs, LongFunction.class, Object.class);
+        this.valueFuncs = VirtDataConversions.adaptFunctionList(funcs, LongFunction.class, Object.class);
         this.size = valueFuncs.size();
     }