diff --git a/apache/config/modules/mod_cgi.sls b/apache/config/modules/mod_cgi.sls
index 766d5a2..0341b12 100644
--- a/apache/config/modules/mod_cgi.sls
+++ b/apache/config/modules/mod_cgi.sls
@@ -19,7 +19,7 @@ apache-config-modules-cgi-cmd-run:
     - template: {{ apache.get('template_engine', 'jinja') }}
     - makedirs: True
     - context:
-      apache: {{ apache|json }}
+        svcname: {{ apache.service.name }}
     - require:
       - pkg: apache-package-install-pkg-installed
     - watch_in:
diff --git a/apache/config/modules/mod_perl2.sls b/apache/config/modules/mod_perl2.sls
index 6d5578b..7266ef6 100644
--- a/apache/config/modules/mod_perl2.sls
+++ b/apache/config/modules/mod_perl2.sls
@@ -47,7 +47,7 @@ apache-config-modules-perl-pkg:
     - makedirs: True
     - template: {{ apache.get('template_engine', 'jinja') }}
     - context:
-      apache: {{ apache|json }}
+        svcname: {{ apache.service.name }}
     - require:
       - pkg: apache-package-install-pkg-installed
     - watch_in:
diff --git a/apache/config/modules/mod_php5.sls b/apache/config/modules/mod_php5.sls
index 63ce590..5636520 100644
--- a/apache/config/modules/mod_php5.sls
+++ b/apache/config/modules/mod_php5.sls
@@ -42,7 +42,7 @@ apache-config-modules-php5-pkg:
     - makedirs: True
     - template: {{ apache.get('template_engine', 'jinja') }}
     - context:
-      apache: {{ apache|json }}
+        svcname: {{ apache.service.name }}
     - watch_in:
       - module: apache-service-running-restart
     - require_in:
@@ -63,7 +63,7 @@ apache-config-modules-php5-pkg:
     - makedirs: True
     - template: {{ apache.get('template_engine', 'jinja') }}
     - context:
-      apache: {{ apache|json }}
+        svcname: {{ apache.service.name }}
     - require:
       - pkg: apache-package-install-pkg-installed
     - watch_in:
diff --git a/apache/config/modules/mod_proxy.sls b/apache/config/modules/mod_proxy.sls
index 745a907..8256a9c 100644
--- a/apache/config/modules/mod_proxy.sls
+++ b/apache/config/modules/mod_proxy.sls
@@ -36,7 +36,7 @@ apache-config-modules-proxy-file-managed:
     - makedirs: True
     - template: {{ apache.get('template_engine', 'jinja') }}
     - context:
-      apache: {{ apache|json }}
+        svcname: {{ apache.service.name }}
     - require:
       - pkg: apache-package-install-pkg-installed
     - watch_in:
diff --git a/apache/config/modules/mod_proxy_http.sls b/apache/config/modules/mod_proxy_http.sls
index bcb0983..ab10580 100644
--- a/apache/config/modules/mod_proxy_http.sls
+++ b/apache/config/modules/mod_proxy_http.sls
@@ -38,7 +38,7 @@ apache-config-modules-proxy_http-file-managed:
     - makedirs: True
     - template: {{ apache.get('template_engine', 'jinja') }}
     - context:
-      apache: {{ apache|json }}
+        svcname: {{ apache.service.name }}
     - require:
       - pkg: apache-package-install-pkg-installed
     - watch_in:
diff --git a/apache/config/modules/mod_rewrite.sls b/apache/config/modules/mod_rewrite.sls
index 2b5a952..4dc1b74 100644
--- a/apache/config/modules/mod_rewrite.sls
+++ b/apache/config/modules/mod_rewrite.sls
@@ -36,7 +36,7 @@ apache-config-modules-rewrite-file-managed-conf:
     - makedirs: True
     - template: {{ apache.get('template_engine', 'jinja') }}
     - context:
-      apache: {{ apache|json }}
+        svcname: {{ apache.service.name }}
     - require:
       - pkg: apache-package-install-pkg-installed
     - watch_in:
diff --git a/apache/config/modules/mod_suexec.sls b/apache/config/modules/mod_suexec.sls
index 4871aa3..7024262 100644
--- a/apache/config/modules/mod_suexec.sls
+++ b/apache/config/modules/mod_suexec.sls
@@ -20,7 +20,7 @@ apache-config-modules-suexec-file-managed:
     - makedirs: True
     - template: {{ apache.get('template_engine', 'jinja') }}
     - context:
-      apache: {{ apache|json }}
+        svcname: {{ apache.service.name }}
     - require:
       - pkg: apache-package-install-pkg-installed
     - watch_in:
diff --git a/apache/files/FreeBSD/mod_cgi.conf.jinja b/apache/files/FreeBSD/mod_cgi.conf.jinja
index ee3bd0d..6b13899 100644
--- a/apache/files/FreeBSD/mod_cgi.conf.jinja
+++ b/apache/files/FreeBSD/mod_cgi.conf.jinja
@@ -1,6 +1,6 @@
 <IfModule !mpm_prefork_module>
-	LoadModule cgid_module libexec/{{ apache.service.name }}/mod_cgid.so
+	LoadModule cgid_module libexec/{{ svcname }}/mod_cgid.so
 </IfModule>
 <IfModule mpm_prefork_module>
-	LoadModule cgi_module libexec/{{ apache.service.name }}/mod_cgi.so
+	LoadModule cgi_module libexec/{{ svcname }}/mod_cgi.so
 </IfModule>
diff --git a/apache/files/FreeBSD/mod_perl.conf.jinja b/apache/files/FreeBSD/mod_perl.conf.jinja
index a27af68..deb4bca 100644
--- a/apache/files/FreeBSD/mod_perl.conf.jinja
+++ b/apache/files/FreeBSD/mod_perl.conf.jinja
@@ -1 +1 @@
-LoadModule perl_module libexec/{{ apache.service.name }}/mod_perl.so
+LoadModule perl_module libexec/{{ svcname }}/mod_perl.so
diff --git a/apache/files/FreeBSD/mod_php5.conf.jinja b/apache/files/FreeBSD/mod_php5.conf.jinja
index 52e8091..08466b8 100644
--- a/apache/files/FreeBSD/mod_php5.conf.jinja
+++ b/apache/files/FreeBSD/mod_php5.conf.jinja
@@ -1,4 +1,4 @@
-LoadModule php5_module /usr/local/libexec/{{ apache.service.name }}/libphp5.so
+LoadModule php5_module /usr/local/libexec/{{ svcname }}/libphp5.so
 
 DirectoryIndex index.html index.php
 
diff --git a/apache/files/FreeBSD/mod_proxy.conf.jinja b/apache/files/FreeBSD/mod_proxy.conf.jinja
index 0dd2c14..39081bb 100644
--- a/apache/files/FreeBSD/mod_proxy.conf.jinja
+++ b/apache/files/FreeBSD/mod_proxy.conf.jinja
@@ -1 +1 @@
-LoadModule proxy_module libexec/{{ apache.service.name }}/mod_proxy.so
+LoadModule proxy_module libexec/{{ svcname }}/mod_proxy.so
diff --git a/apache/files/FreeBSD/mod_proxy_http.conf.jinja b/apache/files/FreeBSD/mod_proxy_http.conf.jinja
index 4b0bcf1..b940edb 100644
--- a/apache/files/FreeBSD/mod_proxy_http.conf.jinja
+++ b/apache/files/FreeBSD/mod_proxy_http.conf.jinja
@@ -1 +1 @@
-LoadModule proxy_http_module libexec/{{ apache.service.name }}/mod_proxy_http.so
+LoadModule proxy_http_module libexec/{{ svcname }}/mod_proxy_http.so
diff --git a/apache/files/FreeBSD/mod_rewrite.conf.jinja b/apache/files/FreeBSD/mod_rewrite.conf.jinja
index 0cb3250..34f49f8 100644
--- a/apache/files/FreeBSD/mod_rewrite.conf.jinja
+++ b/apache/files/FreeBSD/mod_rewrite.conf.jinja
@@ -1 +1 @@
-LoadModule rewrite_module libexec/{{ apache.service.name }}/mod_rewrite.so
+LoadModule rewrite_module libexec/{{ svcname }}/mod_rewrite.so
diff --git a/apache/files/FreeBSD/mod_suexec.conf.jinja b/apache/files/FreeBSD/mod_suexec.conf.jinja
index 0024a2b..a7d42a7 100644
--- a/apache/files/FreeBSD/mod_suexec.conf.jinja
+++ b/apache/files/FreeBSD/mod_suexec.conf.jinja
@@ -1 +1 @@
-LoadModule suexec_module libexec/{{ apache.service.name }}/mod_suexec.so
+LoadModule suexec_module libexec/{{ svcname }}/mod_suexec.so