diff --git a/lib/fog/aws/service_mapper.rb b/lib/fog/aws/service_mapper.rb
index 10674b861..8d10d4b44 100644
--- a/lib/fog/aws/service_mapper.rb
+++ b/lib/fog/aws/service_mapper.rb
@@ -46,7 +46,7 @@ module Fog
         when :sqs
           Fog::AWS::SQS
         when :eu_storage, :storage
-          Fog::Storage::AWS
+          Fog::AWS::Storage
         when :rds
           Fog::AWS::RDS
         when :sns
diff --git a/spec/fog/bin/aws_spec.rb b/spec/fog/bin/aws_spec.rb
index 1ced7e36f..7792bc954 100644
--- a/spec/fog/bin/aws_spec.rb
+++ b/spec/fog/bin/aws_spec.rb
@@ -34,8 +34,8 @@ describe AWS do
     :simpledb => Fog::AWS::SimpleDB,
     :ses => Fog::AWS::SES,
     :sqs => Fog::AWS::SQS,
-    :eu_storage => Fog::Storage::AWS,
-    :storage => Fog::Storage::AWS,
+    :eu_storage => Fog::AWS::Storage,
+    :storage => Fog::AWS::Storage,
     :rds => Fog::AWS::RDS,
     :sns => Fog::AWS::SNS,
     :sts => Fog::AWS::STS