diff --git a/manifests/init.pp b/manifests/init.pp
index abea974..4e6dc04 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -391,8 +391,8 @@ class cloudkitty(
   }
 
   cloudkitty_config {
-    'keystone_fetcher/auth_section':     value => $auth_section;
-    'keystone_fetcher/keystone_version': value => $keystone_version;
+    'fetcher_keystone/auth_section':     value => $auth_section;
+    'fetcher_keystone/keystone_version': value => $keystone_version;
   }
 
 }
diff --git a/manifests/processor.pp b/manifests/processor.pp
index f7d6902..a04a3e4 100644
--- a/manifests/processor.pp
+++ b/manifests/processor.pp
@@ -97,8 +97,8 @@ class cloudkitty::processor (
 
   cloudkitty_config {
     'collect/collector':              value => $collector;
-    'gnocchi_collector/auth_type':    value => $auth_type;
-    'gnocchi_collector/auth_section': value => $auth_section
+    'collector_gnocchi/auth_type':    value => $auth_type;
+    'collector_gnocchi/auth_section': value => $auth_section
   }
 
 }
diff --git a/spec/classes/cloudkitty_init_spec.rb b/spec/classes/cloudkitty_init_spec.rb
index 30029d5..bbde3b3 100644
--- a/spec/classes/cloudkitty_init_spec.rb
+++ b/spec/classes/cloudkitty_init_spec.rb
@@ -77,8 +77,8 @@ describe 'cloudkitty' do
         is_expected.to contain_cloudkitty_config('oslo_messaging_notifications/topics').with_value('openstack')
         is_expected.to contain_cloudkitty_config('storage/backend').with_value('gnocchi')
         is_expected.to contain_cloudkitty_config('storage/version').with_value('1')
-        is_expected.to contain_cloudkitty_config('keystone_fetcher/auth_section').with_value('keystone_authtoken')
-        is_expected.to contain_cloudkitty_config('keystone_fetcher/keystone_version').with_value('3')
+        is_expected.to contain_cloudkitty_config('fetcher_keystone/auth_section').with_value('keystone_authtoken')
+        is_expected.to contain_cloudkitty_config('fetcher_keystone/keystone_version').with_value('3')
       end
 
     end
diff --git a/spec/classes/cloudkitty_processor_spec.rb b/spec/classes/cloudkitty_processor_spec.rb
index b5a5fac..3292464 100644
--- a/spec/classes/cloudkitty_processor_spec.rb
+++ b/spec/classes/cloudkitty_processor_spec.rb
@@ -21,8 +21,8 @@ describe 'cloudkitty::processor' do
       it { is_expected.to contain_cloudkitty_config('collect/window').with_value( params[:window] ) }
       it { is_expected.to contain_cloudkitty_config('collect/period').with_value( params[:period] ) }
       it { is_expected.to contain_cloudkitty_config('collect/wait_periods').with_value( params[:wait_periods] ) }
-      it { is_expected.to contain_cloudkitty_config('gnocchi_collector/auth_type').with_value('password') }
-      it { is_expected.to contain_cloudkitty_config('gnocchi_collector/auth_section').with_value('keystone_authtoken') }
+      it { is_expected.to contain_cloudkitty_config('collector_gnocchi/auth_type').with_value('password') }
+      it { is_expected.to contain_cloudkitty_config('collector_gnocchi/auth_section').with_value('keystone_authtoken') }
 
       it 'installs cloudkitty-processor package' do
         is_expected.to contain_package('cloudkitty-processor').with(