diff --git a/lib/remote_storage/s3_rest.rb b/lib/remote_storage/s3.rb
similarity index 99%
rename from lib/remote_storage/s3_rest.rb
rename to lib/remote_storage/s3.rb
index fd9d62d..c195272 100644
--- a/lib/remote_storage/s3_rest.rb
+++ b/lib/remote_storage/s3.rb
@@ -5,7 +5,7 @@ require "openssl"
 require "webrick/httputils"
 
 module RemoteStorage
-  class S3Rest
+  class S3
     include RestProvider
 
     private
diff --git a/liquor-cabinet.rb b/liquor-cabinet.rb
index 2d21522..6f6324f 100644
--- a/liquor-cabinet.rb
+++ b/liquor-cabinet.rb
@@ -5,7 +5,7 @@ require "sinatra/base"
 require 'sinatra/config_file'
 require "sinatra/reloader"
 require "remote_storage/swift"
-require "remote_storage/s3_rest"
+require "remote_storage/s3"
 
 class LiquorCabinet < Sinatra::Base
 
@@ -132,7 +132,7 @@ class LiquorCabinet < Sinatra::Base
       if settings.respond_to? :swift
         RemoteStorage::Swift.new(settings, self)
       elsif settings.respond_to? :s3
-        RemoteStorage::S3Rest.new(settings, self)
+        RemoteStorage::S3.new(settings, self)
       else
         puts <<-EOF
 You need to set one storage backend in your config.yml file.
diff --git a/spec/s3/app_spec.rb b/spec/s3/app_spec.rb
index eb0bd39..828c6f8 100644
--- a/spec/s3/app_spec.rb
+++ b/spec/s3/app_spec.rb
@@ -6,7 +6,7 @@ describe "S3 provider" do
   end
 
   def storage_class
-    RemoteStorage::S3Rest
+    RemoteStorage::S3
   end
 
   before do