diff --git a/.travis.yml b/.travis.yml
index e74e1eaf45ac4f6d452a0e5b99bd8e77b5b0605d..aaaaa78ccddfe901895e891c7fb3a63c0519b7d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,8 @@ env:
         - VBOX_MEMORY=2048
         - VBOX_HWVIRTEX=off
     matrix:
-        - TOXENV=trusty
-        - &jessie TOXENV=jessie
+        - TOXENV=xenial
+        - &stretch TOXENV=stretch
 
 cache:
   - pip
@@ -34,6 +34,8 @@ notifications:
 
 matrix:
     fast_finish: True
+    allow_failures:
+        - env: *stretch
     include:
         - env:
             TOXENV: pre-commit
diff --git a/README.rst b/README.rst
index f68da9fcbf936be67c76bdcfcf57e0aaaf94eff4..09fca377f6ded354977d3101643270200f65a5d1 100644
--- a/README.rst
+++ b/README.rst
@@ -1,10 +1,10 @@
-mod-php
-#######
+mod-php7
+########
 
-.. image:: https://travis-ci.org/adarnimrod/mod-php.svg?branch=master
-    :target: https://travis-ci.org/adarnimrod/mod-php
+.. image:: https://travis-ci.org/adarnimrod/mod-php7.svg?branch=master
+    :target: https://travis-ci.org/adarnimrod/mod-php7
 
-Provision PHP application server using Apache with mod-php.
+Provision PHP7 application server using Apache with mod-php7.
 
 Requirements
 ------------
diff --git a/defaults/main.yml b/defaults/main.yml
index 75e091eca50e95e019e4ca6047ee8daad4621dfe..371acf8930d693f8acb38a2c119c053794feb0d6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-# defaults file for mod-php
+# defaults file for mod-php7
diff --git a/handlers/main.yml b/handlers/main.yml
index 9e3c0a1edc974b369747c4c55a28ebadef0df686..61a34738dddf5b77358830b6dab70ab421e882ce 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,2 +1,2 @@
 ---
-# handlers file for mod-php
+# handlers file for mod-php7
diff --git a/meta/main.yml b/meta/main.yml
index cd5fba290c910c95ab6350f662130bff1cb5163e..13dc2201047d6ba248ce5e386868b6158358997c 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,19 +1,19 @@
 galaxy_info:
   author: Nimrod Adar
-  description: Provision PHP application server using Apache with mod-php
+  description: Provision PHP7 application server using Apache with mod-php7
   company: Shore technologies
   license: MIT
   min_ansible_version: 2.3
   platforms:
   - name: Ubuntu
     versions:
-    - trusty
+    - xenial
   - name: Debian
     versions:
-    - jessie
+    - stretch
   galaxy_tags: [ PHP ]
 dependencies:
-    - name: php5
-      src: adarnimrod.php5
+    - name: php7
+      src: adarnimrod.php7
     - name: apache
       src: adarnimrod.apache
diff --git a/tasks/main.yml b/tasks/main.yml
index 9045e07d83195a485e2c305745bc29189d0e46c7..fad2ea8757ad244d5c7e442b6d7c7ddb6f457286 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# tasks file for mod-php
+# tasks file for mod-php7
 - name: Assertions
   assert:
     that:
@@ -7,14 +7,14 @@
 
 - name: APT install
   apt:
-      name: libapache2-mod-php5
+      name: libapache2-mod-php7.0
       state: present
       update_cache: yes
       cache_valid_time: 3600
 
 - name: Enable PHP module
   apache2_module:
-      name: php5
+      name: php7.0
       state: present
   notify:
       - Restart Apache
diff --git a/tests/playbook.yml b/tests/playbook.yml
index 9fe1fc8d5df65795391b08d6d64ef89f59473439..00adc5ff5faab65b2da3313fe464270c46496317 100644
--- a/tests/playbook.yml
+++ b/tests/playbook.yml
@@ -19,7 +19,7 @@
 
 - hosts: all
   strategy: free
-  roles: [mod-php]
+  roles: [mod-php7]
   post_tasks:
       - name: Install cURL
         package:
diff --git a/tests/test_mod-php.py b/tests/test_mod-php7.py
similarity index 77%
rename from tests/test_mod-php.py
rename to tests/test_mod-php7.py
index a53134c21a89a54e5baf38bda97fffe6aea02ac3..c9cf3a931021aa5f32cff2ecef567d6f6422d2ef 100644
--- a/tests/test_mod-php.py
+++ b/tests/test_mod-php7.py
@@ -9,4 +9,4 @@ def test_mod_php(Command, Sudo):
 
 
 def test_phpinfo(Command):
-    'PHP Version 5' in Command('curl http://localhost/phpinfo.php').stdout
+    'PHP Version 7.0' in Command('curl http://localhost/phpinfo.php').stdout
diff --git a/tox.ini b/tox.ini
index e7f5cc2972f65fc4b46711198f04d04678ea1e08..55734586c6653de5f543996f214766ebf22df6d2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 skip_install = True
 skipsdist = True
-envlist = trusty,jessie
+envlist = xenial,stretch
 
 [testenv]
 envdir = {toxinidir}/.tox/molecule
diff --git a/vars/main.yml b/vars/main.yml
index 41a1245204e42897c13e3b1469ccebe46856a1bc..a8676da5997f8b50c13ed0d413faa077029815cb 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,2 @@
 ---
-# vars file for mod-php
+# vars file for mod-php7