diff --git a/assembly/pom.xml b/assembly/pom.xml
index 513657951c..77e40adaa5 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -296,17 +296,7 @@
           </execution>
         </executions>
       </plugin>
-      <!-- 
-      <plugin>
-        <groupId>incubator-activemq</groupId>
-        <artifactId>maven-activemq-perf-plugin</artifactId>
-        <version>4.0-SNAPSHOT</version>
-        <configuration>
-          <configFile>src/release/conf/activemq.xml</configFile>
-        </configuration>
-      </plugin>
-      -->
     </plugins>
   </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ConsumerMojo.java b/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ConsumerMojo.java
index f1a6f1c359..aab5a6bb5a 100644
--- a/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ConsumerMojo.java
+++ b/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ConsumerMojo.java
@@ -93,32 +93,32 @@ public class ConsumerMojo
     private String destComposite;
 
     /**
-     * @parameter expression="${consumer.durable}" default-value="false"
+     * @parameter expression="${client.durable}" default-value="false"
      * @required
      */
     private String durable;
 
     /**
-     * @parameter expression="${consumer.asyncRecv}" default-value="true"
+     * @parameter expression="${client.asyncRecv}" default-value="true"
      * @required
      */
     private String asyncRecv;
 
     /**
-     * @parameter expression="${consumer.recvCount}" default-value="1000"
+     * @parameter expression="${client.recvCount}" default-value="1000"
      * @required
      */
     private String recvCount;
 
     /*
-     * @parameter expression="${consumer.recvDuration}" default-value="60000"
+     * @parameter expression="${client.recvDuration}" default-value="60000"
      * @required
 
     private String recvDuration;
     */
 
     /**
-     * @parameter expression="${consumer.recvType}" default-value="time"
+     * @parameter expression="${client.recvType}" default-value="time"
      * @required
      */
     private String recvType;
@@ -209,11 +209,11 @@ public class ConsumerMojo
         options[8] = "client.destCount=" + destCount;
         options[9] = "client.destComposite=" + destComposite;
 
-        options[10] = "consumer.durable=" + durable;
-        options[11] = "consumer.asyncRecv=" + asyncRecv;
-        options[12] = "consumer.recvCount=" + recvCount;     // 1000 messages
-        options[13] = "consumer.recvDuration=" + duration; // use sampler.duration.
-        options[14] = "consumer.recvType=" + recvType;
+        options[10] = "client.durable=" + durable;
+        options[11] = "client.asyncRecv=" + asyncRecv;
+        options[12] = "client.recvCount=" + recvCount;     // 1000 messages
+        options[13] = "client.recvDuration=" + duration; // use sampler.duration.
+        options[14] = "client.recvType=" + recvType;
 
         options[15] = "factory.brokerUrl=" + brokerUrl;
         options[16] = "factory.optimAck=" + optimAck;
diff --git a/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ProducerMojo.java b/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ProducerMojo.java
index 454ba6e0a8..eff21772f6 100644
--- a/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ProducerMojo.java
+++ b/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ProducerMojo.java
@@ -91,26 +91,26 @@ public class ProducerMojo
     private String destComposite;
 
     /**
-     * @parameter expression="${producer.messageSize}" default-value="1024"
+     * @parameter expression="${client.messageSize}" default-value="1024"
      * @required
      */
     private String messageSize;
 
     /**
-     * @parameter expression="${producer.sendCount}" default-value="1000"
+     * @parameter expression="${client.sendCount}" default-value="1000"
      * @required
      */
     private String sendCount;
 
     /*
-     * @parameter expression="${producer.sendDuration}" default-value="60000"
+     * @parameter expression="${client.sendDuration}" default-value="60000"
      * @required
 
     private String sendDuration;
     */
 
     /**
-     * @parameter expression="${producer.sendType}" default-value="time"
+     * @parameter expression="${client.sendType}" default-value="time"
      * @required
      */
     private String sendType;
@@ -173,10 +173,10 @@ public class ProducerMojo
         options[8] = "client.destCount=" + destCount;
         options[9] = "client.destComposite=" + destComposite;
 
-        options[10] = "producer.messageSize="+messageSize;
-        options[11] = "producer.sendCount="+sendCount;     // 1000 messages
-        options[12] = "producer.sendDuration="+duration; // use sampler.duration.
-        options[13] = "producer.sendType="+sendType;
+        options[10] = "client.messageSize="+messageSize;
+        options[11] = "client.sendCount="+sendCount;     // 1000 messages
+        options[12] = "client.sendDuration="+duration; // use sampler.duration.
+        options[13] = "client.sendType="+sendType;
 
         options[14] = "factory.brokerUrl="+brokerUrl;
         options[15] = "factory.asyncSend="+asyncSend;
diff --git a/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/PerfReportGenerator.java b/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/PerfReportGenerator.java
index ec47d7a42e..76ed2366dd 100644
--- a/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/PerfReportGenerator.java
+++ b/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/PerfReportGenerator.java
@@ -119,8 +119,8 @@ public class PerfReportGenerator {
 
     public String createReportName(Properties testSettings) {
         if (testSettings != null) {
-            String[] keys = {"client.destCount", "consumer.asyncRecv", "consumer.durable",
-                             "producer.messageSize", "sysTest.numClients", "sysTest.totalDests"};
+            String[] keys = {"client.destCount", "client.asyncRecv", "client.durable",
+                             "client.messageSize", "sysTest.numClients", "sysTest.totalDests"};
 
             StringBuffer buffer = new StringBuffer();
             String key;