diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index 5de6696df9..b611d8abe1 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -74,8 +74,8 @@
 <!--  DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV, 3 - Use Configured IP. Default is 0 -->
 <!--  Number: 0, 1, 2, 3 -->
 <!--  Mandatory -->
-{if isset($gs_dns_mode_1) }
-<P103>{$gs_dns_mode_1}</P103>
+{if isset($grandstream_dns_mode_1) }
+<P103>{$grandstream_dns_mode_1}</P103>
 {else}
 <P103>0</P103>
 {/if}
@@ -622,51 +622,51 @@
 <!--  Account Ring Tone. 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone, 4 - silent. Default is 0 -->
 <!--  Number: 0, 1, 2, 3, 4 -->
 <!--  Mandatory -->
-{if isset($gs_account_ring_tone_1)||$gs_account_ring_tone_1==0}
-<P104>{$gs_account_ring_tone_1}</P104>
+{if isset($grandstream_account_ring_tone_1)||$grandstream_account_ring_tone_1==0}
+<P104>{$grandstream_account_ring_tone_1}</P104>
 {/if}
 
 <!--  Matching Incoming Caller ID. Matching Rule 1 -->
 <!--  String -->
 
-{if isset($gs_ring_tone_caller_id_1_1)}
-<P1488>{$gs_ring_tone_caller_id_1_1}</P1488>
+{if isset($grandstream_ring_tone_caller_id_1_1)}
+<P1488>{$grandstream_ring_tone_caller_id_1_1}</P1488>
 {/if}
 
 <!--  Matching Rule 1 Distinctive Ringtone -->
 <!--  0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0. -->
 <!--  Number: 0, 1, 2, 3 -->
 <!--  Mandatory -->
-{if isset($gs_ring_tone_1_1)||$gs_ring_tone_1_1==0}
-<P1489>{$gs_ring_tone_1_1}</P1489>
+{if isset($grandstream_ring_tone_1_1)||$grandstream_ring_tone_1_1==0}
+<P1489>{$grandstream_ring_tone_1_1}</P1489>
 {/if}
 
 <!--  Matching Incoming Caller ID. Matching Rule 2 -->
 <!--  String -->
-{if isset($gs_ring_tone_caller_id_2_1)}
-<P1490>{$gs_ring_tone_caller_id_2_1}</P1490>
+{if isset($grandstream_ring_tone_caller_id_2_1)}
+<P1490>{$grandstream_ring_tone_caller_id_2_1}</P1490>
 {/if}
 
 <!--  Matching Rule 2 Distinctive Ringtone -->
 <!--  0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
 <!--  Number: 0, 1, 2, 3 -->
 <!--  Mandatory -->
-{if isset($gs_ring_tone_2_1)||$gs_ring_tone_2_1==0}
-<P1491>{$gs_ring_tone_2_1}</P1491>
+{if isset($grandstream_ring_tone_2_1)||$grandstream_ring_tone_2_1==0}
+<P1491>{$grandstream_ring_tone_2_1}</P1491>
 {/if}
 
 <!--  Matching Incoming Caller ID. Matching Rule 3 -->
 <!--  String -->
-{if isset($gs_ring_tone_caller_id_3_1)}
-<P1492>{$gs_ring_tone_caller_id_3_1}</P1492>
+{if isset($grandstream_ring_tone_caller_id_3_1)}
+<P1492>{$grandstream_ring_tone_caller_id_3_1}</P1492>
 {/if}
 
 <!--  Matching Rule 3 Distinctive Ringtone -->
 <!--  0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
 <!--  Number: 0, 1, 2, 3 -->
 <!--  Mandatory -->
-{if isset($gs_ring_tone_3_1)||$gs_ring_tone_2_1==0}
-<P1493>{$gs_ring_tone_3_1}</P1493>
+{if isset($grandstream_ring_tone_3_1)||$grandstream_ring_tone_2_1==0}
+<P1493>{$grandstream_ring_tone_3_1}</P1493>
 {/if}
 
 <!--  Ring Timeout (in seconds). Default is 60 -->
