diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CoreOpMapper.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CoreOpMapper.java
index 389151fde..0e4184f31 100644
--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CoreOpMapper.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CoreOpMapper.java
@@ -58,7 +58,7 @@ public class Cqld4CoreOpMapper implements OpMapper<Op> {
 
         CqlD4OpType opType = CqlD4OpType.prepared;
 
-        TypeAndTarget<CqlD4OpType, String> target = cmd.getTargetEnum(CqlD4OpType.class, String.class, "type", "stmt");
+        TypeAndTarget<CqlD4OpType, String> target = cmd.getTypeAndTarget(CqlD4OpType.class, String.class, "type", "stmt");
 
         return switch (target.enumId) {
             case raw -> new CqlD4RawStmtMapper(sessionFunc, target.targetFunction).apply(cmd);
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java b/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java
index 542f1cc6a..ee4c6a722 100644
--- a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java
+++ b/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java
@@ -50,7 +50,7 @@ public class DynamoDBOpMapper implements OpMapper<DynamoDBOp> {
             throw new RuntimeException("This mode is reserved for later. Do not use the 'body' op field.");
 //            return new RawDynamoDBOpDispenser(cmd);
         } else {
-            TypeAndTarget<DynamoDBCmdType,String> cmdType = cmd.getTargetEnum(DynamoDBCmdType.class,String.class);
+            TypeAndTarget<DynamoDBCmdType,String> cmdType = cmd.getTypeAndTarget(DynamoDBCmdType.class,String.class);
             return switch (cmdType.enumId) {
                 case CreateTable -> new DDBCreateTableOpDispenser(ddb, cmd, cmdType.targetFunction);
                 case DeleteTable -> new DDBDeleteTableOpDispenser(ddb, cmd, cmdType.targetFunction);
diff --git a/adapters-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedOp.java b/adapters-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedOp.java
index 8c5eab116..9d2443102 100644
--- a/adapters-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedOp.java
+++ b/adapters-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedOp.java
@@ -440,18 +440,18 @@ public class ParsedOp implements LongFunction<Map<String, ?>>, StaticFieldReader
      * @return Optionally, an enum value which matches, or {@link Optional#empty()}
      * @throws OpConfigError if more than one field matches
      */
-    public <E extends Enum<E>,V> Optional<TypeAndTarget<E,V>> getTypeFromEnum(Class<E> enumclass, Class<V> valueClass) {
+    public <E extends Enum<E>,V> Optional<TypeAndTarget<E,V>> getTypeAndTargetFromEnum(Class<E> enumclass, Class<V> valueClass) {
         return tmap.getOptionalTargetEnum(enumclass,valueClass);
     }
 
-    public <E extends Enum<E>,V> Optional<TypeAndTarget<E,V>> getOptionalTargetEnum(
+    public <E extends Enum<E>,V> Optional<TypeAndTarget<E,V>> getOptionalTypeAndTargetEnum(
         Class<E> enumclass,
         Class<V> valueClass
     ){
         return tmap.getOptionalTargetEnum(enumclass,valueClass);
     }
 
-    public <E extends Enum<E>,V> Optional<TypeAndTarget<E,V>> getOptionalTargetEnum(
+    public <E extends Enum<E>,V> Optional<TypeAndTarget<E,V>> getOptionalTypeAndTargetEnum(
         Class<E> enumclass,
         Class<V> valueClass,
         String alternateTypeField,
@@ -460,11 +460,11 @@ public class ParsedOp implements LongFunction<Map<String, ?>>, StaticFieldReader
         return tmap.getOptionalTargetEnum(enumclass, valueClass, alternateTypeField, alternateValueField);
     }
 
-    public <E extends Enum<E>,V> TypeAndTarget<E,V> getTargetEnum(Class<E> enumclass, Class<V> valueClass) {
+    public <E extends Enum<E>,V> TypeAndTarget<E,V> getTypeAndTarget(Class<E> enumclass, Class<V> valueClass) {
         return tmap.getTargetEnum(enumclass, valueClass);
     }
 
-    public <E extends Enum<E>,V> TypeAndTarget<E,V> getTargetEnum(Class<E> enumclass, Class<V> valueclass, String tname, String vname) {
+    public <E extends Enum<E>,V> TypeAndTarget<E,V> getTypeAndTarget(Class<E> enumclass, Class<V> valueclass, String tname, String vname) {
         return tmap.getTargetEnum(enumclass, valueclass,tname,vname);
     }