diff --git a/scenarios/invite_concurrent_max_out_per_account/0001_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0001_test.yml.tt2
index 72a51010..22220999 100644
--- a/scenarios/invite_concurrent_max_out_per_account/0001_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out_per_account/0001_test.yml.tt2
@@ -21,9 +21,9 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^INVITE sip:004321001@'
+  - '^INVITE sip:[% scenarios.0.responders.0.username %]@'
   - 'Contact: sip:testuser1002@'
-  - 'To: <sip:004321001@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
@@ -32,11 +32,11 @@ sip_out:
       '^SIP/2.0 100 Trying',
       'CSeq: 1 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:004321001@'
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
   - [
       '^SIP/2.0 407 Proxy Authentication Required',
       'CSeq: 1 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:004321001@'
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2
index 0f2fc4e1..52eb5efc 100644
--- a/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2
@@ -93,13 +93,13 @@ flow:
   - start|ROUTE_CNT_CALLER_REJECT:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]",
         "total",
         "relay",
         "peerout:[% peer_00_host0.id %]",
@@ -168,13 +168,13 @@ flow:
   - exit|ROUTE_EXIT:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]",
         "total",
         "relay",
         "peerout:[% peer_00_host0.id %]",
@@ -182,7 +182,7 @@ flow:
         "outgoing"
       ]
 sip_in:
-  - '^INVITE sip:004321001@'
+  - '^INVITE sip:[% scenarios.0.responders.0.username %]@'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 INVITE'
   - 'Max-Forwards: 69'
