diff --git a/init.sls b/init.sls
index d8a93c5..2ef804f 100644
--- a/init.sls
+++ b/init.sls
@@ -1,8 +1,8 @@
 
 include:
-{%- if pillar.foreman.server.enabled %}
-- foreman.server
+{%- if pillar.isc_dhcp.server.enabled %}
+- isc_dhcp.server
 {%- endif %}
-{%- if pillar.foreman.smart_proxy.enabled %}
-- foreman.smart_proxy
+{%- if pillar.isc_dhcp.smart_proxy.enabled %}
+- isc_dhcp.smart_proxy
 {%- endif %}
diff --git a/map.jinja b/map.jinja
index ce2f346..361a150 100644
--- a/map.jinja
+++ b/map.jinja
@@ -21,7 +21,7 @@
   config_dir: /usr/local/etc
   dhcpd_config: /usr/local/etc/dhcpd.conf
   hosts_config: /usr/local/etc/dhcpd.hosts
-  subnets_config:/usr/local/etc/dhcpd.subnets
+  subnets_config: /usr/local/etc/dhcpd.subnets
   zone: {}
 RedHat:
   pkgs: