diff --git a/pillar.example b/pillar.example
index b9e0b13..dc87c66 100644
--- a/pillar.example
+++ b/pillar.example
@@ -16,11 +16,11 @@ salt:
 
   # to overwrite map.jinja salt packages
   lookup:
-    salt-master: 'salt-master'
-    salt-minion: 'salt-minion'
-    salt-syndic: 'salt-syndic'
-    salt-cloud: 'salt-cloud'
-    salt-ssh: 'salt-ssh'
+    salt_master: 'salt-master'
+    salt_minion: 'salt-minion'
+    salt_syndic: 'salt-syndic'
+    salt_cloud: 'salt-cloud'
+    salt_ssh: 'salt-ssh'
     pyinotify: 'python-pyinotify' the package to be installed for pyinotify
 
   # Set which release of SaltStack to use, default to 'latest'
diff --git a/salt/map.jinja b/salt/map.jinja
index 5c48df8..fb26230 100644
--- a/salt/map.jinja
+++ b/salt/map.jinja
@@ -2,8 +2,8 @@
 # vim: ft=jinja
 
 {%- macro deep_merge(a, b) %}
-{#-     This whole `'dict' in x.__class__.__name__` mess is a 
-        workaround for the missing mapping test in CentOS 6's 
+{#-     This whole `'dict' in x.__class__.__name__` mess is a
+        workaround for the missing mapping test in CentOS 6's
         ancient Jinja2, see #193  #}
 {%-     for k,v in b.items() %}
 {%-         if v is string or v is number %}
@@ -11,7 +11,7 @@
 {%-         elif 'dict' not in v.__class__.__name__ %}
 {%-             if a[k] is not defined %}
 {%-                 do a.update({ k: v }) %}
-{%-             elif a[k] is iterable and 'dict' not in a[k].__class__.__name__ and 
+{%-             elif a[k] is iterable and 'dict' not in a[k].__class__.__name__ and
                 a[k] is not string %}
 {%-                 do a.update({ k: v|list + a[k]|list}) %}
 {%-             else %}
@@ -156,7 +156,7 @@ that differ from whats in defaults.yaml
       'python_git': 'py-GitPython',
     },
     'Windows': {
-      'salt_minion': 'saltstack.minion',
+      'salt_minion': 'salt-minion',
       'config_path': 'C:\salt\conf',
       'minion_service': 'salt-minion',
     },