@@ -193,24 +193,24 @@ sip_out:
       '^SIP/2.0 100 Trying',
       'CSeq: 2 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:004321001@'
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
   - [
       '^SIP/2.0 101 Connecting',
       'CSeq: 2 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:004321001@'
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
   - [
-      '^INVITE sip:004321001@',
+      '^INVITE sip:[% scenarios.0.responders.0.username %]@',
       'CSeq: 2 INVITE',
-      'From: <sip:4311002@',
-      'To: <sip:004321001@',
+      'From: <sip:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'Content-Type: application/sdp',
       'P-Caller-UUID: \w+',
       'P-Callee-UUID: \w+',
-      'P-Asserted-Identity: <sip:4311002@',
-      'P-Called-Party-ID: <sip:004321001@',
+      'P-Asserted-Identity: <sip:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.phone_number %]@',
+      'P-Called-Party-ID: <sip:[% scenarios.0.responders.0.username %]@',
       'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
diff --git a/scenarios/invite_concurrent_max_out_per_account/0005_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0005_test.yml.tt2
index c232aa63..903e006a 100644
--- a/scenarios/invite_concurrent_max_out_per_account/0005_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out_per_account/0005_test.yml.tt2
@@ -13,39 +13,39 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - 'INVITE sip:004321001@127.0.2.1:\d+;transport=udp SIP/2.0'
-  - 'From: <sip:4311002@spce.test>;tag=[\w-]+'
-  - 'To: <sip:004321001@127.0.2.1>'
+  - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
+  - 'From: <sip:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.phone_number %]@invite-concurrent-max-out-per-account.scenarios.test>;tag=[\w-]+'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
   - 'P-LB-Uptime: \d+'
-  - 'P-Asserted-Identity: <sip:4311002@spce.test>'
-  - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]'
-  - 'P-NGCP-Caller-Info: <sip:testuser1002@spce.test>;ip=127.126.0.1;port=\d+;primary=4311002'
-  - 'P-NGCP-Callee-Info: <sip:004321001@spce.test>;ip=127.0.2.1;port=\d+'
-  - 'P-D-Uri: sip:127.0.0.1:5060;received=sip:127.0.2.1:\d+%3blr%3btransport%3dudp'
+  - 'P-Asserted-Identity: <sip:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.phone_number %]@invite-concurrent-max-out-per-account.scenarios.test>'
+  - 'P-Caller-UUID: [% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]'
+  - 'P-NGCP-Caller-Info: <sip:testuser1002@invite-concurrent-max-out-per-account.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-concurrent-max-out-per-account.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]'
+  - 'P-D-Uri: sip:127.0.0.1:5060;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]%3blr%3btransport%3dudp'
   - 'Content-Type: application/sdp'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
   - 'Content-Length:\s+\d+'
 sip_out:
   - [
       'SIP/2.0 100 Trying',
-      'From: <sip:4311002@spce.test>;tag=[\w-]+',
-      'To: <sip:004321001@127.0.2.1>',
+      'From: <sip:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.phone_number %]@invite-concurrent-max-out-per-account.scenarios.test>;tag=[\w-]+',
+      'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>',
       'CSeq: \d+ INVITE',
       'Server: Sipwise NGCP Proxy',
       'Content-Length: 0',
     ]
   - [
-      'INVITE sip:004321001@127.0.2.1:\d+;transport=udp SIP/2.0',
-      'From: <sip:4311002@spce.test>;tag=[\w-]+',
-      'To: <sip:004321001@127.0.2.1>',
+      'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0',
+      'From: <sip:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.phone_number %]@invite-concurrent-max-out-per-account.scenarios.test>;tag=[\w-]+',
+      'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>',
       'CSeq: \d+ INVITE',
       'P-LB-Uptime: \d+',
-      'P-Asserted-Identity: <sip:4311002@spce.test>',
-      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
-      'P-NGCP-Caller-Info: <sip:testuser1002@spce.test>;ip=127.126.0.1;port=\d+;primary=4311002',
-      'P-NGCP-Callee-Info: <sip:004321001@spce.test>;ip=127.0.2.1;port=\d+',
-      'P-D-Uri: sip:127.0.0.1:5060;received=sip:127.0.2.1:\d+%3blr%3btransport%3dudp',
+      'P-Asserted-Identity: <sip:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.phone_number %]@invite-concurrent-max-out-per-account.scenarios.test>',
+      'P-Caller-UUID: [% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]',
+      'P-NGCP-Caller-Info: <sip:testuser1002@invite-concurrent-max-out-per-account.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.phone_number %]',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-concurrent-max-out-per-account.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]',
+      'P-D-Uri: sip:127.0.0.1:5060;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]%3blr%3btransport%3dudp',
       'Content-Type: application/sdp',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
       'Content-Length:\s+\d+',
diff --git a/scenarios/invite_concurrent_max_out_per_account/0010_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0010_test.yml.tt2
index 3df88c2e..1cb0dbef 100644
--- a/scenarios/invite_concurrent_max_out_per_account/0010_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out_per_account/0010_test.yml.tt2
@@ -17,13 +17,13 @@ flow:
   - return|dialog:start:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]",
         "total",
         "relay",
         "peerout:[% peer_00_host0.id %]",
@@ -39,5 +39,5 @@ sip_out:
       '^SIP/2.0 200 OK',
       'CSeq: 2 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:004321001@'
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_concurrent_max_out_per_account/0013_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0013_test.yml.tt2
index 4e72871a..710e07cb 100644
--- a/scenarios/invite_concurrent_max_out_per_account/0013_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out_per_account/0013_test.yml.tt2
@@ -36,13 +36,13 @@ sip_out:
       '^SIP/2.0 100 Trying',
       'CSeq: 3 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:004321001@'
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
   - [
       '^INVITE',
       'CSeq: 3 INVITE',
-      'From: <sip:4311002@',
-      'To: <sip:004321001@',
+      'From: <sip:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'Content-Type: application/sdp',
       'Proxy-Authorization: Digest username="testuser1002"',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_concurrent_max_out_per_account/0018_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0018_test.yml.tt2
index 4bdef925..1a39be6f 100644
--- a/scenarios/invite_concurrent_max_out_per_account/0018_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out_per_account/0018_test.yml.tt2
@@ -22,5 +22,5 @@ sip_out:
       '^SIP/2.0 200 OK',
       'CSeq: 3 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:004321001@'
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_concurrent_max_out_per_account/0021_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0021_test.yml.tt2
index cd0e24b3..86660dde 100644
--- a/scenarios/invite_concurrent_max_out_per_account/0021_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out_per_account/0021_test.yml.tt2
@@ -21,9 +21,9 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^INVITE sip:004421003@'
+  - '^INVITE sip:[% scenarios.0.responders.1.username %]@'
   - 'Contact: sip:testuser1002@'
-  - 'To: <sip:004421003@'
+  - 'To: <sip:[% scenarios.0.responders.1.username %]@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Call-ID: NGCP%invite_concurrent_max_out_per_account%NEW///'
@@ -33,11 +33,11 @@ sip_out:
       '^SIP/2.0 100 Trying',
       'CSeq: 1 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:004421003@'
+      'To: <sip:[% scenarios.0.responders.1.username %]@'
     ]
   - [
       '^SIP/2.0 407 Proxy Authentication Required',
       'CSeq: 1 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:004421003@'
+      'To: <sip:[% scenarios.0.responders.1.username %]@'
     ]
