diff --git a/scenarios/invite_hm/0003_test.yml.tt2 b/scenarios/invite_hm/0003_test.yml.tt2
index 2ed92a4e..3f696341 100644
--- a/scenarios/invite_hm/0003_test.yml.tt2
+++ b/scenarios/invite_hm/0003_test.yml.tt2
@@ -22,8 +22,8 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE'
-  - 'Contact: sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
+  - '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:testuser1003@'
+      '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:testuser1003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_hm/0005_test.yml.tt2 b/scenarios/invite_hm/0005_test.yml.tt2
index e1519727..5bc837c7 100644
--- a/scenarios/invite_hm/0005_test.yml.tt2
+++ b/scenarios/invite_hm/0005_test.yml.tt2
@@ -17,12 +17,12 @@ flow:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_AUTH_HELPER:
-      $x_hdr(From): spce.test
-      $var(realm_user): testuser1002
-      $var(realm_domain): spce.test
+      $x_hdr(From): invite-hm.scenarios.test
+      $var(realm_user): [% scenarios.0.username %]
+      $var(realm_domain): invite-hm.scenarios.test
   - return|ROUTE_AUTH_HELPER:
-      $avp(orig_acc_caller_user): ['testuser1002']
-      $avp(orig_acc_caller_domain): ['spce.test']
+      $avp(orig_acc_caller_user): ['[% scenarios.0.username %]']
+      $avp(orig_acc_caller_domain): ['invite-hm.scenarios.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
   - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
@@ -65,10 +65,10 @@ flow:
   - return|ROUTE_SET_CALLEE_DIALOG:
       $avp(lua_dlg_profile): [
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_hm_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_hm_scenarios_test.testuser1003.uuid %]"
       ]
   - start|ROUTE_BLOCK_IN:
   - return|ROUTE_BLOCK_IN:
@@ -102,29 +102,29 @@ flow:
       $avp(lua_dlg_profile): [
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_hm_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_hm_scenarios_test.testuser1003.uuid %]"
       ]
   - start|ROUTE_CNT_DLG_CHECK:
   - return|ROUTE_CNT_DLG_CHECK:
   - return|ROUTE_SET_CALLER_DIALOG:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_hm_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_hm_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_hm_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_hm_scenarios_test.testuser1002.uuid %]",
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_hm_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_hm_scenarios_test.testuser1003.uuid %]"
       ]
   - start|ROUTE_ACC_CALLER:
   - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS:
@@ -191,50 +191,50 @@ flow:
   - exit|ROUTE_EXIT:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_hm_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_hm_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_hm_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_hm_scenarios_test.testuser1002.uuid %]",
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_hm_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_hm_scenarios_test.testuser1003.uuid %]"
       ]
 sip_in:
   - '^INVITE'
-  - 'Contact: sip:testuser1002@'
+  - '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:testuser1003@'
+      '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:testuser1003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
   - [
-      '^INVITE sip:testuser1003@',
+      '^INVITE sip:[% scenarios.0.responders.0.username %]@',
       'CSeq: 2 INVITE',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1003@',
+      'From: <sip:[% invite_hm_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'Content-Type: application/sdp',
-      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
-      'P-Callee-UUID: [% spce_test.testuser1003.uuid %]',
+      'P-Caller-UUID: [% invite_hm_scenarios_test.testuser1002.uuid %]',
+      'P-Callee-UUID: [% invite_hm_scenarios_test.testuser1003.uuid %]',
       'P-Asserted-Identity: <sip:11111111@',
-      'P-Called-Party-ID: <sip:testuser1003@',
+      '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',
       'TestTest: updated_local_header'
diff --git a/scenarios/invite_hm/0007_test.yml.tt2 b/scenarios/invite_hm/0007_test.yml.tt2
index 069e00a9..eb4c1de7 100644
--- a/scenarios/invite_hm/0007_test.yml.tt2
+++ b/scenarios/invite_hm/0007_test.yml.tt2
@@ -13,15 +13,15 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - 'INVITE sip:testuser1003@127.1.0.1:\d+ SIP/2.0'
-  - 'From: <sip:4311002@spce.test>;tag=[\w-]+'
-  - 'To: <sip:testuser1003@spce.test>'
+  - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
+  - 'From: <sip:[% invite_hm_scenarios_test.testuser1002.phone_number %]@invite-hm.scenarios.test>;tag=[\w-]+'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-hm.scenarios.test>'
   - 'CSeq: \d+ INVITE'
   - 'P-LB-Uptime: \d+'
-  - 'P-Asserted-Identity: <sip:11111111@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:testuser1003@spce.test>;ip=127.0.0.1;port=5060;primary=4311003'
+  - 'P-Asserted-Identity: <sip:11111111@invite-hm.scenarios.test>'
+  - 'P-Caller-UUID: [% invite_hm_scenarios_test.testuser1002.uuid %]'
+  - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-hm.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_hm_scenarios_test.testuser1002.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-hm.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_hm_scenarios_test.testuser1003.phone_number %]'
   - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060'
   - 'Content-Type: application/sdp'
   - 'Content-Length:\s+\d+'
