diff --git a/scenarios/invite_hm_peerout/0001_test.yml.tt2 b/scenarios/invite_hm_peerout/0001_test.yml.tt2
index 72a51010..aab6ff9c 100644
--- a/scenarios/invite_hm_peerout/0001_test.yml.tt2
+++ b/scenarios/invite_hm_peerout/0001_test.yml.tt2
@@ -21,9 +21,9 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^INVITE sip:004321001@'
-  - 'Contact: sip:testuser1002@'
-  - 'To: <sip:004321001@'
+  - '^INVITE sip:[% scenarios.0.responders.0.username %]@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
@@ -31,12 +31,12 @@ sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 1 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:004321001@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
   - [
       '^SIP/2.0 407 Proxy Authentication Required',
       'CSeq: 1 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:004321001@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_hm_peerout/0003_test.yml.tt2 b/scenarios/invite_hm_peerout/0003_test.yml.tt2
index c6e5bd43..d23b1a3e 100644
--- a/scenarios/invite_hm_peerout/0003_test.yml.tt2
+++ b/scenarios/invite_hm_peerout/0003_test.yml.tt2
@@ -83,8 +83,8 @@ flow:
   - start|ROUTE_OUTBOUND:
       $avp(lua_dlg_profile): [
         "relay",
-        "peerout:[% peer_00_host0.id %]",
-        "peer:[% peer_00_host0.id %]",
+        "peerout:[% peer_invite_hm_peerout_host0.id %]",
+        "peer:[% peer_invite_hm_peerout_host0.id %]",
         "outgoing"
       ]
   - start|ROUTE_SET_CALLER_DIALOG:
@@ -93,17 +93,17 @@ flow:
   - return|ROUTE_SET_CALLER_DIALOG:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_hm_peerout_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_hm_peerout_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_hm_peerout_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_hm_peerout_scenarios_test.testuser1002.uuid %]",
         "total",
         "relay",
-        "peerout:[% peer_00_host0.id %]",
-        "peer:[% peer_00_host0.id %]",
+        "peerout:[% peer_invite_hm_peerout_host0.id %]",
+        "peer:[% peer_invite_hm_peerout_host0.id %]",
         "outgoing"
       ]
   - start|ROUTE_ACC_CALLER:
@@ -166,50 +166,50 @@ flow:
   - exit|ROUTE_EXIT:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_hm_peerout_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_hm_peerout_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_hm_peerout_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_hm_peerout_scenarios_test.testuser1002.uuid %]",
         "total",
         "relay",
-        "peerout:[% peer_00_host0.id %]",
-        "peer:[% peer_00_host0.id %]",
+        "peerout:[% peer_invite_hm_peerout_host0.id %]",
+        "peer:[% peer_invite_hm_peerout_host0.id %]",
         "outgoing"
       ]
 sip_in:
-  - '^INVITE sip:004321001@'
-  - 'Contact: sip:testuser1002@'
+  - '^INVITE sip:[% scenarios.0.responders.0.username %]@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
   - 'CSeq: 2 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
-  - 'Proxy-Authorization: Digest username="testuser1002"'
+  - 'Proxy-Authorization: Digest username="[% scenarios.0.username %]"'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 2 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:004321001@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
   - [
       '^SIP/2.0 101 Connecting',
       'CSeq: 2 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:004321001@'
+      'From: <sip:[% scenarios.0.username %]@',
+      '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_hm_peerout_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-Caller-UUID: [% invite_hm_peerout_scenarios_test.testuser1002.uuid %]',
+      'P-Callee-UUID: 0',
+      'P-Asserted-Identity: <sip:[% invite_hm_peerout_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',
-      'OutboundHeader: 4311002'
+      'OutboundHeader: [% invite_hm_peerout_scenarios_test.testuser1002.phone_number %]'
     ]
diff --git a/scenarios/invite_hm_peerout/0005_test.yml.tt2 b/scenarios/invite_hm_peerout/0005_test.yml.tt2
index 4d90a037..3486e975 100644
--- a/scenarios/invite_hm_peerout/0005_test.yml.tt2
+++ b/scenarios/invite_hm_peerout/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_hm_peerout_scenarios_test.testuser1002.phone_number %]@invite-hm-peerout.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=[% customer_test.id %]602;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_hm_peerout_scenarios_test.testuser1002.phone_number %]@invite-hm-peerout.scenarios.test>'
+  - 'P-Caller-UUID: [% invite_hm_peerout_scenarios_test.testuser1002.uuid %]'
+  - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-hm-peerout.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_hm_peerout_scenarios_test.testuser1002.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-hm-peerout.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'
   - 'Content-Length:\s+\d+'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
 sip_out:
   - [
       'SIP/2.0 100 Trying',
-      'From: <sip:4311002@spce.test>;tag=[\w-]+',
-      'To: <sip:004321001@127.0.2.1>',
+      'From: <sip:[% invite_hm_peerout_scenarios_test.testuser1002.phone_number %]@invite-hm-peerout.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_hm_peerout_scenarios_test.testuser1002.phone_number %]@invite-hm-peerout.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=[% customer_test.id %]602;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_hm_peerout_scenarios_test.testuser1002.phone_number %]@invite-hm-peerout.scenarios.test>',
+      'P-Caller-UUID: [% invite_hm_peerout_scenarios_test.testuser1002.uuid %]',
+      'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-hm-peerout.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_hm_peerout_scenarios_test.testuser1002.phone_number %]',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-hm-peerout.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',
       'Content-Length:\s+\d+',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
diff --git a/scenarios/invite_hm_peerout/0008_test.yml.tt2 b/scenarios/invite_hm_peerout/0008_test.yml.tt2
index 96cdf7aa..4380108e 100644
--- a/scenarios/invite_hm_peerout/0008_test.yml.tt2
+++ b/scenarios/invite_hm_peerout/0008_test.yml.tt2
@@ -15,12 +15,12 @@ flow:
 sip_in:
   - '^SIP/2.0 180 Ringing'
   - 'CSeq: 2 INVITE'
-  - 'From: <sip:4311002@'
-  - 'To: <sip:004321001@'
+  - 'From: <sip:[% invite_hm_peerout_scenarios_test.testuser1002.phone_number %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 sip_out:
   - [
       '^SIP/2.0 180 Ringing',
       'CSeq: 2 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:004321001@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
     ]
diff --git a/scenarios/invite_hm_peerout/0010_test.yml.tt2 b/scenarios/invite_hm_peerout/0010_test.yml.tt2
index 6ad4ff6a..ae7e7309 100644
--- a/scenarios/invite_hm_peerout/0010_test.yml.tt2
+++ b/scenarios/invite_hm_peerout/0010_test.yml.tt2
@@ -17,29 +17,29 @@ flow:
   - return|dialog:start:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_hm_peerout_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_hm_peerout_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_hm_peerout_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_hm_peerout_scenarios_test.testuser1002.uuid %]",
         "total",
         "relay",
-        "peerout:[% peer_00_host0.id %]",
-        "peer:[% peer_00_host0.id %]",
+        "peerout:[% peer_invite_hm_peerout_host0.id %]",
+        "peer:[% peer_invite_hm_peerout_host0.id %]",
         "outgoing"
       ]
   - return|dialog:start:
 sip_in:
   - '^SIP/2.0 200 OK'
   - 'CSeq: 2 INVITE'
-  - 'From: <sip:4311002@'
-  - 'To: <sip:004321001@'
+  - 'From: <sip:[% invite_hm_peerout_scenarios_test.testuser1002.phone_number %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: 2 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:004321001@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
     ]
