diff --git a/bin/swfiller b/bin/swfiller
index b39703c..9f1c3b9 100755
--- a/bin/swfiller
+++ b/bin/swfiller
@@ -73,9 +73,9 @@ def main():
         sys.exit(1)
 
     sw_c_concu = int(utils.get_config('filler',
-                                      'swift_client_concurrency'))
+                                      'filler_swift_client_concurrency'))
     ks_c_concu = int(utils.get_config('filler',
-                                      'keystone_client_concurrency'))
+                                      'filler_keystone_client_concurrency'))
     pile = eventlet.GreenPile(sw_c_concu)
     pool = eventlet.GreenPool(ks_c_concu)
 
diff --git a/etc/config.ini b/etc/config.ini
index ec276c2..f681ba3 100644
--- a/etc/config.ini
+++ b/etc/config.ini
@@ -7,8 +7,6 @@ keystone_dest = http://vm2:5000/v2.0
 keystone_origin_demo_credentials = demo:demo:ADMIN
 keystone_dest_credentials = demo:demo:ADMIN
 
-[sync]
-
 [filler]
 swift_operator_role = Member
 
@@ -19,7 +17,7 @@ index_path = /tmp/swift_filler_index.pkl
 index_containers_path = /tmp/swift_filler_containers_index.pkl
 
 [concurrency]
-keystone_client_concurrency = 5
-swift_client_concurrency = 10
+filler_keystone_client_concurrency = 5
+filler_swift_client_concurrency = 10
 # This is usually  bound to the max open files.
 sync_swift_client_concurrency = 10
diff --git a/tests/units/test_filler.py b/tests/units/test_filler.py
index 6313acc..935f7fc 100644
--- a/tests/units/test_filler.py
+++ b/tests/units/test_filler.py
@@ -139,7 +139,7 @@ class TestFiller(base.TestCase):
         self.stubs.Set(filler, 'create_containers', create_containers)
 
         concurrency = int(utils.get_config('concurrency',
-                                           'swift_client_concurrency'))
+                                           'filler_swift_client_concurrency'))
         pool = eventlet.GreenPool(concurrency)
 
         created = {('account1', 'account1_id'): ['test', 'test_id', 'role_id'],
@@ -204,7 +204,7 @@ class TestFiller(base.TestCase):
         self.stubs.Set(filler, 'create_swift_user', create_swift_user)
 
         concurrency = int(utils.get_config('concurrency',
-                                           'keystone_client_concurrency'))
+                          'filler_keystone_client_concurrency'))
         pile = eventlet.GreenPile(concurrency)
         client = FakeKSClient()
         filler.create_swift_account(client, pile, 1, 1, self.ret_index)
@@ -233,7 +233,7 @@ class TestFiller(base.TestCase):
         self.stubs.Set(filler, 'create_swift_user', create_swift_user)
 
         concurrency = int(utils.get_config('concurrency',
-                                           'keystone_client_concurrency'))
+                          'filler_keystone_client_concurrency'))
         pile = eventlet.GreenPile(concurrency)
         filler.create_swift_account(client, pile, 3, 1, self.ret_index)