@@ -843,8 +843,8 @@
 <!--  DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV, 3 - Use Configured IP. Default is 0 -->
 <!--  Number: 0, 1, 2, 3 -->
 <!--  Mandatory -->
-{if isset($gs_dns_modee_2) }
-<P408>{$gs_dns_modee_2}</P408>
+{if isset($grandstream_dns_modee_2) }
+<P408>{$grandstream_dns_modee_2}</P408>
 {else}
 <P408>0</P408>
 {/if}
@@ -1389,8 +1389,8 @@
 <!--  Account Ring Tone. 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone, 4 - silent. Default is 0 -->
 <!--  Number: 0, 1, 2, 3, 4 -->
 <!--  Mandatory  -->
-{if isset($gs_account_ring_tone_2)||$gs_account_ring_tone_2==0}
-<P423>{$gs_account_ring_tone_2}</P423>
+{if isset($grandstream_account_ring_tone_2)||$grandstream_account_ring_tone_2==0}
+<P423>{$grandstream_account_ring_tone_2}</P423>
 {/if}
 
 <!--  Matching Incoming Caller ID. Matching Rule 1 -->
@@ -1597,8 +1597,8 @@
 <!--  DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV, 3 - Use Configured IP. Default is 0  -->
 <!--  Number: 0, 1, 2, 3 -->
 <!--  Mandatory -->
-{if isset($gs_dns_modee_3) }
-<P508>{$gs_dns_modee_3}</P508>
+{if isset($grandstream_dns_modee_3) }
+<P508>{$grandstream_dns_modee_3}</P508>
 {else}
 <P508>0</P508>
 {/if}
@@ -2142,8 +2142,8 @@
 <!--  Account Ring Tone. 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone, 4 - silent. Default is 0 -->
 <!--  Number: 0, 1, 2, 3, 4 -->
 <!--  Mandatory -->
-{if isset($gs_account_ring_tone_3)||$gs_account_ring_tone_3==0}
-<P523>{$gs_account_ring_tone_3}</P523>
+{if isset($grandstream_account_ring_tone_3)||$grandstream_account_ring_tone_3==0}
+<P523>{$grandstream_account_ring_tone_3}</P523>
 {/if}
 
 <!--  Matching Incoming Caller ID. Matching Rule 1 -->
@@ -2350,8 +2350,8 @@
 <!--  DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV, 3 - Use Configured IP. Default is 0 -->
 <!--  Number: 0, 1, 2, 3 -->
 <!--  Mandatory -->
-{if isset($gs_dns_modee_4) }
-<P608>{$gs_dns_modee_4}</P608>
+{if isset($grandstream_dns_modee_4) }
+<P608>{$grandstream_dns_modee_4}</P608>
 {else}
 <P608>0</P608>
 {/if}
@@ -2897,8 +2897,8 @@
 <!--  Account Ring Tone. 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone, 4 - silent. Default is 0 -->
 <!--  Number: 0, 1, 2, 3, 4 -->
 <!--  Mandatory -->
-{if isset($gs_account_ring_tone_4)||$gs_account_ring_tone_4==0}
-<P623>{$gs_account_ring_tone_4}</P623>
+{if isset($grandstream_account_ring_tone_4)||$grandstream_account_ring_tone_4==0}
+<P623>{$grandstream_account_ring_tone_4}</P623>
 {/if}
 
 <!--  Matching Incoming Caller ID. Matching Rule 1 -->
@@ -3105,8 +3105,8 @@
 <!--  DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV, 3 - Use Configured IP. Default is 0 -->
 <!--  Number: 0, 1, 2, 3 -->
 <!--  Mandatory -->