diff --git a/scenarios/invite_hm_peerout/0011_test.yml.tt2 b/scenarios/invite_hm_peerout/0011_test.yml.tt2
index 7856b28b..cf6ff92e 100644
--- a/scenarios/invite_hm_peerout/0011_test.yml.tt2
+++ b/scenarios/invite_hm_peerout/0011_test.yml.tt2
@@ -25,13 +25,13 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - 'ACK sip:127.0.0.1:508[08];prxroute=1 SIP/2.0'
-  - 'From: <sip:testuser1002@spce.test>;tag=[\w-]+'
-  - 'To: <sip:004321001@spce.test>;tag=[\w-]+'
+  - 'From: <sip:[% scenarios.0.username %]@invite-hm-peerout.scenarios.test>;tag=[\w-]+'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-hm-peerout.scenarios.test>;tag=[\w-]+'
   - 'CSeq: \d+ ACK'
-  - 'Contact: sip:testuser1002@127.126.0.1:\d+'
+  - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]'
   - 'Content-Length: 0'
-  - 'P-NGCP-Src-Ip: 127.126.0.1'
-  - 'P-NGCP-Src-Port: [% customer_test.id %]602'
+  - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
+  - 'P-NGCP-Src-Port: [% scenarios.0.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
   - 'P-Sock-Info: udp:127.0.0.1:5060'
