diff --git a/lib/remote_storage/swift.rb b/lib/remote_storage/swift.rb
index 8dde63b..1be255c 100644
--- a/lib/remote_storage/swift.rb
+++ b/lib/remote_storage/swift.rb
@@ -537,7 +537,7 @@ module RemoteStorage
     end
 
     def directory_backend(user)
-      @directory_backend ||= redis.get("rs_config:dir_backend:#{user}") || "legacy"
+      @directory_backend ||= redis.get("rsc:db:#{user}") || "legacy"
     end
 
     def etag_for(body)
diff --git a/migrate_metadata_to_redis.rb b/migrate_metadata_to_redis.rb
index e7e66dd..952aea4 100755
--- a/migrate_metadata_to_redis.rb
+++ b/migrate_metadata_to_redis.rb
@@ -57,7 +57,7 @@ class Migrator
   end
 
   def set_directory_backend(backend)
-    redis.set("rs_config:dir_backend:#{username}", backend) unless dry_run
+    redis.set("rsc:db:#{username}", backend) unless dry_run
   end
 
   def work_on_dir(directory, parent_directory)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4975f52..dfc955f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -39,7 +39,7 @@ if app.settings.respond_to? :redis
   end
 
   def purge_redis
-    redis.keys("rs_*").each do |key|
+    redis.keys("rs*").each do |key|
       redis.del key
     end
   end
diff --git a/spec/swift/app_spec.rb b/spec/swift/app_spec.rb
index 3323b26..b42a95a 100644
--- a/spec/swift/app_spec.rb
+++ b/spec/swift/app_spec.rb
@@ -16,7 +16,7 @@ describe "App" do
 
     before do
       purge_redis
-      redis.set "rs_config:dir_backend:phil", "new"
+      redis.set "rsc:db:phil", "new"
     end
 
     context "authorized" do
@@ -115,7 +115,7 @@ describe "App" do
       describe "directory backend configuration" do
         context "locked new backed" do
           before do
-            redis.set "rs_config:dir_backend:phil", "new-locked"
+            redis.set "rsc:db:phil", "new-locked"
           end
 
           it "responds with 503" do
@@ -130,7 +130,7 @@ describe "App" do
 
         context "locked legacy backend" do
           before do
-            redis.set "rs_config:dir_backend:phil", "legacy-locked"
+            redis.set "rsc:db:phil", "legacy-locked"
           end
 
           it "responds with 503" do
@@ -150,7 +150,7 @@ describe "App" do
 
     before do
       purge_redis
-      redis.set "rs_config:dir_backend:phil", "new"
+      redis.set "rsc:db:phil", "new"
     end
 
     context "authorized" do
@@ -239,7 +239,7 @@ describe "App" do
 
     before do
       purge_redis
-      redis.set "rs_config:dir_backend:phil", "new"
+      redis.set "rsc:db:phil", "new"
     end
 
     context "authorized" do
@@ -318,7 +318,7 @@ describe "App" do
           put "/phil/food/camaron", "yummi"
         end
 
-        redis.set "rs_config:dir_backend:phil", "legacy"
+        redis.set "rsc:db:phil", "legacy"
       end
 
       it "serves directory listing from Swift backend" do