diff --git a/mysql/client.sls b/mysql/client.sls
index 6a03170..99c6051 100644
--- a/mysql/client.sls
+++ b/mysql/client.sls
@@ -1,6 +1,6 @@
-{% from "mysql/package-map.jinja" import pkgs, services with context %}
+{% from "mysql/package-map.jinja" import mysql with context %}
 
 mysql:
   pkg:
     - installed
-    - name: {{ pkgs['mysql-client'] }}
+    - name: {{ mysql.client }}
diff --git a/mysql/server.sls b/mysql/server.sls
index 031d4de..0a1c37a 100644
--- a/mysql/server.sls
+++ b/mysql/server.sls
@@ -1,12 +1,12 @@
-{% from "mysql/package-map.jinja" import pkgs, services, configs with context %}
+{% from "mysql/package-map.jinja" import mysql with context %}
 
 mysqld:
   pkg:
     - installed
-    - name: {{ pkgs['mysql-server'] }}
+    - name: {{ mysql.server }}
   service:
     - running
-    - name: {{ services['mysql'] }}
+    - name: {{ mysql.service }}
     - enable: True
     - watch:
       - pkg: mysqld
@@ -14,7 +14,7 @@ mysqld:
 {% if grains['os'] in ['Ubuntu', 'Debian', 'Gentoo'] %}
 my.cnf:
   file.managed:
-    - name: {{ configs['mysql'] }}
+    - name: {{ mysql.config }}
     - source: salt://mysql/files/{{ grains['os'] }}-my.cnf
     - user: root
     - group: root