-{if isset($gs_dns_modee_5) }
-<P1708>{$gs_dns_modee_5}</P1708>
+{if isset($grandstream_dns_modee_5) }
+<P1708>{$grandstream_dns_modee_5}</P1708>
 {else}
 <P1708>0</P1708>
 {/if}
@@ -3650,8 +3650,8 @@
 <!--  Account Ring Tone. 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone, 4 - silent. Default is 0 -->
 <!--  Number: 0, 1, 2, 3, 4 -->
 <!--  Mandatory -->
-{if isset($gs_account_ring_tone_5)||$gs_account_ring_tone_5==0}
-<P1723>{$gs_account_ring_tone_5}</P1723>
+{if isset($grandstream_account_ring_tone_5)||$grandstream_account_ring_tone_5==0}
+<P1723>{$grandstream_account_ring_tone_5}</P1723>
 {/if}
 
 <!--  Matching Incoming Caller ID. Matching Rule 1. -->
@@ -3859,8 +3859,8 @@
 <!--  DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV, 3 - Use Configured IP. Default is 0 -->
 <!--  Number: 0, 1, 2, 3 -->
 <!--  Mandatory -->
-{if isset($gs_dns_modee_6) }
-<P1808>{$gs_dns_modee_6}</P1808>
+{if isset($grandstream_dns_modee_6) }
+<P1808>{$grandstream_dns_modee_6}</P1808>
 {else}
 <P1808>0</P1808>
 {/if}
@@ -4407,8 +4407,8 @@
 <!--  Account Ring Tone. 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone, 4 - silent. Default is 0 -->
 <!--  Number: 0, 1, 2, 3, 4 -->
 <!--  Mandatory -->
-{if isset($gs_account_ring_tone_6)||$gs_account_ring_tone_6==0}
-<P1823>{$gs_account_ring_tone_6}</P1823>
+{if isset($grandstream_account_ring_tone_6)||$grandstream_account_ring_tone_6==0}
+<P1823>{$grandstream_account_ring_tone_6}</P1823>
 {/if}
 
 <!--  Matching Incoming Caller ID. Matching Rule 1 -->
@@ -4756,8 +4756,8 @@
 <!--  Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
 <!--  Number: 0 - 4094 -->
 <!--  Mandatory -->
-{if isset($gs_lan_port_vlan) }
-<P51>{$gs_lan_port_vlan}</P51>
+{if isset($grandstream_lan_port_vlan) }
+<P51>{$grandstream_lan_port_vlan}</P51>
 {else}
 <P51>0</P51>
 {/if}
@@ -4775,8 +4775,8 @@
 <!--  PC Port VLAN Tag. Default is 0  -->
 <!--  Number: 0 - 4094 -->
 <!-- Mandatory -->
-{if isset($gs_pc_port_vlan) }
-<P229>{$gs_pc_port_vlan}</P229>
+{if isset($grandstream_pc_port_vlan) }
+<P229>{$grandstream_pc_port_vlan}</P229>
 {else}
 <P229>1</P229>
 {/if}
@@ -4870,8 +4870,8 @@
 
 <!--  Firmware Server Path Default fm.grandstream.com/gs -->
 <!--  String -->