diff --git a/scenarios/invite_concurrent_max_out_per_account/0023_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0023_test.yml.tt2
index 3624b885..c96093d9 100644
--- a/scenarios/invite_concurrent_max_out_per_account/0023_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out_per_account/0023_test.yml.tt2
@@ -95,13 +95,13 @@ flow:
       $avp(size): [2]
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.uuid %]",
         "total",
         "relay",
         "peerout:[% peer_00_host0.id %]",
@@ -137,10 +137,10 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^INVITE sip:004421003@'
+  - '^INVITE sip:[% scenarios.0.responders.1.username %]@'
   - 'Contact: sip:testuser1002@'
   - 'From: <sip:testuser1002@'
-  - 'To: <sip:004421003@'
+  - 'To: <sip:[% scenarios.0.responders.1.username %]@'
   - 'CSeq: 2 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
@@ -150,19 +150,19 @@ sip_out:
       '^SIP/2.0 100 Trying',
       'CSeq: 2 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:004421003@'
+      'To: <sip:[% scenarios.0.responders.1.username %]@'
     ]
   - [
       '^SIP/2.0 101 Connecting',
       '<sip:testuser1002@',
-      'To: <sip:004421003@',
+      'To: <sip:[% scenarios.0.responders.1.username %]@',
       'CSeq: 2 INVITE',
       'P-NGCP-Authorization: testuser1002@',
     ]
   - [
       '^SIP/2.0 403 Maximum parallel calls exceeded',
       'From: <sip:testuser1002@',
-      'To: <sip:004421003@',
+      'To: <sip:[% scenarios.0.responders.1.username %]@',
       'CSeq: 2 INVITE',
       'P-NGCP-Authorization: testuser1002@',
       'P-NGCP-Authorized: 1'
diff --git a/scenarios/invite_concurrent_max_out_per_account/0025_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0025_test.yml.tt2
index e0d3c47e..84c2af3e 100644
--- a/scenarios/invite_concurrent_max_out_per_account/0025_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out_per_account/0025_test.yml.tt2
@@ -30,7 +30,7 @@ sip_in:
   - '^BYE'
   - 'Contact: sip:testuser1002@'
   - 'From: <sip:testuser1002@'
-  - 'To: <sip:004321001@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
   - 'CSeq: 6 BYE'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
@@ -39,13 +39,13 @@ sip_out:
       '^SIP/2.0 100 Trying',
       'CSeq: 6 BYE',
       'From: <sip:testuser1002@',
-      'To: <sip:004321001@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'Content-Length: 0'
     ]
   - [
       '^BYE',
-      'From: <sip:4311002@',
-      'To: <sip:004321001@',
+      'From: <sip:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'CSeq: 6 BYE',
       'Content-Length: 0'
     ]
