diff --git a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
index f5eb093bd1..fd1ab96590 100644
--- a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
@@ -58,8 +58,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}
@@ -477,50 +477,50 @@
 <!--  Account Ring Tone. 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_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 -->
@@ -1869,8 +1869,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}
@@ -1885,8 +1885,8 @@
 <P1348>0</P1348>
 <!--  PC Port VLAN Tag. Default is 0 -->
 <!--  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}
@@ -2012,10 +2012,10 @@
 <P212>2</P212>
 <!--  Config Server Path -->
 <!--  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}
@@ -2045,8 +2045,8 @@
 <P6767>2</P6767>
 <!--  Firmware Server Path -->
 <!--  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}
@@ -2067,12 +2067,12 @@
 <!-- ############################################################################# -->
 <!--  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}
@@ -2082,8 +2082,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}
@@ -2260,9 +2260,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}
@@ -2293,7 +2293,7 @@
 <!--  LDAP Directory -->
 <!--  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 -->
 <P8021>389</P8021>
@@ -2301,7 +2301,7 @@
 <!--  Example 1: dc=grandstream,dc=com -->
 <!--  value i 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 -->
 <P8023>{$ldap_username}</P8023>
@@ -2311,11 +2311,11 @@
 <!--  LDAP Number Filter -->
 <!--  LDAP name filter is the filter used for name look ups. Please refer to usermanual 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 usermanual 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 -->
 <!--  Mandatory -->
@@ -2323,11 +2323,11 @@
 <!--  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 -->
 <P8030>givenName sn</P8030>