-{if isset($gs_firmware_path)}
-<P192>{$gs_firmware_path}</P192>
+{if isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
@@ -4879,10 +4879,10 @@
 <!--  Config Server Path Default fm.grandstream.com/gs -->
 <!--  String -->
 
-{if $gs_config_server_path=="none"}
+{if $grandstream_config_server_path=="none"}
 <P237></P237>
-{elseif isset($gs_config_server_path)}
-<P237>{$gs_config_server_path}</P237>
+{elseif isset($grandstream_config_server_path)}
+<P237>{$grandstream_config_server_path}</P237>
 {else}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
@@ -4963,14 +4963,14 @@
 <!-- ############################################################################# -->
 <!--  Syslog Server (name of the server, max length is 64 characters) -->
 <!--  String -->
-<P207>{$gs_syslog_server}</P207>
+<P207>{$grandstream_syslog_server}</P207>
 
 
 <!--  Syslog Level. 0 - NONE, 1 - DEBUG, 2 - INFO, 3 - WARNING, 4 - ERROR. Default is 0 -->
 <!--  Number: 0, 1 , 2, 3, 4 -->
 <!--  Mandatory -->
-{if isset($gs_syslog_level)}
-<P208>{$gs_syslog_level}</P208>
+{if isset($grandstream_syslog_level)}
+<P208>{$grandstream_syslog_level}</P208>
 {else}
 <P208>0</P208>
 {/if}
@@ -4978,8 +4978,8 @@
 <!--  Send SIP Log. 0 - Do not send SIP log in Syslog, 1 - Send SIP log in Syslog if configured and set to DEBUG level. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-{if isset($gs_send_sip_log)}
-<P1387>{$gs_send_sip_log}</P1387>
+{if isset($grandstream_send_sip_log)}
+<P1387>{$grandstream_send_sip_log}</P1387>
 {else}
 <P1387>0</P1387>
 {/if}
@@ -5162,9 +5162,9 @@
 <!--  For example: directory.grandstream.com/engineering -->
 <!--  String -->
 {if isset($contact_grandstream)}
-<P331>{$gs_phonebook_xml_server_path}{$mac}/</P331>
-{elseif isset($gs_phonebook_xml_server_path)}
-<P331>{$gs_phonebook_xml_server_path}</P331>
+<P331>{$grandstream_phonebook_xml_server_path}{$mac}/</P331>
+{elseif isset($grandstream_phonebook_xml_server_path)}
+<P331>{$grandstream_phonebook_xml_server_path}</P331>
 {else}
 <P331></P331>
 {/if}
@@ -5173,8 +5173,8 @@
 <!--  Valid value range is 5-720. Default is 0 for disabled -->
 <!--  NOTE: bug in Grandstream firmware - requries script to login and delete groups/contacts then reboot phone at night -->
 <!--  Number: 0, 5-720;  -->
-{if isset($gs_phonebook_download_interval)}
-<P332>{$gs_phonebook_download_interval}</P332>
+{if isset($grandstream_phonebook_download_interval)}
+<P332>{$grandstream_phonebook_download_interval}</P332>
 {else}
 <P332>0</P332>
 {/if}
@@ -5213,7 +5213,7 @@
 
 <!--  LDAP Server Address, up to 256 characters can be used. It can be IP address or Domain name -->
 <!--  String -->
-<P8020>{$gs_ldap_server}</P8020>
+<P8020>{$grandstream_ldap_server}</P8020>
 
 <!--  LDAP Server Port. Default is 389. -->
 <!--  Number: 1 - 65535 -->
@@ -5223,7 +5223,7 @@
 <!--  Example 1: dc=grandstream,dc=com -->
 <!--  Example 2: ou=Boston, dc=grandstream,dc=com -->
 <!--  String -->
-<P8022>{$gs_ldap_base_dn}</P8022>
+<P8022>{$grandstream_ldap_base_dn}</P8022>
 
 <!--  User name. The bind "Username" for querying LDAP servers. Some LDAP servers allow anonymous binds in which case the setting can be left blank -->
 <!--  String -->
@@ -5236,12 +5236,12 @@
 <!--  LDAP Number Filter -->
 <!--  LDAP name filter is the filter used for name look ups. Please refer to user manual for examples -->
 <!--  String -->
-<P8025>{$gs_ldap_number_filter}</P8025>
+<P8025>{$grandstream_ldap_number_filter}</P8025>
 
 <!--  LDAP Name Filter -->
 <!--  LDAP name filter is the filter used for name look ups. Please refer to user manual for examples -->
 <!--  String -->
-<P8026>{$gs_ldap_name_filter}</P8026>
+<P8026>{$grandstream_ldap_name_filter}</P8026>
 
 <!--  LDAP Version. Protocol version for the phone when send the bind requests -->
 <!--  2 - version 2, 3 - version 3. Default is 3 -->
@@ -5251,12 +5251,12 @@
 <!--  LDAP Name Attributes. This setting specifies the "name" attributes of each record which are returned in the LDAP search result -->
 <!--  The setting allows the users to configure multiple space separated name attributes -->
 <!--  String -->
-<P8028>{$gs_ldap_name_attr}</P8028>
+<P8028>{$grandstream_ldap_name_attr}</P8028>
 
 <!--  LDAP Number Attributes. This setting specifies the "number" attributes of each record which are returned in the LDAP search result -->
 <!--  The setting allows the users to configure multiple space separated number attributes -->
 <!--  String -->
-<P8029>{$gs_ldap_number_attr}</P8029>
+<P8029>{$grandstream_ldap_number_attr}</P8029>
 
 <!--  LDAP Display Name. The entry information to be shown on phone LCD. Grandstream phones will display up to 3 fields -->
 <!--  String -->
@@ -5426,8 +5426,8 @@
 <!--  Auto-Attended Transfer. 0 - No, 1 -Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-{if isset($gs_auto_attended_transfer) }
-<P1376>{$gs_auto_attended_transfer}</P1376>
+{if isset($grandstream_auto_attended_transfer) }
+<P1376>{$grandstream_auto_attended_transfer}</P1376>
 {else}
 <P1376>1</P1376>
 {/if}
@@ -5719,8 +5719,8 @@
 <!--  Handset TX gain(db). 1 - -6, 0 - 0, 2 - +6. Default is 0 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-{if isset($gs_handset_tx_gain) }
-<P1464>{$gs_handset_tx_gain}</P1464>
+{if isset($grandstream_handset_tx_gain) }
+<P1464>{$grandstream_handset_tx_gain}</P1464>
 {else}
 <P1464>0</P1464>
 {/if}
@@ -5778,9 +5778,9 @@
 <!--  Wallpaper Server Path -->
 <!--  String  -->
 <!-- <P2917></P2917> -->
-{if isset($gs_wallpaper_url)}
+{if isset($grandstream_wallpaper_url)}
 <P2916>1</P2916>
-<P2917>{$gs_wallpaper_url}</P2917>
+<P2917>{$grandstream_wallpaper_url}</P2917>
 {else}
 <P2916>0</P2916>
 <P2917></P2917>
@@ -5918,8 +5918,8 @@
 <!--  Mandatory -->
 {if isset($grandstream_timezone) }
 <P64>{$grandstream_timezone}</P64>
-{elseif isset($gs_gxp_time_zone) }
-<P64>{$gs_gxp_time_zone}</P64>
+{elseif isset($grandstream_gxp_time_zone) }
+<P64>{$grandstream_gxp_time_zone}</P64>
 {else}
 <P64>auto</P64>
 {/if}
@@ -6283,15 +6283,15 @@
 <!--  Bluetooth Power. Default is 0. -->
 <!--  0 - Off, 1 - On, 2 - Off & Hide Menu From LCD -->
 <!--  Mandatory -->
-{if isset($gs_bluetooth_power)}
-<P2910>{$gs_bluetooth_power}</P2910>
+{if isset($grandstream_bluetooth_power)}
+<P2910>{$grandstream_bluetooth_power}</P2910>
 {/if}
 
 <!--  Handsfree Mode. Default is 0. -->
 <!--  0 - Off, 1 - On -->
 <!--  Mandatory -->
-{if isset($gs_bluetooth_handsfree)}
-<P2911>{$gs_bluetooth_handsfree}</P2911>
+{if isset($grandstream_bluetooth_handsfree)}
+<P2911>{$grandstream_bluetooth_handsfree}</P2911>
 {/if}
 
 <!--  Bluetooth Name. -->