diff --git a/manifests/image/api.pp b/manifests/image/api.pp
index d1b31083..d82e6c33 100644
--- a/manifests/image/api.pp
+++ b/manifests/image/api.pp
@@ -104,7 +104,7 @@ class cloud::image::api(
   $encoded_glance_password = uriescape($glance_db_password)
 
   class { 'glance::api':
-    sql_connection        => "mysql://${encoded_glance_user}:${encoded_glance_password}@${glance_db_host}/glance",
+    database_connection   => "mysql://${encoded_glance_user}:${encoded_glance_password}@${glance_db_host}/glance",
     registry_host         => $openstack_vip,
     registry_port         => $ks_glance_registry_internal_port,
     verbose               => $verbose,
diff --git a/manifests/image/registry.pp b/manifests/image/registry.pp
index 1cddea29..be83ab9e 100644
--- a/manifests/image/registry.pp
+++ b/manifests/image/registry.pp
@@ -86,19 +86,19 @@ class cloud::image::registry(
   $encoded_glance_password = uriescape($glance_db_password)
 
   class { 'glance::registry':
-    sql_connection    => "mysql://${encoded_glance_user}:${encoded_glance_password}@${glance_db_host}/glance",
-    verbose           => $verbose,
-    debug             => $debug,
-    auth_host         => $ks_keystone_internal_host,
-    keystone_password => $ks_glance_password,
-    keystone_tenant   => 'services',
-    keystone_user     => 'glance',
-    bind_host         => $api_eth,
-    log_dir           => $log_dir,
-    log_file          => $log_file_registry,
-    bind_port         => $ks_glance_registry_internal_port,
-    use_syslog        => $use_syslog,
-    log_facility      => $log_facility,
+    database_connection => "mysql://${encoded_glance_user}:${encoded_glance_password}@${glance_db_host}/glance",
+    verbose             => $verbose,
+    debug               => $debug,
+    auth_host           => $ks_keystone_internal_host,
+    keystone_password   => $ks_glance_password,
+    keystone_tenant     => 'services',
+    keystone_user       => 'glance',
+    bind_host           => $api_eth,
+    log_dir             => $log_dir,
+    log_file            => $log_file_registry,
+    bind_port           => $ks_glance_registry_internal_port,
+    use_syslog          => $use_syslog,
+    log_facility        => $log_facility,
   }
 
   exec {'glance_db_sync':
diff --git a/spec/classes/cloud_image_spec.rb b/spec/classes/cloud_image_spec.rb
index 9070283f..61eee37e 100644
--- a/spec/classes/cloud_image_spec.rb
+++ b/spec/classes/cloud_image_spec.rb
@@ -45,7 +45,7 @@ describe 'cloud::image' do
 
     it 'configure glance-api' do
       should contain_class('glance::api').with(
-        :sql_connection        => 'mysql://glance:secrete@10.0.0.1/glance',
+        :database_connection   => 'mysql://glance:secrete@10.0.0.1/glance',
         :keystone_password     => 'secrete',
         :registry_host         => '10.0.0.42',
         :registry_port         => '9191',
@@ -66,7 +66,7 @@ describe 'cloud::image' do
 
     it 'configure glance-registry' do
       should contain_class('glance::registry').with(
-        :sql_connection        => 'mysql://glance:secrete@10.0.0.1/glance',
+        :database_connection   => 'mysql://glance:secrete@10.0.0.1/glance',
         :keystone_password     => 'secrete',
         :keystone_tenant       => 'services',
         :keystone_user         => 'glance',