diff --git a/etc/admin.conf b/etc/admin.conf
index 1c00aae..59fe851 100644
--- a/etc/admin.conf
+++ b/etc/admin.conf
@@ -1,32 +1,32 @@
 <config debugging="0"
         log4perlconf="/etc/ngcp-ossbss/logging.conf"
-        billing_features="[% www-admin.billing_features %]"
-        peering_features="[% www-admin.peering_features %]"
-        voicemail_features="[% www-admin.voicemail_features %]"
-        fax_features="[% www-admin.fax_features %]"
-        cc_dial_prefix="[% www-admin.cc_dial_prefix %]"
-        ac_dial_prefix="[% www-admin.ac_dial_prefix %]"
+        billing_features="[% www_admin.billing_features %]"
+        peering_features="[% www_admin.peering_features %]"
+        voicemail_features="[% www_admin.voicemail_features %]"
+        fax_features="[% www_admin.fax_features %]"
+        cc_dial_prefix="[% www_admin.cc_dial_prefix %]"
+        ac_dial_prefix="[% www_admin.ac_dial_prefix %]"
        >
-  <dashboard enabled="[% www-admin.dashboard.enabled %]"
+  <dashboard enabled="[% www_admin.dashboard.enabled %]"
               rrd_url_path="/rrd"
             />
-  <subscriber extension_features="[% www-admin.subscriber.extension_features %]"
-              audiofile_features="[% www-admin.subscriber.audiofile_features %]"
+  <subscriber extension_features="[% www_admin.subscriber.extension_features %]"
+              audiofile_features="[% www_admin.subscriber.audiofile_features %]"
             />
-  <domain rewrite_features="[% www-admin.domain.rewrite_features %]"
-          audiofile_features="[% www-admin.domain.audiofile_features %]"
-          vsc_features="[% www-admin.domain.vsc_features %]"
+  <domain rewrite_features="[% www_admin.domain.rewrite_features %]"
+          audiofile_features="[% www_admin.domain.audiofile_features %]"
+          vsc_features="[% www_admin.domain.vsc_features %]"
         />
-  <default_admin_settings is_master="[% www-admin.default_admin_settings.is_master %]" is_active="[% www-admin.default_admin_settings.is_active %]"
-                          read_only="[% www-admin.default_admin_settings.read_only %]" show_passwords="[% www-admin.default_admin_settings.show_passwords %]"
-                          call_data="[% www-admin.default_admin_settings.call_data %]" lawful_intercept="[% www-admin.default_admin_settings.lawful_intercept %]" />
+  <default_admin_settings is_master="[% www_admin.default_admin_settings.is_master %]" is_active="[% www_admin.default_admin_settings.is_active %]"
+                          read_only="[% www_admin.default_admin_settings.read_only %]" show_passwords="[% www_admin.default_admin_settings.show_passwords %]"
+                          call_data="[% www_admin.default_admin_settings.call_data %]" lawful_intercept="[% www_admin.default_admin_settings.lawful_intercept %]" />
   <fees_csv>
-    [% FOREACH feecsvelement = www-admin.fees_csv.element_order %]
+    [% FOREACH feecsvelement = www_admin.fees_csv.element_order %]
     <element_order>[% feecsvelement %]</element_order>
     [% END %]
   </fees_csv>
   <speed_dial_vsc_presets>
-    [% FOREACH speeddialvsc = www-admin.speed_dial_vsc_presets.vsc %]
+    [% FOREACH speeddialvsc = www_admin.speed_dial_vsc_presets.vsc %]
     <vsc>[% speeddialvsc %]</vsc>
     [% END %]
   </speed_dial_vsc_presets>
diff --git a/etc/apache.site b/etc/apache.site
index ede315b..dcb65a7 100644
--- a/etc/apache.site
+++ b/etc/apache.site
@@ -1,15 +1,15 @@
-[% IF www-admin.apache.port != 443 %]
+[% IF www_admin.apache.port != 443 %]
 Listen 443
 [% END %]
 
 PerlSwitches -I/usr/share/ngcp-www-admin/lib
 
 <VirtualHost *:443>
-        ServerAdmin [% www-admin.apache.serveradmin %]
-        ServerName [% www-admin.apache.servername %]
+        ServerAdmin [% www_admin.apache.serveradmin %]
+        ServerName [% www_admin.apache.servername %]
         SSLEngine on
-        SSLCertificateFile [% www-admin.apache.sslcertfile %]
-        SSLCertificateKeyFile [% www-admin.apache.sslcertkeyfile %]
+        SSLCertificateFile [% www_admin.apache.sslcertfile %]
+        SSLCertificateKeyFile [% www_admin.apache.sslcertkeyfile %]
 
         PerlModule Apache2::RequestUtil admin
 
@@ -25,7 +25,7 @@ PerlSwitches -I/usr/share/ngcp-www-admin/lib
         # DumpIOInput Off
         # DumpIOOutput Off
 
-        LogLevel [% www-admin.logging.apache.err.level %]
-        ErrorLog syslog:[% www-admin.logging.apache.err.facility %]
-        CustomLog "|/usr/bin/logger -p [% www-admin.logging.apache.acc.facility %].[% www-admin.logging.apache.acc.level %] -t [% www-admin.logging.apache.acc.identity %]" combined
+        LogLevel [% www_admin.logging.apache.err.level %]
+        ErrorLog syslog:[% www_admin.logging.apache.err.facility %]
+        CustomLog "|/usr/bin/logger -p [% www_admin.logging.apache.acc.facility %].[% www_admin.logging.apache.acc.level %] -t [% www_admin.logging.apache.acc.identity %]" combined
 </VirtualHost>