diff --git a/php/map.jinja b/php/map.jinja
index 04c3bd1..f5c476f 100644
--- a/php/map.jinja
+++ b/php/map.jinja
@@ -284,24 +284,59 @@
 {%- else %}
     {%- set php = salt['grains.filter_by']({
         'Debian': {
-            'adodb_pkg': 'php5-adodb',
+            'adodb_pkg': salt['grains.filter_by']({
+                'jessie': 'php5-adodb',
+                'stretch': 'libphp-adodb',
+            }, grain='oscodename'),
             'apc_pkg': 'php-apc',
             'apcu_pkg': salt['grains.filter_by']({
                 'wheezy': 'php-apc',
                 'jessie': 'php5-apcu',
+                'stretch': 'php-apcu',
             }, grain='oscodename'),
             'bcmath_pkg': 'php5-fpm',
             'build_pkgs': ['libssl-dev', 'libcurl4-openssl-dev', 'build-essential'],
             'cgi_pkg': 'php5-cgi',
-            'cli_pkg': 'php5-cli',
+            'cli_pkg': salt['grains.filter_by']({
+                'wheezy': 'php-cli',
+                'jessie': 'php5-cli',
+                'stretch': 'php-cli',
+            }, grain='oscodename'),
             'composer_bin': 'composer',
-            'curl_pkg': 'php5-curl',
-            'dev_pkg': 'php5-dev',
-            'ext_conf_path': '/etc/php5/mods-available',
-            'fpm_pkg': 'php5-fpm',
-            'fpm_service': 'php5-fpm',
-            'gd_pkg': 'php5-gd',
-            'imagick_pkg': 'php5-imagick',
+            'curl_pkg': salt['grains.filter_by']({
+                'wheezy': 'php-curl',
+                'jessie': 'php5-curl',
+                'stretch': 'php-curl',
+            }, grain='oscodename'),
+            'dev_pkg': salt['grains.filter_by']({
+                'wheezy': 'php-dev',
+                'jessie': 'php5-dev',
+                'stretch': 'php-dev',
+            }, grain='oscodename'),
+            'ext_conf_path':  salt['grains.filter_by']({
+                'jessie': '/etc/php5/mods-available',
+                'stretch': '/etc/php/7.0/mods-available/',
+            }, grain='oscodename'),
+            'fpm_pkg': salt['grains.filter_by']({
+                'wheezy': 'php-fpm',
+                'jessie': 'php5-fpm',
+                'stretch': 'php-fpm',
+            }, grain='oscodename'),
+            'fpm_service': salt['grains.filter_by']({
+                'wheezy': 'php-fpm',
+                'jessie': 'php5-fpm',
+                'stretch': 'php-fpm',
+            }, grain='oscodename'),
+            'gd_pkg': salt['grains.filter_by']({
+                'wheezy': 'php-gd',
+                'jessie': 'php5-gd',
+                'stretch': 'php-gd',
+            }, grain='oscodename'),
+            'imagick_pkg': salt['grains.filter_by']({
+                'wheezy': 'php-imagick',
+                'jessie': 'php5-imagick',
+                'stretch': 'php-imagick',
+            }, grain='oscodename'),
             'imap_pkg': 'php5-imap',
             'intl_pkg': 'php5-intl',
             'json_pkg': 'php5-json',
@@ -309,21 +344,60 @@
             'local_bin': '/usr/local/bin',
             'mail_pkg': 'php-mail',
             'mbstring_pkg': 'php5',
-            'mcrypt_pkg': 'php5-mcrypt',
-            'memcache_pkg': 'php5-memcache',
-            'memcached_pkg': 'php5-memcached',
+            'mcrypt_pkg': salt['grains.filter_by']({
+                'wheezy': 'php-mcrypt',
+                'jessie': 'php5-mcrypt',
+                'stretch': 'php-mcrypt',
+            }, grain='oscodename'),
+            'memcache_pkg': salt['grains.filter_by']({
+                'wheezy': 'php-memcache',
+                'jessie': 'php5-memcache',
+                'stretch': 'php-memcache',
+            }, grain='oscodename'),
+            'memcached_pkg': salt['grains.filter_by']({
+                'wheezy': 'php-memcached',
+                'jessie': 'php5-memcached',
+                'stretch': 'php-memcached',
+            }, grain='oscodename'),
             'mongo_ext': 'mongo.so',
             'mongo_pecl': 'mongo',
-            'mysql_pkg': 'php5-mysql',
+            'mysql_pkg': salt['grains.filter_by']({
+                'wheezy': 'php-mysql',
+                'jessie': 'php5-mysql',
+                'stretch': 'php-mysql',
+            }, grain='oscodename'),
             'mysqlnd_pkg': 'php5-mysqlnd',
             'oauth_pkg': 'php5-oauth',
             'pear_pkg': 'php-pear',
-            'pgsql_pkg': 'php5-pgsql',
-            'php_ini': '/etc/php5/apache2/php.ini',
-            'php_pkg': 'php5',
-            'phpenmod_command': 'php5enmod',
-            'readline_pkg': ' php5-readline',
-            'redis_pkg': 'php5-redis',
+            'pgsql_pkg': salt['grains.filter_by']({
+                'wheezy': 'php-pgsql',
+                'jessie': 'php5-pgsql',
+                'stretch': 'php-pqsql',
+            }, grain='oscodename'),
+            'php_ini': salt['grains.filter_by']({
+                'jessie': '/etc/php5/apache2/php.ini',
+                'stretch': '/etc/php/7.0/apache2/php.ini',
+            }, grain='oscodename'),
+            'php_pkg': salt['grains.filter_by']({
+                'wheezy': 'php',
+                'jessie': 'php5',
+                'stretch': 'php',
+            }, grain='oscodename'),
+            'phpenmod_command': salt['grains.filter_by']({
+                'wheezy': 'php5enmod',
+                'jessie': 'php5enmod',
+                'stretch': 'phpenmod',
+            }, grain='oscodename'),
+            'readline_pkg': salt['grains.filter_by']({
+                'wheezy': 'php-readline',
+                'jessie': 'php5-readline',
+                'stretch': 'php-readline',
+            }, grain='oscodename'),
+            'redis_pkg': salt['grains.filter_by']({
+                'wheezy': 'php-redis',
+                'jessie': 'php5-redis',
+                'stretch': 'php-redis',
+            }, grain='oscodename'),
             'soap_pkg': 'php-soap',
             'sqlite_pkg': 'php5-sqlite',
             'suhosin5_ext': 'suhosin.so',