diff --git a/tools/jmeter/src/main/kotlin/com/r3/corda/jmeter/Samplers.kt b/tools/jmeter/src/main/kotlin/com/r3/corda/jmeter/Samplers.kt
index 0fc61cf256..ac7e6d9146 100644
--- a/tools/jmeter/src/main/kotlin/com/r3/corda/jmeter/Samplers.kt
+++ b/tools/jmeter/src/main/kotlin/com/r3/corda/jmeter/Samplers.kt
@@ -67,24 +67,27 @@ class CashIssueAndPaySampler : AbstractSampler() {
     companion object JMeterProperties {
         val otherParty = Argument("otherPartyName", "", "<meta>", "The X500 name of the payee.")
         val coinSelection = Argument("useCoinSelection", "true", "<meta>", "True to use coin selection and false (or anything else) to avoid coin selection.")
+        val anonymousIdentities = Argument("anonymousIdentities", "true", "<meta>", "True to use anonymous identities and false (or anything else) to use well known identities.")
     }
 
     lateinit var counterParty: Party
     var useCoinSelection: Boolean = true
+    var useAnonymousIdentities: Boolean = true
 
     override fun setupTest(rpcProxy: CordaRPCOps, testContext: JavaSamplerContext) {
         getNotaryIdentity(rpcProxy,testContext)
         counterParty = getIdentity(rpcProxy, testContext, otherParty)
         useCoinSelection = testContext.getParameter(coinSelection.name, coinSelection.value).toBoolean()
+        useAnonymousIdentities = testContext.getParameter(anonymousIdentities.name, anonymousIdentities.value).toBoolean()
     }
 
 
     override fun createFlowInvoke(rpcProxy: CordaRPCOps, testContext: JavaSamplerContext): FlowInvoke<*> {
         val amount = 2_000_000.POUNDS
         if (useCoinSelection) {
-            return FlowInvoke<CashIssueAndPaymentFlow>(CashIssueAndPaymentFlow::class.java, arrayOf(amount, OpaqueBytes.of(1), counterParty, true, notaryIdentity))
+            return FlowInvoke<CashIssueAndPaymentFlow>(CashIssueAndPaymentFlow::class.java, arrayOf(amount, OpaqueBytes.of(1), counterParty, useAnonymousIdentities, notaryIdentity))
         } else {
-            return FlowInvoke<CashIssueAndPaymentNoSelection>(CashIssueAndPaymentNoSelection::class.java, arrayOf(amount, OpaqueBytes.of(1), counterParty, true, notaryIdentity))
+            return FlowInvoke<CashIssueAndPaymentNoSelection>(CashIssueAndPaymentNoSelection::class.java, arrayOf(amount, OpaqueBytes.of(1), counterParty, useAnonymousIdentities, notaryIdentity))
         }
     }
 
@@ -92,7 +95,7 @@ class CashIssueAndPaySampler : AbstractSampler() {
     }
 
     override val additionalArgs: Set<Argument>
-        get() = setOf(notary, otherParty, coinSelection)
+        get() = setOf(notary, otherParty, coinSelection, anonymousIdentities)
 }
 
 /**
diff --git a/tools/jmeter/src/main/resources/Example Flow Request.jmx b/tools/jmeter/src/main/resources/Example Flow Request.jmx
index 31c0f26355..1f68403d21 100644
--- a/tools/jmeter/src/main/resources/Example Flow Request.jmx	
+++ b/tools/jmeter/src/main/resources/Example Flow Request.jmx	
@@ -31,7 +31,7 @@
             <collectionProp name="Arguments.arguments">
               <elementProp name="label" elementType="Argument">
                 <stringProp name="Argument.name">label</stringProp>
-                <stringProp name="Argument.value">${___samplerName}</stringProp>
+                <stringProp name="Argument.value">${__samplerName}</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="host" elementType="Argument">
diff --git a/tools/jmeter/src/main/resources/IssueAndPay Request.jmx b/tools/jmeter/src/main/resources/IssueAndPay Request.jmx
index 3984b7d506..dd61ec442f 100644
--- a/tools/jmeter/src/main/resources/IssueAndPay Request.jmx	
+++ b/tools/jmeter/src/main/resources/IssueAndPay Request.jmx	
@@ -31,7 +31,7 @@
             <collectionProp name="Arguments.arguments">
               <elementProp name="label" elementType="Argument">
                 <stringProp name="Argument.name">label</stringProp>
-                <stringProp name="Argument.value">${___samplerName}</stringProp>
+                <stringProp name="Argument.value">${__samplerName}</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="host" elementType="Argument">
diff --git a/tools/jmeter/src/main/resources/LocalBatchNotarise Request.jmx b/tools/jmeter/src/main/resources/LocalBatchNotarise Request.jmx
index 6e02d29e53..9f65a9ec06 100644
--- a/tools/jmeter/src/main/resources/LocalBatchNotarise Request.jmx	
+++ b/tools/jmeter/src/main/resources/LocalBatchNotarise Request.jmx	
@@ -44,7 +44,7 @@
             <connectTime>true</connectTime>
           </value>
         </objProp>
-        <stringProp name="filename"></stringProp>
+        <stringProp name="filename">BatchNotarise2TPS.csv</stringProp>
         <boolProp name="ResultCollector.success_only_logging">true</boolProp>
       </ResultCollector>
       <hashTree/>
@@ -54,7 +54,7 @@
           <boolProp name="LoopController.continue_forever">false</boolProp>
           <intProp name="LoopController.loops">-1</intProp>
         </elementProp>
-        <stringProp name="ThreadGroup.num_threads">3</stringProp>
+        <stringProp name="ThreadGroup.num_threads">1</stringProp>
         <stringProp name="ThreadGroup.ramp_time"></stringProp>
         <longProp name="ThreadGroup.start_time">1509455820000</longProp>
         <longProp name="ThreadGroup.end_time">1509455820000</longProp>
@@ -68,7 +68,7 @@
             <collectionProp name="Arguments.arguments">
               <elementProp name="label" elementType="Argument">
                 <stringProp name="Argument.name">label</stringProp>
-                <stringProp name="Argument.value">${___samplerName}</stringProp>
+                <stringProp name="Argument.value">${__samplerName}</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="host" elementType="Argument">
@@ -78,32 +78,32 @@
               </elementProp>
               <elementProp name="port" elementType="Argument">
                 <stringProp name="Argument.name">port</stringProp>
-                <stringProp name="Argument.value">10004</stringProp>
+                <stringProp name="Argument.value">10003</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="username" elementType="Argument">
                 <stringProp name="Argument.name">username</stringProp>
-                <stringProp name="Argument.value">perf</stringProp>
+                <stringProp name="Argument.value">default</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="password" elementType="Argument">
                 <stringProp name="Argument.name">password</stringProp>
-                <stringProp name="Argument.value">perf</stringProp>
+                <stringProp name="Argument.value">default</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="notaryName" elementType="Argument">
                 <stringProp name="Argument.name">notaryName</stringProp>
-                <stringProp name="Argument.value">O=Notary Service,L=Zurich,C=CH,CN=corda.notary.simple</stringProp>
+                <stringProp name="Argument.value">O=Notary Service,L=Zurich,C=CH</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="numStates" elementType="Argument">
                 <stringProp name="Argument.name">numStates</stringProp>
-                <stringProp name="Argument.value">100</stringProp>
+                <stringProp name="Argument.value">10</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="numIterations" elementType="Argument">
                 <stringProp name="Argument.name">numIterations</stringProp>
-                <stringProp name="Argument.value">1</stringProp>
+                <stringProp name="Argument.value">10</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="enableLog" elementType="Argument">
@@ -113,7 +113,7 @@
               </elementProp>
               <elementProp name="transactionsPerSecond" elementType="Argument">
                 <stringProp name="Argument.name">transactionsPerSecond</stringProp>
-                <stringProp name="Argument.value">1.0</stringProp>
+                <stringProp name="Argument.value">2.0</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="repeatInvoke" elementType="Argument">
@@ -131,7 +131,7 @@
             <collectionProp name="Arguments.arguments">
               <elementProp name="label" elementType="Argument">
                 <stringProp name="Argument.name">label</stringProp>
-                <stringProp name="Argument.value"></stringProp>
+                <stringProp name="Argument.value">${__samplerName}</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="host" elementType="Argument">
@@ -175,7 +175,7 @@
         </JavaSampler>
         <hashTree/>
       </hashTree>
-      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="false">
         <stringProp name="ThreadGroup.on_sample_error">stopthread</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">false</boolProp>
@@ -258,7 +258,7 @@
             <collectionProp name="Arguments.arguments">
               <elementProp name="label" elementType="Argument">
                 <stringProp name="Argument.name">label</stringProp>
-                <stringProp name="Argument.value"></stringProp>
+                <stringProp name="Argument.value">${__samplerName}</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="host" elementType="Argument">
diff --git a/tools/jmeter/src/main/resources/LocalIssueAndPay Request.jmx b/tools/jmeter/src/main/resources/LocalIssueAndPay Request.jmx
index ba4c291564..60f087fcf3 100644
--- a/tools/jmeter/src/main/resources/LocalIssueAndPay Request.jmx	
+++ b/tools/jmeter/src/main/resources/LocalIssueAndPay Request.jmx	
@@ -31,7 +31,7 @@
             <collectionProp name="Arguments.arguments">
               <elementProp name="label" elementType="Argument">
                 <stringProp name="Argument.name">label</stringProp>
-                <stringProp name="Argument.value">${___samplerName}</stringProp>
+                <stringProp name="Argument.value">${__samplerName}</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="host" elementType="Argument">
@@ -41,22 +41,22 @@
               </elementProp>
               <elementProp name="port" elementType="Argument">
                 <stringProp name="Argument.name">port</stringProp>
-                <stringProp name="Argument.value">10004</stringProp>
+                <stringProp name="Argument.value">10003</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="username" elementType="Argument">
                 <stringProp name="Argument.name">username</stringProp>
-                <stringProp name="Argument.value">perf</stringProp>
+                <stringProp name="Argument.value">default</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="password" elementType="Argument">
                 <stringProp name="Argument.name">password</stringProp>
-                <stringProp name="Argument.value">perf</stringProp>
+                <stringProp name="Argument.value">default</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="notaryName" elementType="Argument">
                 <stringProp name="Argument.name">notaryName</stringProp>
-                <stringProp name="Argument.value">O=Notary Service,L=Zurich,C=CH,CN=corda.notary.simple</stringProp>
+                <stringProp name="Argument.value">O=Notary Service,L=Zurich,C=CH</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="otherPartyName" elementType="Argument">
diff --git a/tools/jmeter/src/main/resources/Testplans/CashIssuance_40k.jmx b/tools/jmeter/src/main/resources/Testplans/CashIssuance_40k.jmx
index 31b7ba9fbe..dbd2f1435a 100644
--- a/tools/jmeter/src/main/resources/Testplans/CashIssuance_40k.jmx
+++ b/tools/jmeter/src/main/resources/Testplans/CashIssuance_40k.jmx
@@ -31,7 +31,7 @@
             <collectionProp name="Arguments.arguments">
               <elementProp name="label" elementType="Argument">
                 <stringProp name="Argument.name">label</stringProp>
-                <stringProp name="Argument.value">${___samplerName}</stringProp>
+                <stringProp name="Argument.value">${__samplerName}</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
               </elementProp>
               <elementProp name="host" elementType="Argument">