@@ -39,13 +39,13 @@ sip_in:
 sip_out:
   - [
       'ACK sip:127.0.0.1:508[08];prxroute=1 SIP/2.0',
-      'From: <sip:4311002@spce.test>;tag=[\w-]+',
-      'To: <sip:004321001@spce.test>;tag=[\w-]+',
+      'From: <sip:[% invite_hm_peerout_scenarios_test.testuser1002.phone_number %]@invite-hm-peerout.scenarios.test>;tag=[\w-]+',
+      'To: <sip:[% scenarios.0.responders.0.username %]@invite-hm-peerout.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ ACK',
-      'Contact: sip:testuser1002@127.126.0.1:\d+',
+      'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]',
       'Content-Length: 0',
-      'P-NGCP-Src-Ip: 127.126.0.1',
-      'P-NGCP-Src-Port: [% customer_test.id %]602',
+      'P-NGCP-Src-Ip: [% scenarios.0.ip %]',
+      'P-NGCP-Src-Port: [% scenarios.0.port %]',
       'P-NGCP-Src-Proto: udp',
       'P-NGCP-Src-Af: 4',
       'P-Sock-Info: udp:127.0.0.1:5060',
diff --git a/scenarios/invite_hm_peerout/0013_test.yml.tt2 b/scenarios/invite_hm_peerout/0013_test.yml.tt2
index b954a595..be0e9325 100644
--- a/scenarios/invite_hm_peerout/0013_test.yml.tt2
+++ b/scenarios/invite_hm_peerout/0013_test.yml.tt2
@@ -30,27 +30,27 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:testuser1002@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:004321001@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 3 BYE',
       'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:004321001@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
   - [
       '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:testuser1002@',
+      'Contact: sip:[% scenarios.0.username %]@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',
-      'From: <sip:4311002@',
-      'To: <sip:004321001@'
+      'From: <sip:[% invite_hm_peerout_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_hm_peerout/0016_test.yml.tt2 b/scenarios/invite_hm_peerout/0016_test.yml.tt2
index 439a609b..7bb1a828 100644
--- a/scenarios/invite_hm_peerout/0016_test.yml.tt2
+++ b/scenarios/invite_hm_peerout/0016_test.yml.tt2
@@ -16,13 +16,13 @@ sip_in:
   - '^SIP/2.0 200 OK'
   - 'CSeq: 3 BYE'
   - 'Content-Length: 0'
-  - 'From: <sip:4311002@'
-  - 'To: <sip:004321001@'
+  - 'From: <sip:[% invite_hm_peerout_scenarios_test.testuser1002.phone_number %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: 3 BYE',
       'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:004321001@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_hm_peerout/cdr_test.yml.tt2 b/scenarios/invite_hm_peerout/cdr_test.yml.tt2
index 6667f5a0..e6bbf55d 100644
--- a/scenarios/invite_hm_peerout/cdr_test.yml.tt2
+++ b/scenarios/invite_hm_peerout/cdr_test.yml.tt2
@@ -1,10 +1,10 @@
 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_user: '[% scenarios.0.username %]'
+    source_domain: 'invite-hm-peerout.scenarios.test'
+    source_cli: '[% invite_hm_peerout_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'
\ No newline at end of file
diff --git a/scenarios/invite_hm_peerout/header.yml b/scenarios/invite_hm_peerout/header.yml
index c5269a75..bb5c4468 100644
--- a/scenarios/invite_hm_peerout/header.yml
+++ b/scenarios/invite_hm_peerout/header.yml
@@ -1,9 +1,10 @@
-hm_00:
+---
+hm_invite_hm_peerout_00:
   header_rules:
   - data:
       direction: inbound
       description: Empty Manipulation
-      name: hm_00_00
+      name: hm_invite_hm_peerout_00_00
       stopper: 0
       enabled: 0
       priority: 48
@@ -12,7 +13,7 @@ hm_00:
   - data:
       direction: inbound
       description: Add TestTest Header
-      name: hm_00_01
+      name: hm_invite_hm_peerout_00_01
       stopper: 0
       enabled: 1
       priority: 50
@@ -26,7 +27,7 @@ hm_00:
       value_type: input
       values:
       - value: testuser1002
-      rwr_set_id: 
+      rwr_set_id:
     actions:
     - enabled: 1
       action_type: add
@@ -34,11 +35,11 @@ hm_00:
       header_part: full
       value: new_internal_header
       value_part: full
-      rwr_set_id: 
+      rwr_set_id:
   - data:
       direction: local
       description: Edit TestTest Local Header
-      name: hm_00_02
+      name: hm_invite_hm_peerout_00_02
       stopper: 0
       enabled: 1
       priority: 51
@@ -52,7 +53,7 @@ hm_00:
       value_type: input
       values:
       - value: new_internal_header
-      rwr_set_id: 
+      rwr_set_id:
     actions:
     - enabled: 1
       action_type: set
@@ -60,11 +61,11 @@ hm_00:
       header_part: full
       value: updated_local_header
       value_part: full
-      rwr_set_id: 
+      rwr_set_id:
   - data:
       direction: peer
       description: Edit TestTest Peer Header
-      name: hm_00_03
+      name: hm_invite_hm_peerout_00_03
       stopper: 0
       enabled: 1
       priority: 52
@@ -78,21 +79,21 @@ hm_00:
       value_type: input
       values:
       - value: '^new[\w]+$'
-      rwr_set_id: 
+      rwr_set_id:
     actions:
     - enabled: 1
       action_type: remove
       header: TestTest
       header_part: full
-      value: 
+      value:
       value_part: full
-      rwr_set_id: 
-hm_01:
+      rwr_set_id:
+hm_invite_hm_peerout_01:
   header_rules:
   - data:
       direction: outbound
       description: Add OutboundHeader as AVP
-      name: hm_01_00
+      name: hm_invite_hm_peerout_01_00
       stopper: 1
       enabled: 1
       priority: 60
@@ -105,8 +106,8 @@ hm_01:
       expression_negation: 0
       value_type: input
       values:
-      - value: '<sip:004321001@spce.test>'
-      rwr_set_id: 
+      - value: '<sip:004321001@invite-hm-peerout.scenarios.test>'
+      rwr_set_id:
     actions:
     - enabled: 1
       action_type: add
@@ -114,11 +115,11 @@ hm_01:
       header_part: full
       value: '$avp(s:caller_cli_userprov)'
       value_part: full
-      rwr_set_id: 
+      rwr_set_id:
   - data:
       direction: outbound
       description: Should not be executed
-      name: hm_01_01
+      name: hm_invite_hm_peerout_01_01
       stopper: 0
       enabled: 1
       priority: 61
@@ -132,19 +133,19 @@ hm_01:
       value_type: input
       values:
       - value: '.*'
-      rwr_set_id: 
+      rwr_set_id:
     actions:
     - enabled: 1
       action_type: remove
       header: From
       header_part: full
-      value: 
+      value:
       value_part: full
-      rwr_set_id: 
+      rwr_set_id:
     - enabled: 1
       action_type: remove
       header: To
       header_part: full
-      value: 
+      value:
       value_part: full
-      rwr_set_id: 
\ No newline at end of file
+      rwr_set_id:
\ No newline at end of file
diff --git a/scenarios/invite_hm_peerout/peer.yml b/scenarios/invite_hm_peerout/peer.yml
index 4a462cc2..35af4bd5 100644
--- a/scenarios/invite_hm_peerout/peer.yml
+++ b/scenarios/invite_hm_peerout/peer.yml
@@ -1,25 +1,25 @@
 ---
-peer_00:
+peer_invite_hm_peerout:
   contact:
-    company: peer_00
+    company: peer_invite_hm_peerout
     email: peer_00@host0.not
   contract:
     billing_profile_id: 1
     status: active
     type: sippeering
   groups:
-    - name: peer_00_group
+    - name: peer_invite_hm_peerout_group
       priority: 1
       description:
   rules:
-    - group_id: peer_00_group
+    - group_id: peer_invite_hm_peerout_group
       callee_prefix: ""
       callee_pattern: ''
-      caller_pattern: '^sip:.+@spce.test'
+      caller_pattern: '^sip:.+@invite-hm-peerout.scenarios.test'
       description: ""
   hosts:
-    - group_id: peer_00_group
-      name: peer_00_host0
+    - group_id: peer_invite_hm_peerout_group
+      name: peer_invite_hm_peerout_host0
       ip: 127.0.2.1
       port: 51602
       host:
diff --git a/scenarios/invite_hm_peerout/prefs.json b/scenarios/invite_hm_peerout/prefs.json
deleted file mode 100644
index ebe93a57..00000000
--- a/scenarios/invite_hm_peerout/prefs.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "testuser1002@spce.test": {
-        "header_rule_set": "hm_00"
-    },
-    "peer_00_host0": {
-        "concurrent_max": 1,
-        "header_rule_set": "hm_01"
-    }
-}
diff --git a/scenarios/invite_hm_peerout/prefs.json.tt2 b/scenarios/invite_hm_peerout/prefs.json.tt2
new file mode 100644
index 00000000..1baa681b
--- /dev/null
+++ b/scenarios/invite_hm_peerout/prefs.json.tt2
@@ -0,0 +1,9 @@
+{
+    "[% scenarios.0.username %]@invite-hm-peerout.scenarios.test": {
+        "header_rule_set": "hm_invite_hm_peerout_00"
+    },
+    "peer_invite_hm_peerout_host0": {
+        "concurrent_max": 1,
+        "header_rule_set": "hm_invite_hm_peerout_01"
+    }
+}
diff --git a/scenarios/invite_hm_peerout/scenario.yml b/scenarios/invite_hm_peerout/scenario.yml
index db21baa0..56919991 100644
--- a/scenarios/invite_hm_peerout/scenario.yml
+++ b/scenarios/invite_hm_peerout/scenario.yml
@@ -1,6 +1,7 @@
+---
 test_uuid: invite_hm_peerout
 domains:
-  'spce.test':
+  invite-hm-peerout.scenarios.test:
     reseller_id: 1
 customers:
   'customer.test':
@@ -13,7 +14,7 @@ customers:
       billing_profile_id: 1
       reseller_id: 1
 subscribers:
-  spce.test:
+  invite-hm-peerout.scenarios.test:
     testuser1002:
       customer: 'customer.test'
       password: testuser
@@ -23,11 +24,11 @@ subscribers:
 scenarios:
   - ip: 127.126.0.1
     username: testuser1002
-    domain: spce.test
+    domain: invite-hm-peerout.scenarios.test
     responders:
       - ip: 127.0.2.1
         number: 004321001
         username: 004321001
-        domain: spce.test
-        peer_host: peer_00_host0
-        register: no
+        domain: invite-hm-peerout.scenarios.test
+        peer_host: peer_invite_hm_peerout_host0
+        register: 'no'