diff --git a/manifests/api.pp b/manifests/api.pp
index b033103b..0b9c2153 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -290,11 +290,11 @@ class glance::api(
   # known_stores config
   if $known_stores {
     glance_api_config {
-      'DEFAULT/known_stores':  value => join($known_stores, ',');
+      'glance_store/stores':  value => join($known_stores, ',');
     }
   } else {
     glance_api_config {
-      'DEFAULT/known_stores': ensure => absent;
+      'glance_store/stores': ensure => absent;
     }
   }
 
diff --git a/manifests/backend/cinder.pp b/manifests/backend/cinder.pp
index adb68009..75507d7f 100644
--- a/manifests/backend/cinder.pp
+++ b/manifests/backend/cinder.pp
@@ -71,7 +71,7 @@ class glance::backend::cinder(
     'DEFAULT/cinder_api_insecure':         value => $cinder_api_insecure;
     'DEFAULT/cinder_catalog_info':         value => $cinder_catalog_info;
     'DEFAULT/cinder_http_retries':         value => $cinder_http_retries;
-    'DEFAULT/default_store':               value => 'cinder';
+    'glance_store/default_store':          value => 'cinder';
   }
 
   glance_cache_config {
diff --git a/manifests/backend/file.pp b/manifests/backend/file.pp
index 9c27719b..0eb2dcd2 100644
--- a/manifests/backend/file.pp
+++ b/manifests/backend/file.pp
@@ -9,11 +9,11 @@ class glance::backend::file(
 ) inherits glance::api {
 
   glance_api_config {
-    'DEFAULT/default_store':            value => 'file';
-    'DEFAULT/filesystem_store_datadir': value => $filesystem_store_datadir;
+    'glance_store/default_store':            value => 'file';
+    'glance_store/filesystem_store_datadir': value => $filesystem_store_datadir;
   }
 
   glance_cache_config {
-    'DEFAULT/filesystem_store_datadir': value => $filesystem_store_datadir;
+    'glance_store/filesystem_store_datadir': value => $filesystem_store_datadir;
   }
 }
diff --git a/manifests/backend/rbd.pp b/manifests/backend/rbd.pp
index 9ff56de7..a19324f4 100644
--- a/manifests/backend/rbd.pp
+++ b/manifests/backend/rbd.pp
@@ -34,11 +34,11 @@ class glance::backend::rbd(
   }
 
   glance_api_config {
-    'DEFAULT/default_store':          value => 'rbd';
     'DEFAULT/rbd_store_ceph_conf':    value => $rbd_store_ceph_conf;
     'DEFAULT/rbd_store_user':         value => $rbd_store_user;
     'DEFAULT/rbd_store_pool':         value => $rbd_store_pool;
     'DEFAULT/rbd_store_chunk_size':   value => $rbd_store_chunk_size;
+    'glance_store/default_store':     value => 'rbd';
   }
 
   package { 'python-ceph':
diff --git a/manifests/backend/swift.pp b/manifests/backend/swift.pp
index 88312578..4ce897dc 100644
--- a/manifests/backend/swift.pp
+++ b/manifests/backend/swift.pp
@@ -26,12 +26,12 @@ class glance::backend::swift(
 ) {
 
   glance_api_config {
-    'DEFAULT/default_store':            value => 'swift';
-    'DEFAULT/swift_store_user':         value => $swift_store_user;
-    'DEFAULT/swift_store_key':          value => $swift_store_key;
-    'DEFAULT/swift_store_auth_address': value => $swift_store_auth_address;
-    'DEFAULT/swift_store_container':    value => $swift_store_container;
-    'DEFAULT/swift_store_auth_version': value => $swift_store_auth_version;
+    'glance_store/default_store':            value => 'swift';
+    'glance_store/swift_store_user':         value => $swift_store_user;
+    'glance_store/swift_store_key':          value => $swift_store_key;
+    'glance_store/swift_store_auth_address': value => $swift_store_auth_address;
+    'DEFAULT/swift_store_container':         value => $swift_store_container;
+    'DEFAULT/swift_store_auth_version':      value => $swift_store_auth_version;
     'DEFAULT/swift_store_create_container_on_put':
       value => $swift_store_create_container_on_put;
     'DEFAULT/swift_store_large_object_size':
@@ -39,11 +39,11 @@ class glance::backend::swift(
   }
 
   glance_cache_config {
-    'DEFAULT/swift_store_user':         value => $swift_store_user;
-    'DEFAULT/swift_store_key':          value => $swift_store_key;
-    'DEFAULT/swift_store_auth_address': value => $swift_store_auth_address;
-    'DEFAULT/swift_store_container':    value => $swift_store_container;
-    'DEFAULT/swift_store_auth_version': value => $swift_store_auth_version;
+    'glance_store/swift_store_user':         value => $swift_store_user;
+    'glance_store/swift_store_key':          value => $swift_store_key;
+    'glance_store/swift_store_auth_address': value => $swift_store_auth_address;
+    'DEFAULT/swift_store_container':         value => $swift_store_container;
+    'DEFAULT/swift_store_auth_version':      value => $swift_store_auth_version;
     'DEFAULT/swift_store_create_container_on_put':
       value => $swift_store_create_container_on_put;
     'DEFAULT/swift_store_large_object_size':
diff --git a/spec/classes/glance_api_spec.rb b/spec/classes/glance_api_spec.rb
index 7cbc9946..aa937c3e 100644
--- a/spec/classes/glance_api_spec.rb
+++ b/spec/classes/glance_api_spec.rb
@@ -324,7 +324,7 @@ describe 'glance::api' do
       default_params
     end
 
-    it { should_not contain_glance_api_config('DEFAULT/known_stores').with_value('false') }
+    it { should_not contain_glance_api_config('glance_store/stores').with_value('false') }
   end
 
   describe 'with known_stores override' do
@@ -334,7 +334,7 @@ describe 'glance::api' do
       })
     end
 
-    it { should contain_glance_api_config('DEFAULT/known_stores').with_value("glance.store.filesystem.Store,glance.store.http.Store") }
+    it { should contain_glance_api_config('glance_store/stores').with_value("glance.store.filesystem.Store,glance.store.http.Store") }
   end
 
   describe 'with deprecated sql parameters' do
diff --git a/spec/classes/glance_backend_cinder_spec.rb b/spec/classes/glance_backend_cinder_spec.rb
index 55c82d52..bc4b43c2 100644
--- a/spec/classes/glance_backend_cinder_spec.rb
+++ b/spec/classes/glance_backend_cinder_spec.rb
@@ -31,7 +31,7 @@ describe 'glance::backend::cinder' do
     context 'when default parameters' do
 
       it 'configures glance-api.conf' do
-        should contain_glance_api_config('DEFAULT/default_store').with_value('cinder')
+        should contain_glance_api_config('glance_store/default_store').with_value('cinder')
         should contain_glance_api_config('DEFAULT/cinder_api_insecure').with_value(false)
         should contain_glance_api_config('DEFAULT/cinder_catalog_info').with_value('volume:cinder:publicURL')
         should contain_glance_api_config('DEFAULT/cinder_http_retries').with_value('3')
@@ -58,7 +58,7 @@ describe 'glance::backend::cinder' do
         }
       end
       it 'configures glance-api.conf' do
-        should contain_glance_api_config('DEFAULT/default_store').with_value('cinder')
+        should contain_glance_api_config('glance_store/default_store').with_value('cinder')
         should contain_glance_api_config('DEFAULT/cinder_api_insecure').with_value(true)
         should contain_glance_api_config('DEFAULT/cinder_ca_certificates_file').with_value('/etc/ssh/ca.crt')
         should contain_glance_api_config('DEFAULT/cinder_catalog_info').with_value('volume:cinder:internalURL')
diff --git a/spec/classes/glance_backend_file_spec.rb b/spec/classes/glance_backend_file_spec.rb
index fac7fcf4..5a3b5c4e 100644
--- a/spec/classes/glance_backend_file_spec.rb
+++ b/spec/classes/glance_backend_file_spec.rb
@@ -10,12 +10,12 @@ describe 'glance::backend::file' do
   end
 
   it 'configures glance-api.conf' do
-    should contain_glance_api_config('DEFAULT/default_store').with_value('file')
-    should contain_glance_api_config('DEFAULT/filesystem_store_datadir').with_value('/var/lib/glance/images/')
+    should contain_glance_api_config('glance_store/default_store').with_value('file')
+    should contain_glance_api_config('glance_store/filesystem_store_datadir').with_value('/var/lib/glance/images/')
   end
 
   it 'configures glance-cache.conf' do
-    should contain_glance_cache_config('DEFAULT/filesystem_store_datadir').with_value('/var/lib/glance/images/')
+    should contain_glance_cache_config('glance_store/filesystem_store_datadir').with_value('/var/lib/glance/images/')
   end
 
   describe 'when overriding datadir' do
@@ -24,11 +24,11 @@ describe 'glance::backend::file' do
     end
 
     it 'configures glance-api.conf' do
-      should contain_glance_api_config('DEFAULT/filesystem_store_datadir').with_value('/tmp/')
+      should contain_glance_api_config('glance_store/filesystem_store_datadir').with_value('/tmp/')
     end
 
     it 'configures glance-cache.conf' do
-      should contain_glance_cache_config('DEFAULT/filesystem_store_datadir').with_value('/tmp/')
+      should contain_glance_cache_config('glance_store/filesystem_store_datadir').with_value('/tmp/')
     end
   end
 end
diff --git a/spec/classes/glance_backend_rbd_spec.rb b/spec/classes/glance_backend_rbd_spec.rb
index f78b61e8..d831304c 100644
--- a/spec/classes/glance_backend_rbd_spec.rb
+++ b/spec/classes/glance_backend_rbd_spec.rb
@@ -14,7 +14,7 @@ describe 'glance::backend::rbd' do
       }
     end
 
-    it { should contain_glance_api_config('DEFAULT/default_store').with_value('rbd') }
+    it { should contain_glance_api_config('glance_store/default_store').with_value('rbd') }
     it { should contain_glance_api_config('DEFAULT/rbd_store_pool').with_value('images') }
     it { should contain_glance_api_config('DEFAULT/rbd_store_ceph_conf').with_value('/etc/ceph/ceph.conf') }
     it { should contain_glance_api_config('DEFAULT/rbd_store_chunk_size').with_value('8') }
diff --git a/spec/classes/glance_backend_swift_spec.rb b/spec/classes/glance_backend_swift_spec.rb
index 0c5569a9..ddd946c9 100644
--- a/spec/classes/glance_backend_swift_spec.rb
+++ b/spec/classes/glance_backend_swift_spec.rb
@@ -21,22 +21,22 @@ describe 'glance::backend::swift' do
   describe 'when default parameters' do
 
     it 'configures glance-api.conf' do
-      should contain_glance_api_config('DEFAULT/default_store').with_value('swift')
-      should contain_glance_api_config('DEFAULT/swift_store_key').with_value('key')
-      should contain_glance_api_config('DEFAULT/swift_store_user').with_value('user')
+      should contain_glance_api_config('glance_store/default_store').with_value('swift')
+      should contain_glance_api_config('glance_store/swift_store_key').with_value('key')
+      should contain_glance_api_config('glance_store/swift_store_user').with_value('user')
       should contain_glance_api_config('DEFAULT/swift_store_auth_version').with_value('2')
       should contain_glance_api_config('DEFAULT/swift_store_large_object_size').with_value('5120')
-      should contain_glance_api_config('DEFAULT/swift_store_auth_address').with_value('127.0.0.1:5000/v2.0/')
+      should contain_glance_api_config('glance_store/swift_store_auth_address').with_value('127.0.0.1:5000/v2.0/')
       should contain_glance_api_config('DEFAULT/swift_store_container').with_value('glance')
       should contain_glance_api_config('DEFAULT/swift_store_create_container_on_put').with_value(false)
     end
 
     it 'configures glance-cache.conf' do
-      should contain_glance_cache_config('DEFAULT/swift_store_key').with_value('key')
-      should contain_glance_cache_config('DEFAULT/swift_store_user').with_value('user')
+      should contain_glance_cache_config('glance_store/swift_store_key').with_value('key')
+      should contain_glance_cache_config('glance_store/swift_store_user').with_value('user')
       should contain_glance_cache_config('DEFAULT/swift_store_auth_version').with_value('2')
       should contain_glance_cache_config('DEFAULT/swift_store_large_object_size').with_value('5120')
-      should contain_glance_cache_config('DEFAULT/swift_store_auth_address').with_value('127.0.0.1:5000/v2.0/')
+      should contain_glance_cache_config('glance_store/swift_store_auth_address').with_value('127.0.0.1:5000/v2.0/')
       should contain_glance_cache_config('DEFAULT/swift_store_container').with_value('glance')
       should contain_glance_cache_config('DEFAULT/swift_store_create_container_on_put').with_value(false)
     end
@@ -60,7 +60,7 @@ describe 'glance::backend::swift' do
       should contain_glance_api_config('DEFAULT/swift_store_create_container_on_put').with_value(true)
       should contain_glance_api_config('DEFAULT/swift_store_auth_version').with_value('1')
       should contain_glance_api_config('DEFAULT/swift_store_large_object_size').with_value('100')
-      should contain_glance_api_config('DEFAULT/swift_store_auth_address').with_value('127.0.0.2:8080/v1.0/')
+      should contain_glance_api_config('glance_store/swift_store_auth_address').with_value('127.0.0.2:8080/v1.0/')
     end
 
     it 'configures glance-cache.conf' do
@@ -68,7 +68,7 @@ describe 'glance::backend::swift' do
       should contain_glance_cache_config('DEFAULT/swift_store_create_container_on_put').with_value(true)
       should contain_glance_cache_config('DEFAULT/swift_store_auth_version').with_value('1')
       should contain_glance_cache_config('DEFAULT/swift_store_large_object_size').with_value('100')
-      should contain_glance_cache_config('DEFAULT/swift_store_auth_address').with_value('127.0.0.2:8080/v1.0/')
+      should contain_glance_cache_config('glance_store/swift_store_auth_address').with_value('127.0.0.2:8080/v1.0/')
     end
   end
 end