@@ -29,22 +29,22 @@ sip_in:
 sip_out:
   - [
       'SIP/2.0 100 Trying',
-      'From: <sip:4311002@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@spce.test>',
+      'From: <sip:[% invite_hm_scenarios_test.testuser1002.phone_number %]@invite-hm.scenarios.test>;tag=[\w-]+',
+      'To: <sip:[% scenarios.0.responders.0.username %]@invite-hm.scenarios.test>',
       'CSeq: \d+ INVITE',
       'Server: Sipwise NGCP Proxy',
       'Content-Length: 0',
     ]
   - [
-      'INVITE sip:testuser1003@127.1.0.1:\d+ SIP/2.0',
-      'From: <sip:4311002@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@spce.test>',
+      'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0',
+      'From: <sip:[% invite_hm_scenarios_test.testuser1002.phone_number %]@invite-hm.scenarios.test>;tag=[\w-]+',
+      'To: <sip:[% scenarios.0.responders.0.username %]@invite-hm.scenarios.test>',
       'CSeq: \d+ INVITE',
       'P-LB-Uptime: \d+',
-      'P-Asserted-Identity: <sip:11111111@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:testuser1003@spce.test>;ip=127.0.0.1;port=5060;primary=4311003',
+      'P-Asserted-Identity: <sip:11111111@invite-hm.scenarios.test>',
+      'P-Caller-UUID: [% invite_hm_scenarios_test.testuser1002.uuid %]',
+      'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-hm.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_hm_scenarios_test.testuser1002.phone_number %]',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-hm.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_hm_scenarios_test.testuser1003.phone_number %]',
       'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060',
       'Content-Type: application/sdp',
       'Content-Length:\s+\d+',
diff --git a/scenarios/invite_hm/0012_test.yml.tt2 b/scenarios/invite_hm/0012_test.yml.tt2
index 92b495e0..46f21cc6 100644
--- a/scenarios/invite_hm/0012_test.yml.tt2
+++ b/scenarios/invite_hm/0012_test.yml.tt2
@@ -17,19 +17,19 @@ flow:
   - return|dialog:start:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_hm_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_hm_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_hm_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_hm_scenarios_test.testuser1002.uuid %]",
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_hm_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_hm_scenarios_test.testuser1003.uuid %]"
       ]
   - return|dialog:start:
 sip_in:
@@ -39,8 +39,8 @@ sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: 2 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'ReplyOnlySecond: this_is_second_reply',
       'ReplyOnlyFirst: this_is_first_reply'
     ]
diff --git a/scenarios/invite_hm/0013_test.yml.tt2 b/scenarios/invite_hm/0013_test.yml.tt2
index c3889190..9a1a8015 100644
--- a/scenarios/invite_hm/0013_test.yml.tt2
+++ b/scenarios/invite_hm/0013_test.yml.tt2
@@ -26,12 +26,12 @@ flow:
 sip_in:
   - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 sip_out:
   - [
       '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% invite_hm_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_hm/0015_test.yml.tt2 b/scenarios/invite_hm/0015_test.yml.tt2
index 54eac48e..f3a50446 100644
--- a/scenarios/invite_hm/0015_test.yml.tt2
+++ b/scenarios/invite_hm/0015_test.yml.tt2
@@ -29,27 +29,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:testuser1003@'
+  - '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:testuser1003@'
+      '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:testuser1003@'
+      'From: <sip:[% invite_hm_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_hm/0018_test.yml.tt2 b/scenarios/invite_hm/0018_test.yml.tt2
index 550fc7b1..801cd008 100644
--- a/scenarios/invite_hm/0018_test.yml.tt2
+++ b/scenarios/invite_hm/0018_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:testuser1003@'
+  - 'From: <sip:[% invite_hm_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:testuser1003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_hm/cdr_test.yml.tt2 b/scenarios/invite_hm/cdr_test.yml.tt2
index 7e903ea7..40ca1cdb 100644
--- a/scenarios/invite_hm/cdr_test.yml.tt2
+++ b/scenarios/invite_hm/cdr_test.yml.tt2
@@ -1,10 +1,10 @@
 cdr:
-  - source_user: 'testuser1002'
-    source_domain: 'spce.test'
-    source_cli: '4311002'
-    destination_user: 'testuser1003'
-    destination_domain: 'spce.test'
-    destination_user_dialed: 'testuser1003'
+  - source_user: '[% scenarios.0.username %]'
+    source_domain: 'invite-hm.scenarios.test'
+    source_cli: '[% invite_hm_scenarios_test.testuser1002.phone_number %]'
+    destination_user: '[% scenarios.0.responders.0.username %]'
+    destination_domain: 'invite-hm.scenarios.test'
+    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/header.yml b/scenarios/invite_hm/header.yml
index 398c2f56..eadce9ba 100644
--- a/scenarios/invite_hm/header.yml
+++ b/scenarios/invite_hm/header.yml
@@ -1,9 +1,10 @@
-hm_00:
+---
+hm_invite_hm_00:
   header_rules:
   - data:
       direction: inbound
       description: Empty Manipulation
-      name: hm_00_00
+      name: hm_invite_hm_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_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_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_00_03
       stopper: 0
       enabled: 1
       priority: 52
@@ -78,19 +79,19 @@ 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: 
+      rwr_set_id:
   - data:
       direction: reply
       description: Add ReplyOnly Headers
-      name: hm_00_04
+      name: hm_invite_hm_00_04
       stopper: 0
       enabled: 1
       priority: 53
@@ -104,7 +105,7 @@ hm_00:
       value_type: input
       values:
       - value: '^.*$'
-      rwr_set_id: 
+      rwr_set_id:
     actions:
     - enabled: 1
       action_type: add
@@ -112,20 +113,20 @@ hm_00:
       header_part: full
       value: this_is_first_reply
       value_part: full
-      rwr_set_id: 
+      rwr_set_id:
     - enabled: 1
       action_type: add
       header: ReplyOnlySecond
       header_part: full
       value: this_is_second_reply
       value_part: full
-      rwr_set_id: 
-hm_01:
+      rwr_set_id:
+hm_invite_hm_01:
   header_rules:
   - data:
       direction: outbound
       description: Edit P-Asserted-Identity
-      name: hm_01_00
+      name: hm_invite_hm_01_00
       stopper: 1
       enabled: 1
       priority: 60
@@ -138,8 +139,8 @@ hm_01:
       expression_negation: 0
       value_type: input
       values:
-      - value: '<sip:testuser1003@spce.test>'
-      rwr_set_id: 
+      - value: '<sip:testuser1003@invite-hm.scenarios.test>'
+      rwr_set_id:
     actions:
     - enabled: 1
       action_type: set
@@ -147,11 +148,11 @@ hm_01:
       header_part: username
       value: 11111111
       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_01_01
       stopper: 0
       enabled: 1
       priority: 61
@@ -165,26 +166,26 @@ 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: 
+      rwr_set_id:
   - data:
       direction: reply
       description: Add NO_ReplyOnly Headers
-      name: hm_01_02
+      name: hm_invite_hm_01_02
       stopper: 0
       enabled: 1
       priority: 62
@@ -198,7 +199,7 @@ hm_01:
       value_type: input
       values:
       - value: '^.*$'
-      rwr_set_id: 
+      rwr_set_id:
     actions:
     - enabled: 1
       action_type: add
@@ -206,11 +207,11 @@ hm_01:
       header_part: full
       value: no this_is_first_reply
       value_part: full
-      rwr_set_id: 
+      rwr_set_id:
     - enabled: 1
       action_type: add
       header: NO_ReplyOnlySecond
       header_part: full
       value: no this_is_second_reply
       value_part: full
-      rwr_set_id: 
\ No newline at end of file
+      rwr_set_id:
diff --git a/scenarios/invite_hm/prefs.json b/scenarios/invite_hm/prefs.json
deleted file mode 100644
index 73e6a755..00000000
--- a/scenarios/invite_hm/prefs.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testuser1002@spce.test": {
-        "header_rule_set": "hm_00"
-    },
-    "testuser1003@spce.test": {
-        "header_rule_set": "hm_01"
-    }
-}
\ No newline at end of file
diff --git a/scenarios/invite_hm/prefs.json.tt2 b/scenarios/invite_hm/prefs.json.tt2
new file mode 100644
index 00000000..ace4617f
--- /dev/null
+++ b/scenarios/invite_hm/prefs.json.tt2
@@ -0,0 +1,8 @@
+{
+    "testuser1002@invite-hm.scenarios.test": {
+        "header_rule_set": "hm_invite_hm_00"
+    },
+    "testuser1003@invite-hm.scenarios.test": {
+        "header_rule_set": "hm_invite_hm_01"
+    }
+}
\ No newline at end of file
diff --git a/scenarios/invite_hm/scenario.yml b/scenarios/invite_hm/scenario.yml
index 6efc42de..356c9101 100644
--- a/scenarios/invite_hm/scenario.yml
+++ b/scenarios/invite_hm/scenario.yml
@@ -1,6 +1,7 @@
+---
 test_uuid: invite_hm
 domains:
-  'spce.test':
+  invite-hm.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.scenarios.test:
     testuser1003:
       customer: 'customer.test'
       password: testuser
@@ -33,9 +34,9 @@ subscribers:
 scenarios:
   - ip: 127.126.0.1
     username: testuser1002
-    domain: spce.test
+    domain: invite-hm.scenarios.test
     responders:
       - ip: 127.1.0.1
         username: testuser1003
-        domain: spce.test
-        register: yes
+        domain: invite-hm.scenarios.test
+        register: 'yes'