diff --git a/scenarios/invite_concurrent_max_out_per_account/0028_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0028_test.yml.tt2
index 04860236..e2cae926 100644
--- a/scenarios/invite_concurrent_max_out_per_account/0028_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out_per_account/0028_test.yml.tt2
@@ -16,13 +16,13 @@ sip_in:
   - '^SIP/2.0 200 OK'
   - 'CSeq: 6 BYE'
   - 'Content-Length: 0'
-  - 'From: <sip:4311002@'
-  - 'To: <sip:004321001@'
+  - 'From: <sip:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.phone_number %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: 6 BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
-      'To: <sip:004321001@'
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_concurrent_max_out_per_account/cdr_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/cdr_test.yml.tt2
index dd6c3459..739f9051 100644
--- a/scenarios/invite_concurrent_max_out_per_account/cdr_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out_per_account/cdr_test.yml.tt2
@@ -1,19 +1,19 @@
 cdr:
   - source_user: 'testuser1002'
-    source_domain: 'spce.test'
-    source_cli: '4311002'
-    destination_user: '004321001'
-    destination_domain: '127.0.2.1'
-    destination_user_dialed: '004321001'
+    source_domain: 'invite-concurrent-max-out-per-account.scenarios.test'
+    source_cli: '[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.phone_number %]'
+    destination_user: '[% scenarios.0.responders.0.username %]'
+    destination_domain: '[% scenarios.0.responders.0.ip %]'
+    destination_user_dialed: '[% scenarios.0.responders.0.username %]'
     call_type: 'call'
     call_status: 'ok'
     call_code: '200'
   - source_user: 'testuser1002'
-    source_domain: 'spce.test'
-    source_cli: '4311002'
-    destination_user: '004421003'
-    destination_domain: '127.0.2.1'
-    destination_user_dialed: '004421003'
+    source_domain: 'invite-concurrent-max-out-per-account.scenarios.test'
+    source_cli: '[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.phone_number %]'
+    destination_user: '[% scenarios.0.responders.1.username %]'
+    destination_domain: '[% scenarios.0.responders.0.ip %]'
+    destination_user_dialed: '[% scenarios.0.responders.1.username %]'
     call_type: 'call'
     call_status: 'other'
     call_code: '403'
diff --git a/scenarios/invite_concurrent_max_out_per_account/peer.yml b/scenarios/invite_concurrent_max_out_per_account/peer.yml
index e95ee59c..b9936ae8 100644
--- a/scenarios/invite_concurrent_max_out_per_account/peer.yml
+++ b/scenarios/invite_concurrent_max_out_per_account/peer.yml
@@ -1,51 +1,51 @@
 ---
-peer_00:
+peer_00_invite_concurrent_max_out_per_account:
   contact:
-    company: peer_00
-    email: peer_00@host0.not
+    company: peer_00_invite_concurrent_max_out_per_account
+    email: peer_00_invite_concurrent_max_out_per_account@host0.not
   contract:
     billing_profile_id: 1
     status: active
     type: sippeering
   groups:
-    - name: peer_00_group
+    - name: peer_00_invite_concurrent_max_out_per_account_group
       priority: 1
       description:
   rules:
-    - group_id: peer_00_group
+    - group_id: peer_00_invite_concurrent_max_out_per_account_group
       callee_prefix: ""
       callee_pattern: ''
-      caller_pattern: '^sip:.+@spce.test'
+      caller_pattern: '^sip:.+@invite-concurrent-max-out-per-account.scenarios.test'
       description: ""
   hosts:
-    - group_id: peer_00_group
-      name: peer_00_host0
+    - group_id: peer_00_invite_concurrent_max_out_per_account_group
+      name: peer_00_invite_concurrent_max_out_per_account_host0
       ip: 127.0.2.1
       port: 51602
       host:
       transport: 1
       weight: 1
-peer_01:
+peer_01_invite_concurrent_max_out_per_account:
   contact:
-    company: peer_01
-    email: peer_01@host1.not
+    company: peer_01_invite_concurrent_max_out_per_account
+    email: peer_01_invite_concurrent_max_out_per_account@host1.not
   contract:
     billing_profile_id: 1
     status: active
     type: sippeering
   groups:
-    - name: peer_01_group
+    - name: peer_01_invite_concurrent_max_out_per_account_group
       priority: 1
       description:
   rules:
-    - group_id: peer_01_group
+    - group_id: peer_01_invite_concurrent_max_out_per_account_group
       callee_prefix: ""
       callee_pattern: '^44.+'
-      caller_pattern: '^sip:.+@spce.test'
+      caller_pattern: '^sip:.+@invite-concurrent-max-out-per-account.scenarios.test'
       description: ""
   hosts:
-    - group_id: peer_01_group
-      name: peer_01_host0
+    - group_id: peer_01_invite_concurrent_max_out_per_account_group
+      name: peer_01_invite_concurrent_max_out_per_account_host1
       ip: 127.0.3.1
       port: 50607
       host:
diff --git a/scenarios/invite_concurrent_max_out_per_account/prefs.json b/scenarios/invite_concurrent_max_out_per_account/prefs.json
deleted file mode 100644
index 3c0f0098..00000000
--- a/scenarios/invite_concurrent_max_out_per_account/prefs.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "testuser1002@spce.test": {
-        "concurrent_max_out_per_account": 1
-    },
-    "peer_00_host0": {
-        "concurrent_max": 10
-    },
-    "peer_01_host0": {
-        "concurrent_max": 10
-    }
-}
diff --git a/scenarios/invite_concurrent_max_out_per_account/prefs.json.tt2 b/scenarios/invite_concurrent_max_out_per_account/prefs.json.tt2
new file mode 100644
index 00000000..066a1e81
--- /dev/null
+++ b/scenarios/invite_concurrent_max_out_per_account/prefs.json.tt2
@@ -0,0 +1,11 @@
+{
+    "testuser1002@invite-concurrent-max-out-per-account.scenarios.test": {
+        "concurrent_max_out_per_account": 1
+    },
+    "peer_00_invite_concurrent_max_out_per_account_host0": {
+        "concurrent_max": 10
+    },
+    "peer_01_invite_concurrent_max_out_per_account_host1": {
+        "concurrent_max": 10
+    }
+}
diff --git a/scenarios/invite_concurrent_max_out_per_account/scenario.yml b/scenarios/invite_concurrent_max_out_per_account/scenario.yml
index 7a0b7c67..7ecd8bcf 100644
--- a/scenarios/invite_concurrent_max_out_per_account/scenario.yml
+++ b/scenarios/invite_concurrent_max_out_per_account/scenario.yml
@@ -1,6 +1,7 @@
+---
 test_uuid: invite_concurrent_max_out_per_account
 domains:
-  'spce.test':
+  invite-concurrent-max-out-per-account.scenarios.test:
     reseller_id: 1
 customers:
   'customer.test':
@@ -13,7 +14,7 @@ customers:
       billing_profile_id: 1
       reseller_id: 1
 subscribers:
-  spce.test:
+  invite-concurrent-max-out-per-account.scenarios.test:
     testuser1002:
       customer: 'customer.test'
       password: testuser
@@ -23,17 +24,17 @@ subscribers:
 scenarios:
   - ip: 127.126.0.1
     username: testuser1002
-    domain: spce.test
+    domain: invite-concurrent-max-out-per-account.scenarios.test
     responders:
       - ip: 127.0.2.1
         number: 004321001
         username: 004321001
-        domain: spce.test
-        peer_host: peer_00_host0
-        register: no
+        domain: invite-concurrent-max-out-per-account.scenarios.test
+        peer_host: peer_00_invite_concurrent_max_out_per_account_host0
+        register: 'no'
       - ip: 127.0.3.1
         number: 004421003
         username: 004421003
-        domain: spce.test
-        peer_host: peer_00_host1
-        register: no
+        domain: invite-concurrent-max-out-per-account.scenarios.test
+        peer_host: peer_01_invite_concurrent_max_out_per_account_host1
+        register: 'no'