diff --git a/manifests/database/sql.pp b/manifests/database/sql/mysql.pp
similarity index 99%
rename from manifests/database/sql.pp
rename to manifests/database/sql/mysql.pp
index 9ed76716..e93c2d5b 100644
--- a/manifests/database/sql.pp
+++ b/manifests/database/sql/mysql.pp
@@ -181,7 +181,7 @@
 #   because this subject is potentially a troll :-D
 #   Defaults to 'sysv'
 #
-class cloud::database::sql (
+class cloud::database::sql::mysql (
     $api_eth                        = '127.0.0.1',
     $galera_master_name             = 'mgmt001',
     $galera_internal_ips            = ['127.0.0.1'],
diff --git a/spec/classes/cloud_database_sql_spec.rb b/spec/classes/cloud_database_sql_mysql_spec.rb
similarity index 98%
rename from spec/classes/cloud_database_sql_spec.rb
rename to spec/classes/cloud_database_sql_mysql_spec.rb
index 2346ccac..1ba9942e 100644
--- a/spec/classes/cloud_database_sql_spec.rb
+++ b/spec/classes/cloud_database_sql_mysql_spec.rb
@@ -18,9 +18,9 @@
 
 require 'spec_helper'
 
-describe 'cloud::database::sql' do
+describe 'cloud::database::sql::mysql' do
 
-  shared_examples_for 'openstack database sql' do
+  shared_examples_for 'mysql database' do
 
     let :pre_condition do
       "include xinetd"
@@ -273,7 +273,7 @@ describe 'cloud::database::sql' do
         :wsrep_provider      => '/usr/lib/galera/libgalera_smm.so' }
     end
 
-    it_configures 'openstack database sql'
+    it_configures 'mysql database'
   end
 
   context 'on RedHat platforms' do
@@ -288,7 +288,7 @@ describe 'cloud::database::sql' do
         :wsrep_provider      => '/usr/lib64/galera/libgalera_smm.so' }
     end
 
-    it_configures 'openstack database sql'
+    it_configures 'mysql database'
   end
 
 end