diff --git a/README.md b/README.md
index 496089a..48cda28 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-MySQL vendors for Debian Ansible role
-======================================
+MariaDB (MySQL) Ansible role for Debian
+=======================================
 
 [![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-HanXHX.mysql-blue.svg)](https://galaxy.ansible.com/HanXHX/mysql) [![Build Status](https://travis-ci.org/HanXHX/ansible-mysql.svg?branch=master)](https://travis-ci.org/HanXHX/ansible-mysql)
 
-Install and configure MySQL or MariaDB (Galera Cluster) or Percona Server. Manage replication (master/slave). Create users and databases.
+Install and configure MariaDB (Galera Cluster). Manage replication (master/slave). Create users and databases.
 
 | OS              | Vendor                  | Origin    | Managed versions          |
 | --------------- | ----------------------- | --------- | ------------------------- |
@@ -14,7 +14,6 @@ Install and configure MySQL or MariaDB (Galera Cluster) or Percona Server. Manag
 Notes
 -----
 
-* MySQL server no longer exists on Debian Stretch
 * Galera Cluster is experimental
 * Due to Vagrant + Docker limitation (private network), replication/galera can't be checked with Travis
 * If you need to test this role with Vagrant, you must install hostmanager plugin: `vagrant plugin install vagrant-hostmanager`
diff --git a/defaults/main.yml b/defaults/main.yml
index 704d59b..2b4aca6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -14,10 +14,10 @@ mariadb_manage_logrotate: true
 # Configuration
 # -------------------------------------
 
-# MySQL configuration template
+# MariaDB configuration template
 mariadb_config_template: 'etc/mysql/my.cnf.j2'
 
-# MySQL connection settings.
+# MariaDB connection settings.
 mariadb_port: "3306"
 mariadb_bind_address: '127.0.0.1'
 mariadb_datadir: '/var/lib/mysql'
diff --git a/tasks/install/main.yml b/tasks/install/main.yml
index 4647408..2005602 100644
--- a/tasks/install/main.yml
+++ b/tasks/install/main.yml
@@ -12,7 +12,7 @@
   include: 'mariadb/upstream.yml'
   when: mariadb_origin == 'upstream'
 
-- name: APT | Install few MySQL related tools
+- name: APT | Install few MariaDB related tools
   apt:
     pkg: "{{ item }}"
     install_recommends: no
diff --git a/tasks/replication/slave/gtid.yml b/tasks/replication/slave/gtid.yml
index 9744786..f1b1197 100644
--- a/tasks/replication/slave/gtid.yml
+++ b/tasks/replication/slave/gtid.yml
@@ -9,7 +9,7 @@
     mode: stopslave
 
 - name: COMMAND | Migrate to MariaDB GTID
-  command: mysql -e "CHANGE MASTER TO master_use_gtid=current_pos";
+  command: mariadb -e "CHANGE MASTER TO master_use_gtid=current_pos";
 
 - name: MYSQL_REPLICATION | Start slave
   mysql_replication:
diff --git a/tasks/replication/slave/import_data.yml b/tasks/replication/slave/import_data.yml
index d0a984e..366504b 100644
--- a/tasks/replication/slave/import_data.yml
+++ b/tasks/replication/slave/import_data.yml
@@ -32,7 +32,7 @@
     mariadb_datadir: "{{ datadir.msg }}"
     mariadb_binlog_info: "{{ datadir.msg }}/xtrabackup_binlog_info"
 
-- name: SERVICE | Stop MySQL before importing data
+- name: SERVICE | Stop MariaDB before importing data
   service:
     name: mysql
     state: stopped
diff --git a/tests/test.yml b/tests/test.yml
index 675c864..518dddb 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -26,7 +26,7 @@
       register: ip
       changed_when: false
     - set_fact:
-        # MySQL don't read /etc/hosts (from vagrant host plugin)
+        # MariaDB don't read /etc/hosts (from vagrant host plugin)
         mariadb_replication_host: "{{ ip.stdout }}"
         # Need this to use vagrant 'delegate_to'
         mariadb_slave_import_from: "{{ ansible_hostname | replace ('slave', 'master') }}"