diff --git a/scenarios_lnp/invite_peerout/0001_test.yml.tt2 b/scenarios_lnp/invite_peerout/0001_test.yml.tt2
index 72a51010..aab6ff9c 100644
--- a/scenarios_lnp/invite_peerout/0001_test.yml.tt2
+++ b/scenarios_lnp/invite_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_lnp/invite_peerout/0003_test.yml.tt2 b/scenarios_lnp/invite_peerout/0003_test.yml.tt2
index a699dfd0..9b20d36d 100644
--- a/scenarios_lnp/invite_peerout/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0003_test.yml.tt2
@@ -59,7 +59,7 @@ flow:
   - return|ROUTE_CLEAR_CALLEE_PREF:
       $xavp(callee_real_prefs[0]=>lnp_for_local_sub): None
   - start|ROUTE_LNP:
-      $avp(callee_cli): ['004321001']
+      $avp(callee_cli): ['[% scenarios.0.responders.0.username %]']
       $xavp(caller_real_prefs[0]=>lnp_to_rn): None
   - start|ROUTE_APPLY_CALLEE_LNP_RWR:
   - start|ROUTE_APPLY_REWRITE_RULE:
@@ -104,8 +104,8 @@ flow:
   - start|ROUTE_OUTBOUND:
       $avp(lua_dlg_profile): [
         "relay",
-        "peerout:[% peer_00_host0.id %]",
-        "peer:[% peer_00_host0.id %]",
+        "peerout:[% peer_invite_peerout_host0.id %]",
+        "peer:[% peer_invite_peerout_host0.id %]",
         "outgoing"
       ]
   - start|ROUTE_SET_CALLER_DIALOG:
@@ -114,17 +114,17 @@ flow:
   - return|ROUTE_SET_CALLER_DIALOG:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]",
         "total",
         "relay",
-        "peerout:[% peer_00_host0.id %]",
-        "peer:[% peer_00_host0.id %]",
+        "peerout:[% peer_invite_peerout_host0.id %]",
+        "peer:[% peer_invite_peerout_host0.id %]",
         "outgoing"
       ]
   - start|ROUTE_ACC_CALLER:
@@ -202,48 +202,48 @@ flow:
   - exit|ROUTE_EXIT:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]",
         "total",
         "relay",
-        "peerout:[% peer_00_host0.id %]",
-        "peer:[% peer_00_host0.id %]",
+        "peerout:[% peer_invite_peerout_host0.id %]",
+        "peer:[% peer_invite_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:0043test28881001;npdi@',
       'CSeq: 2 INVITE',
-      'From: <sip:4311002@',
-      'To: <sip:004321001@',
+      'From: <sip:[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'Content-Type: application/sdp',
-      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
+      'P-Caller-UUID: [% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]',
       'P-Callee-UUID: 0',
-      'P-Asserted-Identity: <sip:4311002@',
+      'P-Asserted-Identity: <sip:[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]@',
       'P-Called-Party-ID: <sip:0043test28881001;npdi@',
       'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
diff --git a/scenarios_lnp/invite_peerout/0005_test.yml.tt2 b/scenarios_lnp/invite_peerout/0005_test.yml.tt2
index 2a4d85cf..297d91e7 100644
--- a/scenarios_lnp/invite_peerout/0005_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0005_test.yml.tt2
@@ -14,14 +14,14 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - 'INVITE sip:0043test28881001;npdi@127.0.2.1:\d+;transport=udp SIP/2.0'
-  - 'From: <sip:4311002@spce.test>;tag=[\w-]+'
+  - 'From: <sip:[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]@invite-peerout.scenarios-lnp.test>;tag=[\w-]+'
   - 'To: <sip:0043test28881001;npdi@127.0.2.1>'
   - '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-Asserted-Identity: <sip:[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]@invite-peerout.scenarios-lnp.test>'
+  - 'P-Caller-UUID: [% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]'
+  - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-peerout.scenarios-lnp.test>;ip=127.126.0.1;port=\d+;primary=[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-peerout.scenarios-lnp.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'
   - 'Content-Type: application/sdp'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
@@ -29,7 +29,7 @@ sip_in:
 sip_out:
   - [
       'SIP/2.0 100 Trying',
-      'From: <sip:4311002@spce.test>;tag=[\w-]+',
+      'From: <sip:[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]@invite-peerout.scenarios-lnp.test>;tag=[\w-]+',
       'To: <sip:0043test28881001;npdi@127.0.2.1>',
       'CSeq: \d+ INVITE',
       'Server: Sipwise NGCP Proxy',
@@ -37,14 +37,14 @@ sip_out:
     ]
   - [
       'INVITE sip:0043test28881001;npdi@127.0.2.1:\d+;transport=udp SIP/2.0',
-      'From: <sip:4311002@spce.test>;tag=[\w-]+',
+      'From: <sip:[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]@invite-peerout.scenarios-lnp.test>;tag=[\w-]+',
       'To: <sip:0043test28881001;npdi@127.0.2.1>',
       '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-Asserted-Identity: <sip:[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]@invite-peerout.scenarios-lnp.test>',
+      'P-Caller-UUID: [% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]',
+      'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-peerout.scenarios-lnp.test>;ip=127.126.0.1;port=\d+;primary=[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-peerout.scenarios-lnp.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',
       'Content-Type: application/sdp',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
diff --git a/scenarios_lnp/invite_peerout/0008_test.yml.tt2 b/scenarios_lnp/invite_peerout/0008_test.yml.tt2
index 3c96a807..c345558a 100644
--- a/scenarios_lnp/invite_peerout/0008_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0008_test.yml.tt2
@@ -7,17 +7,17 @@ flow:
   - return|ROUTE_APPLY_HEADER_RULES:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]",
         "total",
         "relay",
-        "peerout:[% peer_00_host0.id %]",
-        "peer:[% peer_00_host0.id %]",
+        "peerout:[% peer_invite_peerout_host0.id %]",
+        "peer:[% peer_invite_peerout_host0.id %]",
         "outgoing"
       ]
   - start|ROUTE_PREPARE_UA:
@@ -30,12 +30,12 @@ flow:
 sip_in:
   - '^SIP/2.0 180 Ringing'
   - 'CSeq: 2 INVITE'
-  - 'From: <sip:4311002@'
-  - 'To: <sip:004321001@'
+  - 'From: <sip:[% invite_peerout_scenarios_lnp_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_lnp/invite_peerout/0010_test.yml.tt2 b/scenarios_lnp/invite_peerout/0010_test.yml.tt2
index 6ad4ff6a..3073a7b4 100644
--- a/scenarios_lnp/invite_peerout/0010_test.yml.tt2
+++ b/scenarios_lnp/invite_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_peerout_scenarios_lnp_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]",
         "total",
         "relay",
-        "peerout:[% peer_00_host0.id %]",
-        "peer:[% peer_00_host0.id %]",
+        "peerout:[% peer_invite_peerout_host0.id %]",
+        "peer:[% peer_invite_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_peerout_scenarios_lnp_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_lnp/invite_peerout/0011_test.yml.tt2 b/scenarios_lnp/invite_peerout/0011_test.yml.tt2
index 45b43548..e0d7b65b 100644
--- a/scenarios_lnp/invite_peerout/0011_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0011_test.yml.tt2
@@ -26,20 +26,20 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:testuser1002@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
   - 'CSeq: 2 ACK'
   - '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:
   - [
       '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:testuser1002@',
+      'Contact: sip:[% scenarios.0.username %]@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
       'Content-Length: 0',
-      'From: <sip:4311002@',
-      'To: <sip:004321001@'
+      'From: <sip:[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios_lnp/invite_peerout/0013_test.yml.tt2 b/scenarios_lnp/invite_peerout/0013_test.yml.tt2
index b954a595..31ad46d8 100644
--- a/scenarios_lnp/invite_peerout/0013_test.yml.tt2
+++ b/scenarios_lnp/invite_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_peerout_scenarios_lnp_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios_lnp/invite_peerout/0016_test.yml.tt2 b/scenarios_lnp/invite_peerout/0016_test.yml.tt2
index 439a609b..6447c4db 100644
--- a/scenarios_lnp/invite_peerout/0016_test.yml.tt2
+++ b/scenarios_lnp/invite_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_peerout_scenarios_lnp_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_lnp/invite_peerout/cdr_test.yml.tt2 b/scenarios_lnp/invite_peerout/cdr_test.yml.tt2
index f8fd3f22..2893b75c 100644
--- a/scenarios_lnp/invite_peerout/cdr_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/cdr_test.yml.tt2
@@ -1,10 +1,10 @@
 cdr:
-  - source_user: 'testuser1002'
-    source_domain: 'spce.test'
-    source_cli: '4311002'
+  - source_user: '[% scenarios.0.username %]'
+    source_domain: 'invite-peerout.scenarios-lnp.test'
+    source_cli: '[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]'
     destination_user: '0043test28881001'
     destination_domain: '127.0.2.1'
-    destination_user_dialed: '004321001'
+    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_lnp/invite_peerout/lnp.yml b/scenarios_lnp/invite_peerout/lnp.yml
deleted file mode 100644
index b2ba26df..00000000
--- a/scenarios_lnp/invite_peerout/lnp.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-lnp_test_00:
-  data:
-    name: lnp_test_00
-    prefix: test
-  numbers:
-    - number: '004321001'
-      routing_number: '004328881001'
diff --git a/scenarios_lnp/invite_peerout/lnp.yml.tt2 b/scenarios_lnp/invite_peerout/lnp.yml.tt2
new file mode 100644
index 00000000..5598c5f8
--- /dev/null
+++ b/scenarios_lnp/invite_peerout/lnp.yml.tt2
@@ -0,0 +1,8 @@
+---
+lnp_invite_peerout_lnp_00:
+  data:
+    name: lnp_invite_peerout_lnp_00
+    prefix: test
+  numbers:
+    - number: '[% scenarios.0.responders.0.username %]'
+      routing_number: '[% extra_info.phone_numbers.0 %]'
diff --git a/scenarios_lnp/invite_peerout/peer.yml b/scenarios_lnp/invite_peerout/peer.yml
index 4a462cc2..18231112 100644
--- a/scenarios_lnp/invite_peerout/peer.yml
+++ b/scenarios_lnp/invite_peerout/peer.yml
@@ -1,25 +1,25 @@
 ---
-peer_00:
+peer_invite_peerout:
   contact:
-    company: peer_00
-    email: peer_00@host0.not
+    company: peer_invite_peerout
+    email: peer_invite_peerout@host0.not
   contract:
     billing_profile_id: 1
     status: active
     type: sippeering
   groups:
-    - name: peer_00_group
+    - name: peer_invite_peerout_group
       priority: 1
       description:
   rules:
-    - group_id: peer_00_group
+    - group_id: peer_invite_peerout_group
       callee_prefix: ""
       callee_pattern: ''
-      caller_pattern: '^sip:.+@spce.test'
+      caller_pattern: '^sip:.+@invite-peerout.scenarios-lnp.test'
       description: ""
   hosts:
-    - group_id: peer_00_group
-      name: peer_00_host0
+    - group_id: peer_invite_peerout_group
+      name: peer_invite_peerout_host0
       ip: 127.0.2.1
       port: 51602
       host:
diff --git a/scenarios_lnp/invite_peerout/prefs.json b/scenarios_lnp/invite_peerout/prefs.json
index 64c9420f..882f8c9f 100644
--- a/scenarios_lnp/invite_peerout/prefs.json
+++ b/scenarios_lnp/invite_peerout/prefs.json
@@ -1,10 +1,10 @@
 {
-    "testuser1002@spce.test": {
-        "rewrite_rule_set": "rw_00"
+    "testuser1002@invite-peerout.scenarios-lnp.test": {
+        "rewrite_rule_set": "rw_invite_peerout_lnp"
     },
-    "peer_00_host0": {
+    "peer_invite_peerout_host0": {
         "concurrent_max": 1,
-        "rewrite_rule_set": "rw_00",
+        "rewrite_rule_set": "rw_invite_peerout_lnp",
         "lnp_add_npdi": true
     }
 }
diff --git a/scenarios_lnp/invite_peerout/prefs.json.tt2 b/scenarios_lnp/invite_peerout/prefs.json.tt2
new file mode 100644
index 00000000..882f8c9f
--- /dev/null
+++ b/scenarios_lnp/invite_peerout/prefs.json.tt2
@@ -0,0 +1,10 @@
+{
+    "testuser1002@invite-peerout.scenarios-lnp.test": {
+        "rewrite_rule_set": "rw_invite_peerout_lnp"
+    },
+    "peer_invite_peerout_host0": {
+        "concurrent_max": 1,
+        "rewrite_rule_set": "rw_invite_peerout_lnp",
+        "lnp_add_npdi": true
+    }
+}
diff --git a/scenarios_lnp/invite_peerout/rewrite.yml b/scenarios_lnp/invite_peerout/rewrite.yml
index 2f881fd3..759b5695 100644
--- a/scenarios_lnp/invite_peerout/rewrite.yml
+++ b/scenarios_lnp/invite_peerout/rewrite.yml
@@ -1,7 +1,8 @@
-rw_00:
+---
+rw_invite_peerout_lnp:
   - direction: lnp
     field: callee
     match_pattern: '^0043([0-9]+)$'
     replace_pattern: '0043$avp(s:callee_lnp_prefix)\1'
     priority: 1
-    description: add LNP prefix 
+    description: add LNP prefix
diff --git a/scenarios_lnp/invite_peerout/scenario.yml b/scenarios_lnp/invite_peerout/scenario.yml
index ef3a7c09..ad5a1df3 100644
--- a/scenarios_lnp/invite_peerout/scenario.yml
+++ b/scenarios_lnp/invite_peerout/scenario.yml
@@ -1,6 +1,7 @@
+---
 test_uuid: invite_peerout
 domains:
-  'spce.test':
+  invite-peerout.scenarios-lnp.test:
     reseller_id: 1
 customers:
   'customer.test':
@@ -13,7 +14,7 @@ customers:
       billing_profile_id: 1
       reseller_id: 1
 subscribers:
-  spce.test:
+  invite-peerout.scenarios-lnp.test:
     testuser1002:
       customer: 'customer.test'
       password: testuser
@@ -23,11 +24,14 @@ subscribers:
 scenarios:
   - ip: 127.126.0.1
     username: testuser1002
-    domain: spce.test
+    domain: invite-peerout.scenarios-lnp.test
     responders:
       - ip: 127.0.2.1
         number: 004321001
         username: 004321001
-        domain: spce.test
-        peer_host: peer_00_host0
-        register: no
+        domain: invite-peerout.scenarios-lnp.test
+        peer_host: peer_invite_peerout_host0
+        register: 'no'
+extra_info:
+  phone_numbers:
+    - '004328881001'