diff --git a/driver-jms/src/main/java/io/nosqlbench/driver/jms/ReadyJmsOp.java b/driver-jms/src/main/java/io/nosqlbench/driver/jms/ReadyJmsOp.java
index 70be982c8..919e00c76 100644
--- a/driver-jms/src/main/java/io/nosqlbench/driver/jms/ReadyJmsOp.java
+++ b/driver-jms/src/main/java/io/nosqlbench/driver/jms/ReadyJmsOp.java
@@ -1,30 +1,17 @@
 package io.nosqlbench.driver.jms;
 
-import io.nosqlbench.driver.jms.ops.JmsMsgSendMapper;
 import io.nosqlbench.driver.jms.ops.JmsOp;
-import io.nosqlbench.driver.jms.util.JmsHeader;
-import io.nosqlbench.driver.jms.util.JmsHeaderLongFunc;
 import io.nosqlbench.driver.jms.util.JmsUtil;
 import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate;
 import io.nosqlbench.engine.api.activityimpl.OpDispenser;
 import io.nosqlbench.engine.api.templating.CommandTemplate;
 import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
 
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSRuntimeException;
-import javax.jms.Message;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.function.LongFunction;
-import java.util.stream.Collectors;
 
 abstract public class ReadyJmsOp implements OpDispenser<JmsOp> {
 
-    protected final OpTemplate opTpl;
+    protected final OpTemplate optpl;
     protected final CommandTemplate cmdTpl;
     protected final JmsActivity jmsActivity;
 
@@ -35,8 +22,8 @@ abstract public class ReadyJmsOp implements OpDispenser<JmsOp> {
     protected final LongFunction<JmsOp> opFunc;
 
     public ReadyJmsOp(OpTemplate opTemplate, JmsActivity jmsActivity) {
-        this.opTpl = opTemplate;
-        this.cmdTpl = new CommandTemplate(opTpl);
+        this.optpl = opTemplate;
+        this.cmdTpl = new CommandTemplate(optpl);
         this.jmsActivity = jmsActivity;
 
         if (!cmdTpl.containsKey("optype") || !cmdTpl.isStatic("optype")) {
diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java
index 44b206132..970df667b 100644
--- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java
+++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java
@@ -30,11 +30,11 @@ public class ReadyPulsarOp implements OpDispenser<PulsarOp> {
 
     // TODO: Add docs for the command template with respect to the OpTemplate
 
-    public ReadyPulsarOp(OpTemplate opTemplate, PulsarSpaceCache pcache, PulsarActivity pulsarActivity) {
+    public ReadyPulsarOp(OpTemplate optpl, PulsarSpaceCache pcache, PulsarActivity pulsarActivity) {
         // TODO: Consider parsing map structures into equivalent binding representation
         this.pulsarActivity = pulsarActivity;
-        this.opTpl = opTemplate;
-        this.cmdTpl = new CommandTemplate(opTemplate);
+        this.opTpl = optpl;
+        this.cmdTpl = new CommandTemplate(optpl);
 
         if (cmdTpl.isDynamic("op_scope")) {
             throw new RuntimeException("op_scope must be static");
diff --git a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverActivity.java b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverActivity.java
index 489e96566..bbcd558d4 100644
--- a/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverActivity.java
+++ b/driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverActivity.java
@@ -186,9 +186,9 @@ public class WebDriverActivity extends SimpleActivity {
             throw new BasicError("There were no active statements with tag filter '" + tagfilter + "'");
         }
 
-        for (OpTemplate optemplate : stmts) {
-            long ratio = optemplate.getParamOrDefault("ratio", 1);
-            CommandTemplate cmd = new CommandTemplate(optemplate);
+        for (OpTemplate optpl : stmts) {
+            long ratio = optpl.getParamOrDefault("ratio", 1);
+            CommandTemplate cmd = new CommandTemplate(optpl);
             planner.addOp(cmd, ratio);
         }
         return planner.resolve();
diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/DiagRunnableOpMapper.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/DiagRunnableOpMapper.java
index 4dbd38b69..01fc0b363 100644
--- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/DiagRunnableOpMapper.java
+++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/DiagRunnableOpMapper.java
@@ -8,8 +8,8 @@ import java.util.function.Function;
 public class DiagRunnableOpMapper implements Function<OpTemplate, OpDispenser<Runnable>> {
 
     @Override
-    public OpDispenser<Runnable> apply(OpTemplate opTemplate) {
-        CommandTemplate commandTemplate = new CommandTemplate(opTemplate);
+    public OpDispenser<Runnable> apply(OpTemplate optpl) {
+        CommandTemplate commandTemplate = new CommandTemplate(optpl);
         return new DiagRunnableOpDispenser(commandTemplate);
     }