From 646fc73c33c72d6c386da5f8dc8e5bf8252496ce Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Wed, 12 Sep 2018 18:24:17 +0900
Subject: [PATCH 01/39] Add AWS::Compute

---
 lib/fog/aws.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/fog/aws.rb b/lib/fog/aws.rb
index cf5f69cc66..a70da1e647 100644
--- a/lib/fog/aws.rb
+++ b/lib/fog/aws.rb
@@ -9,10 +9,6 @@ module CDN
     autoload :AWS,  File.expand_path('../aws/cdn', __FILE__)
   end
 
-  module Compute
-    autoload :AWS, File.expand_path('../aws/compute', __FILE__)
-  end
-
   module DNS
     autoload :AWS, File.expand_path('../aws/dns', __FILE__)
   end
@@ -34,6 +30,7 @@ module AWS
     autoload :AutoScaling,      File.expand_path('../aws/auto_scaling', __FILE__)
     autoload :CloudFormation,   File.expand_path('../aws/cloud_formation', __FILE__)
     autoload :CloudWatch,       File.expand_path('../aws/cloud_watch', __FILE__)
+    autoload :Compute,          File.expand_path('../aws/compute', __FILE__)
     autoload :DataPipeline,     File.expand_path('../aws/data_pipeline', __FILE__)
     autoload :DynamoDB,         File.expand_path('../aws/dynamodb', __FILE__)
     autoload :ECS,              File.expand_path('../aws/ecs', __FILE__)

From f15cb0ce0f1100c663f25823a7b77913db8bda8a Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Wed, 12 Sep 2018 18:34:10 +0900
Subject: [PATCH 02/39] git grep -l "module Compute" --
 lib/fog/aws/models/compute/ | xargs sed -i "" "s/module Compute/module AWS/g"

---
 lib/fog/aws/models/compute/address.rb            | 2 +-
 lib/fog/aws/models/compute/addresses.rb          | 2 +-
 lib/fog/aws/models/compute/dhcp_option.rb        | 2 +-
 lib/fog/aws/models/compute/dhcp_options.rb       | 2 +-
 lib/fog/aws/models/compute/flavor.rb             | 2 +-
 lib/fog/aws/models/compute/flavors.rb            | 2 +-
 lib/fog/aws/models/compute/image.rb              | 2 +-
 lib/fog/aws/models/compute/images.rb             | 2 +-
 lib/fog/aws/models/compute/internet_gateway.rb   | 2 +-
 lib/fog/aws/models/compute/internet_gateways.rb  | 2 +-
 lib/fog/aws/models/compute/key_pair.rb           | 2 +-
 lib/fog/aws/models/compute/key_pairs.rb          | 2 +-
 lib/fog/aws/models/compute/network_acl.rb        | 2 +-
 lib/fog/aws/models/compute/network_acls.rb       | 2 +-
 lib/fog/aws/models/compute/network_interface.rb  | 2 +-
 lib/fog/aws/models/compute/network_interfaces.rb | 2 +-
 lib/fog/aws/models/compute/route_table.rb        | 2 +-
 lib/fog/aws/models/compute/route_tables.rb       | 2 +-
 lib/fog/aws/models/compute/security_group.rb     | 2 +-
 lib/fog/aws/models/compute/security_groups.rb    | 2 +-
 lib/fog/aws/models/compute/server.rb             | 2 +-
 lib/fog/aws/models/compute/servers.rb            | 2 +-
 lib/fog/aws/models/compute/snapshot.rb           | 2 +-
 lib/fog/aws/models/compute/snapshots.rb          | 2 +-
 lib/fog/aws/models/compute/spot_request.rb       | 2 +-
 lib/fog/aws/models/compute/spot_requests.rb      | 2 +-
 lib/fog/aws/models/compute/subnet.rb             | 2 +-
 lib/fog/aws/models/compute/subnets.rb            | 2 +-
 lib/fog/aws/models/compute/tag.rb                | 2 +-
 lib/fog/aws/models/compute/tags.rb               | 2 +-
 lib/fog/aws/models/compute/volume.rb             | 2 +-
 lib/fog/aws/models/compute/volumes.rb            | 2 +-
 lib/fog/aws/models/compute/vpc.rb                | 2 +-
 lib/fog/aws/models/compute/vpcs.rb               | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/lib/fog/aws/models/compute/address.rb b/lib/fog/aws/models/compute/address.rb
index 6be7a9f793..e6394fb361 100644
--- a/lib/fog/aws/models/compute/address.rb
+++ b/lib/fog/aws/models/compute/address.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Address < Fog::Model
         identity  :public_ip,                  :aliases => 'publicIp'
diff --git a/lib/fog/aws/models/compute/addresses.rb b/lib/fog/aws/models/compute/addresses.rb
index 6e50c86919..c83e02d25a 100644
--- a/lib/fog/aws/models/compute/addresses.rb
+++ b/lib/fog/aws/models/compute/addresses.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/address'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Addresses < Fog::Collection
         attribute :filters
diff --git a/lib/fog/aws/models/compute/dhcp_option.rb b/lib/fog/aws/models/compute/dhcp_option.rb
index 35cb814800..1b9b1ee148 100644
--- a/lib/fog/aws/models/compute/dhcp_option.rb
+++ b/lib/fog/aws/models/compute/dhcp_option.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class DhcpOption < Fog::Model
         identity  :id,                          :aliases => 'dhcpOptionsId'
diff --git a/lib/fog/aws/models/compute/dhcp_options.rb b/lib/fog/aws/models/compute/dhcp_options.rb
index f41ba89648..b09dab77ea 100644
--- a/lib/fog/aws/models/compute/dhcp_options.rb
+++ b/lib/fog/aws/models/compute/dhcp_options.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/dhcp_option'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class DhcpOptions < Fog::Collection
         attribute :filters
diff --git a/lib/fog/aws/models/compute/flavor.rb b/lib/fog/aws/models/compute/flavor.rb
index 4754efb7ba..986785f10b 100644
--- a/lib/fog/aws/models/compute/flavor.rb
+++ b/lib/fog/aws/models/compute/flavor.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Flavor < Fog::Model
         identity :id
diff --git a/lib/fog/aws/models/compute/flavors.rb b/lib/fog/aws/models/compute/flavors.rb
index 0b00609e88..4596bd177c 100644
--- a/lib/fog/aws/models/compute/flavors.rb
+++ b/lib/fog/aws/models/compute/flavors.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/flavor'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       FLAVORS = [
         {
diff --git a/lib/fog/aws/models/compute/image.rb b/lib/fog/aws/models/compute/image.rb
index 687d299d1c..29e6a96c6f 100644
--- a/lib/fog/aws/models/compute/image.rb
+++ b/lib/fog/aws/models/compute/image.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Image < Fog::Model
         identity :id,                     :aliases => 'imageId'
diff --git a/lib/fog/aws/models/compute/images.rb b/lib/fog/aws/models/compute/images.rb
index b9690f5d5e..3b9d220cb3 100644
--- a/lib/fog/aws/models/compute/images.rb
+++ b/lib/fog/aws/models/compute/images.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/image'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Images < Fog::Collection
         attribute :filters
diff --git a/lib/fog/aws/models/compute/internet_gateway.rb b/lib/fog/aws/models/compute/internet_gateway.rb
index 6c0ebacc2a..d11167cb9a 100644
--- a/lib/fog/aws/models/compute/internet_gateway.rb
+++ b/lib/fog/aws/models/compute/internet_gateway.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class InternetGateway < Fog::Model
         identity  :id,                          :aliases => 'internetGatewayId'
diff --git a/lib/fog/aws/models/compute/internet_gateways.rb b/lib/fog/aws/models/compute/internet_gateways.rb
index 551db5882d..ed4592535c 100644
--- a/lib/fog/aws/models/compute/internet_gateways.rb
+++ b/lib/fog/aws/models/compute/internet_gateways.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/internet_gateway'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class InternetGateways < Fog::Collection
         attribute :filters
diff --git a/lib/fog/aws/models/compute/key_pair.rb b/lib/fog/aws/models/compute/key_pair.rb
index e42cc900e8..14be784955 100644
--- a/lib/fog/aws/models/compute/key_pair.rb
+++ b/lib/fog/aws/models/compute/key_pair.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class KeyPair < Fog::Model
         identity  :name,        :aliases => 'keyName'
diff --git a/lib/fog/aws/models/compute/key_pairs.rb b/lib/fog/aws/models/compute/key_pairs.rb
index 6bc3091ace..7edc446518 100644
--- a/lib/fog/aws/models/compute/key_pairs.rb
+++ b/lib/fog/aws/models/compute/key_pairs.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/key_pair'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class KeyPairs < Fog::Collection
         attribute :filters
diff --git a/lib/fog/aws/models/compute/network_acl.rb b/lib/fog/aws/models/compute/network_acl.rb
index 32a0206db0..b9853bf33f 100644
--- a/lib/fog/aws/models/compute/network_acl.rb
+++ b/lib/fog/aws/models/compute/network_acl.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class NetworkAcl < Fog::Model
         ICMP = 1
diff --git a/lib/fog/aws/models/compute/network_acls.rb b/lib/fog/aws/models/compute/network_acls.rb
index 5ad8ef6bfd..ae6fc25159 100644
--- a/lib/fog/aws/models/compute/network_acls.rb
+++ b/lib/fog/aws/models/compute/network_acls.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/network_acl'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class NetworkAcls < Fog::Collection
         attribute :filters
diff --git a/lib/fog/aws/models/compute/network_interface.rb b/lib/fog/aws/models/compute/network_interface.rb
index 342186a3c2..f0bc580095 100644
--- a/lib/fog/aws/models/compute/network_interface.rb
+++ b/lib/fog/aws/models/compute/network_interface.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class NetworkInterface < Fog::Model
         identity  :network_interface_id,        :aliases => 'networkInterfaceId'
diff --git a/lib/fog/aws/models/compute/network_interfaces.rb b/lib/fog/aws/models/compute/network_interfaces.rb
index c624eed871..c2faebb34e 100644
--- a/lib/fog/aws/models/compute/network_interfaces.rb
+++ b/lib/fog/aws/models/compute/network_interfaces.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/network_interface'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class NetworkInterfaces < Fog::Collection
         attribute :filters
diff --git a/lib/fog/aws/models/compute/route_table.rb b/lib/fog/aws/models/compute/route_table.rb
index cd1f705a0c..20bcd32294 100644
--- a/lib/fog/aws/models/compute/route_table.rb
+++ b/lib/fog/aws/models/compute/route_table.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class RouteTable < Fog::Model
         identity :id,                :aliases => 'routeTableId'
diff --git a/lib/fog/aws/models/compute/route_tables.rb b/lib/fog/aws/models/compute/route_tables.rb
index e7e3c9552d..73fefe4a4a 100644
--- a/lib/fog/aws/models/compute/route_tables.rb
+++ b/lib/fog/aws/models/compute/route_tables.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/route_table'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class RouteTables < Fog::Collection
         attribute :filters
diff --git a/lib/fog/aws/models/compute/security_group.rb b/lib/fog/aws/models/compute/security_group.rb
index 0c657c536a..25c663b70c 100644
--- a/lib/fog/aws/models/compute/security_group.rb
+++ b/lib/fog/aws/models/compute/security_group.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class SecurityGroup < Fog::Model
         identity  :name,            :aliases => 'groupName'
diff --git a/lib/fog/aws/models/compute/security_groups.rb b/lib/fog/aws/models/compute/security_groups.rb
index 296dffd298..38b21d3384 100644
--- a/lib/fog/aws/models/compute/security_groups.rb
+++ b/lib/fog/aws/models/compute/security_groups.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/security_group'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class SecurityGroups < Fog::Collection
         attribute :filters
diff --git a/lib/fog/aws/models/compute/server.rb b/lib/fog/aws/models/compute/server.rb
index 023e3e9354..e23a5eae3d 100644
--- a/lib/fog/aws/models/compute/server.rb
+++ b/lib/fog/aws/models/compute/server.rb
@@ -1,7 +1,7 @@
 require 'fog/compute/models/server'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Server < Fog::Compute::Server
         extend Fog::Deprecation
diff --git a/lib/fog/aws/models/compute/servers.rb b/lib/fog/aws/models/compute/servers.rb
index fe87610771..f1ea18ba35 100644
--- a/lib/fog/aws/models/compute/servers.rb
+++ b/lib/fog/aws/models/compute/servers.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/server'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Servers < Fog::Collection
         attribute :filters
diff --git a/lib/fog/aws/models/compute/snapshot.rb b/lib/fog/aws/models/compute/snapshot.rb
index 7de36ba40e..089b4b8ac1 100644
--- a/lib/fog/aws/models/compute/snapshot.rb
+++ b/lib/fog/aws/models/compute/snapshot.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Snapshot < Fog::Model
         identity  :id,          :aliases => 'snapshotId'
diff --git a/lib/fog/aws/models/compute/snapshots.rb b/lib/fog/aws/models/compute/snapshots.rb
index 1305ce7e6b..c8f69e1dc3 100644
--- a/lib/fog/aws/models/compute/snapshots.rb
+++ b/lib/fog/aws/models/compute/snapshots.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/snapshot'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Snapshots < Fog::Collection
         attribute :filters
diff --git a/lib/fog/aws/models/compute/spot_request.rb b/lib/fog/aws/models/compute/spot_request.rb
index c95df6caf1..6ac6df13fa 100644
--- a/lib/fog/aws/models/compute/spot_request.rb
+++ b/lib/fog/aws/models/compute/spot_request.rb
@@ -1,7 +1,7 @@
 require 'fog/compute/models/server'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class SpotRequest < Fog::Compute::Server
         identity :id,                          :aliases => 'spotInstanceRequestId'
diff --git a/lib/fog/aws/models/compute/spot_requests.rb b/lib/fog/aws/models/compute/spot_requests.rb
index 5aac83553b..f6f9149791 100644
--- a/lib/fog/aws/models/compute/spot_requests.rb
+++ b/lib/fog/aws/models/compute/spot_requests.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/spot_request'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class SpotRequests < Fog::Collection
         attribute :filters
diff --git a/lib/fog/aws/models/compute/subnet.rb b/lib/fog/aws/models/compute/subnet.rb
index cb0a9a9351..981308a98a 100644
--- a/lib/fog/aws/models/compute/subnet.rb
+++ b/lib/fog/aws/models/compute/subnet.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Subnet < Fog::Model
         identity  :subnet_id,                   :aliases => 'subnetId'
diff --git a/lib/fog/aws/models/compute/subnets.rb b/lib/fog/aws/models/compute/subnets.rb
index 10e9e2cde3..783c66e388 100644
--- a/lib/fog/aws/models/compute/subnets.rb
+++ b/lib/fog/aws/models/compute/subnets.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/subnet'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Subnets < Fog::Collection
         attribute :filters
diff --git a/lib/fog/aws/models/compute/tag.rb b/lib/fog/aws/models/compute/tag.rb
index b0bdfaf84b..b115dc9cb3 100644
--- a/lib/fog/aws/models/compute/tag.rb
+++ b/lib/fog/aws/models/compute/tag.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Tag < Fog::Model
         identity  :key
diff --git a/lib/fog/aws/models/compute/tags.rb b/lib/fog/aws/models/compute/tags.rb
index 07dbc7a169..e16ecd508e 100644
--- a/lib/fog/aws/models/compute/tags.rb
+++ b/lib/fog/aws/models/compute/tags.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/tag'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Tags < Fog::Collection
         attribute :filters
diff --git a/lib/fog/aws/models/compute/volume.rb b/lib/fog/aws/models/compute/volume.rb
index 0d894b98ba..ffb3d2d50e 100644
--- a/lib/fog/aws/models/compute/volume.rb
+++ b/lib/fog/aws/models/compute/volume.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Volume < Fog::Model
         identity  :id,                    :aliases => 'volumeId'
diff --git a/lib/fog/aws/models/compute/volumes.rb b/lib/fog/aws/models/compute/volumes.rb
index 145eabdf65..69931484ba 100644
--- a/lib/fog/aws/models/compute/volumes.rb
+++ b/lib/fog/aws/models/compute/volumes.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/volume'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Volumes < Fog::Collection
         attribute :filters
diff --git a/lib/fog/aws/models/compute/vpc.rb b/lib/fog/aws/models/compute/vpc.rb
index ce1c040030..829185f662 100644
--- a/lib/fog/aws/models/compute/vpc.rb
+++ b/lib/fog/aws/models/compute/vpc.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class VPC < Fog::Model
         identity :id,                :aliases => 'vpcId'
diff --git a/lib/fog/aws/models/compute/vpcs.rb b/lib/fog/aws/models/compute/vpcs.rb
index e06786e65b..298d06d559 100644
--- a/lib/fog/aws/models/compute/vpcs.rb
+++ b/lib/fog/aws/models/compute/vpcs.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/compute/vpc'
 
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Vpcs < Fog::Collection
         attribute :filters

From 95db0ae8f734bfcabae926e05896b30bd19f3fc1 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Wed, 12 Sep 2018 18:34:35 +0900
Subject: [PATCH 03/39] git grep -l "class AWS" -- lib/fog/aws/models/compute/
 | xargs sed -i "" "s/class AWS/class Compute/g"

---
 lib/fog/aws/models/compute/address.rb            | 2 +-
 lib/fog/aws/models/compute/addresses.rb          | 2 +-
 lib/fog/aws/models/compute/dhcp_option.rb        | 2 +-
 lib/fog/aws/models/compute/dhcp_options.rb       | 2 +-
 lib/fog/aws/models/compute/flavor.rb             | 2 +-
 lib/fog/aws/models/compute/flavors.rb            | 2 +-
 lib/fog/aws/models/compute/image.rb              | 2 +-
 lib/fog/aws/models/compute/images.rb             | 2 +-
 lib/fog/aws/models/compute/internet_gateway.rb   | 2 +-
 lib/fog/aws/models/compute/internet_gateways.rb  | 2 +-
 lib/fog/aws/models/compute/key_pair.rb           | 2 +-
 lib/fog/aws/models/compute/key_pairs.rb          | 2 +-
 lib/fog/aws/models/compute/network_acl.rb        | 2 +-
 lib/fog/aws/models/compute/network_acls.rb       | 2 +-
 lib/fog/aws/models/compute/network_interface.rb  | 2 +-
 lib/fog/aws/models/compute/network_interfaces.rb | 2 +-
 lib/fog/aws/models/compute/route_table.rb        | 2 +-
 lib/fog/aws/models/compute/route_tables.rb       | 2 +-
 lib/fog/aws/models/compute/security_group.rb     | 2 +-
 lib/fog/aws/models/compute/security_groups.rb    | 2 +-
 lib/fog/aws/models/compute/server.rb             | 2 +-
 lib/fog/aws/models/compute/servers.rb            | 2 +-
 lib/fog/aws/models/compute/snapshot.rb           | 2 +-
 lib/fog/aws/models/compute/snapshots.rb          | 2 +-
 lib/fog/aws/models/compute/spot_request.rb       | 2 +-
 lib/fog/aws/models/compute/spot_requests.rb      | 2 +-
 lib/fog/aws/models/compute/subnet.rb             | 2 +-
 lib/fog/aws/models/compute/subnets.rb            | 2 +-
 lib/fog/aws/models/compute/tag.rb                | 2 +-
 lib/fog/aws/models/compute/tags.rb               | 2 +-
 lib/fog/aws/models/compute/volume.rb             | 2 +-
 lib/fog/aws/models/compute/volumes.rb            | 2 +-
 lib/fog/aws/models/compute/vpc.rb                | 2 +-
 lib/fog/aws/models/compute/vpcs.rb               | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/lib/fog/aws/models/compute/address.rb b/lib/fog/aws/models/compute/address.rb
index e6394fb361..1da9a2168f 100644
--- a/lib/fog/aws/models/compute/address.rb
+++ b/lib/fog/aws/models/compute/address.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Address < Fog::Model
         identity  :public_ip,                  :aliases => 'publicIp'
 
diff --git a/lib/fog/aws/models/compute/addresses.rb b/lib/fog/aws/models/compute/addresses.rb
index c83e02d25a..a027da92ff 100644
--- a/lib/fog/aws/models/compute/addresses.rb
+++ b/lib/fog/aws/models/compute/addresses.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Addresses < Fog::Collection
         attribute :filters
         attribute :server
diff --git a/lib/fog/aws/models/compute/dhcp_option.rb b/lib/fog/aws/models/compute/dhcp_option.rb
index 1b9b1ee148..b1f70d87d9 100644
--- a/lib/fog/aws/models/compute/dhcp_option.rb
+++ b/lib/fog/aws/models/compute/dhcp_option.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class DhcpOption < Fog::Model
         identity  :id,                          :aliases => 'dhcpOptionsId'
         attribute :dhcp_configuration_set,      :aliases => 'dhcpConfigurationSet'
diff --git a/lib/fog/aws/models/compute/dhcp_options.rb b/lib/fog/aws/models/compute/dhcp_options.rb
index b09dab77ea..d7a69508b2 100644
--- a/lib/fog/aws/models/compute/dhcp_options.rb
+++ b/lib/fog/aws/models/compute/dhcp_options.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class DhcpOptions < Fog::Collection
         attribute :filters
 
diff --git a/lib/fog/aws/models/compute/flavor.rb b/lib/fog/aws/models/compute/flavor.rb
index 986785f10b..f53d54e202 100644
--- a/lib/fog/aws/models/compute/flavor.rb
+++ b/lib/fog/aws/models/compute/flavor.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Flavor < Fog::Model
         identity :id
 
diff --git a/lib/fog/aws/models/compute/flavors.rb b/lib/fog/aws/models/compute/flavors.rb
index 4596bd177c..eea1d11690 100644
--- a/lib/fog/aws/models/compute/flavors.rb
+++ b/lib/fog/aws/models/compute/flavors.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       FLAVORS = [
         {
           :id                      => 't1.micro',
diff --git a/lib/fog/aws/models/compute/image.rb b/lib/fog/aws/models/compute/image.rb
index 29e6a96c6f..d838132647 100644
--- a/lib/fog/aws/models/compute/image.rb
+++ b/lib/fog/aws/models/compute/image.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Image < Fog::Model
         identity :id,                     :aliases => 'imageId'
 
diff --git a/lib/fog/aws/models/compute/images.rb b/lib/fog/aws/models/compute/images.rb
index 3b9d220cb3..66466dc0df 100644
--- a/lib/fog/aws/models/compute/images.rb
+++ b/lib/fog/aws/models/compute/images.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Images < Fog::Collection
         attribute :filters
 
diff --git a/lib/fog/aws/models/compute/internet_gateway.rb b/lib/fog/aws/models/compute/internet_gateway.rb
index d11167cb9a..3cb3f9d99f 100644
--- a/lib/fog/aws/models/compute/internet_gateway.rb
+++ b/lib/fog/aws/models/compute/internet_gateway.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class InternetGateway < Fog::Model
         identity  :id,                          :aliases => 'internetGatewayId'
         attribute :attachment_set,              :aliases => 'attachmentSet'
diff --git a/lib/fog/aws/models/compute/internet_gateways.rb b/lib/fog/aws/models/compute/internet_gateways.rb
index ed4592535c..9949350977 100644
--- a/lib/fog/aws/models/compute/internet_gateways.rb
+++ b/lib/fog/aws/models/compute/internet_gateways.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class InternetGateways < Fog::Collection
         attribute :filters
 
diff --git a/lib/fog/aws/models/compute/key_pair.rb b/lib/fog/aws/models/compute/key_pair.rb
index 14be784955..14b51069fb 100644
--- a/lib/fog/aws/models/compute/key_pair.rb
+++ b/lib/fog/aws/models/compute/key_pair.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class KeyPair < Fog::Model
         identity  :name,        :aliases => 'keyName'
 
diff --git a/lib/fog/aws/models/compute/key_pairs.rb b/lib/fog/aws/models/compute/key_pairs.rb
index 7edc446518..eb2d44c811 100644
--- a/lib/fog/aws/models/compute/key_pairs.rb
+++ b/lib/fog/aws/models/compute/key_pairs.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class KeyPairs < Fog::Collection
         attribute :filters
         attribute :key_name
diff --git a/lib/fog/aws/models/compute/network_acl.rb b/lib/fog/aws/models/compute/network_acl.rb
index b9853bf33f..0401b16796 100644
--- a/lib/fog/aws/models/compute/network_acl.rb
+++ b/lib/fog/aws/models/compute/network_acl.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class NetworkAcl < Fog::Model
         ICMP = 1
         TCP  = 6
diff --git a/lib/fog/aws/models/compute/network_acls.rb b/lib/fog/aws/models/compute/network_acls.rb
index ae6fc25159..9150ef3b37 100644
--- a/lib/fog/aws/models/compute/network_acls.rb
+++ b/lib/fog/aws/models/compute/network_acls.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class NetworkAcls < Fog::Collection
         attribute :filters
 
diff --git a/lib/fog/aws/models/compute/network_interface.rb b/lib/fog/aws/models/compute/network_interface.rb
index f0bc580095..b9c299efd7 100644
--- a/lib/fog/aws/models/compute/network_interface.rb
+++ b/lib/fog/aws/models/compute/network_interface.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class NetworkInterface < Fog::Model
         identity  :network_interface_id,        :aliases => 'networkInterfaceId'
         attribute :state
diff --git a/lib/fog/aws/models/compute/network_interfaces.rb b/lib/fog/aws/models/compute/network_interfaces.rb
index c2faebb34e..42effe7de6 100644
--- a/lib/fog/aws/models/compute/network_interfaces.rb
+++ b/lib/fog/aws/models/compute/network_interfaces.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class NetworkInterfaces < Fog::Collection
         attribute :filters
 
diff --git a/lib/fog/aws/models/compute/route_table.rb b/lib/fog/aws/models/compute/route_table.rb
index 20bcd32294..3c1a512913 100644
--- a/lib/fog/aws/models/compute/route_table.rb
+++ b/lib/fog/aws/models/compute/route_table.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class RouteTable < Fog::Model
         identity :id,                :aliases => 'routeTableId'
 
diff --git a/lib/fog/aws/models/compute/route_tables.rb b/lib/fog/aws/models/compute/route_tables.rb
index 73fefe4a4a..5ec748940f 100644
--- a/lib/fog/aws/models/compute/route_tables.rb
+++ b/lib/fog/aws/models/compute/route_tables.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class RouteTables < Fog::Collection
         attribute :filters
 
diff --git a/lib/fog/aws/models/compute/security_group.rb b/lib/fog/aws/models/compute/security_group.rb
index 25c663b70c..ce3f98e7ce 100644
--- a/lib/fog/aws/models/compute/security_group.rb
+++ b/lib/fog/aws/models/compute/security_group.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class SecurityGroup < Fog::Model
         identity  :name,            :aliases => 'groupName'
         attribute :description,     :aliases => 'groupDescription'
diff --git a/lib/fog/aws/models/compute/security_groups.rb b/lib/fog/aws/models/compute/security_groups.rb
index 38b21d3384..7d83023b6d 100644
--- a/lib/fog/aws/models/compute/security_groups.rb
+++ b/lib/fog/aws/models/compute/security_groups.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class SecurityGroups < Fog::Collection
         attribute :filters
 
diff --git a/lib/fog/aws/models/compute/server.rb b/lib/fog/aws/models/compute/server.rb
index e23a5eae3d..97cfffeddc 100644
--- a/lib/fog/aws/models/compute/server.rb
+++ b/lib/fog/aws/models/compute/server.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Server < Fog::Compute::Server
         extend Fog::Deprecation
         deprecate :ip_address, :public_ip_address
diff --git a/lib/fog/aws/models/compute/servers.rb b/lib/fog/aws/models/compute/servers.rb
index f1ea18ba35..7103a552d1 100644
--- a/lib/fog/aws/models/compute/servers.rb
+++ b/lib/fog/aws/models/compute/servers.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Servers < Fog::Collection
         attribute :filters
 
diff --git a/lib/fog/aws/models/compute/snapshot.rb b/lib/fog/aws/models/compute/snapshot.rb
index 089b4b8ac1..dc9a3d1f97 100644
--- a/lib/fog/aws/models/compute/snapshot.rb
+++ b/lib/fog/aws/models/compute/snapshot.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Snapshot < Fog::Model
         identity  :id,          :aliases => 'snapshotId'
 
diff --git a/lib/fog/aws/models/compute/snapshots.rb b/lib/fog/aws/models/compute/snapshots.rb
index c8f69e1dc3..5920ad5a4f 100644
--- a/lib/fog/aws/models/compute/snapshots.rb
+++ b/lib/fog/aws/models/compute/snapshots.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Snapshots < Fog::Collection
         attribute :filters
         attribute :volume
diff --git a/lib/fog/aws/models/compute/spot_request.rb b/lib/fog/aws/models/compute/spot_request.rb
index 6ac6df13fa..032e8c503e 100644
--- a/lib/fog/aws/models/compute/spot_request.rb
+++ b/lib/fog/aws/models/compute/spot_request.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class SpotRequest < Fog::Compute::Server
         identity :id,                          :aliases => 'spotInstanceRequestId'
 
diff --git a/lib/fog/aws/models/compute/spot_requests.rb b/lib/fog/aws/models/compute/spot_requests.rb
index f6f9149791..91c97fc2ae 100644
--- a/lib/fog/aws/models/compute/spot_requests.rb
+++ b/lib/fog/aws/models/compute/spot_requests.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class SpotRequests < Fog::Collection
         attribute :filters
 
diff --git a/lib/fog/aws/models/compute/subnet.rb b/lib/fog/aws/models/compute/subnet.rb
index 981308a98a..11696ce887 100644
--- a/lib/fog/aws/models/compute/subnet.rb
+++ b/lib/fog/aws/models/compute/subnet.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Subnet < Fog::Model
         identity  :subnet_id,                   :aliases => 'subnetId'
         attribute :state
diff --git a/lib/fog/aws/models/compute/subnets.rb b/lib/fog/aws/models/compute/subnets.rb
index 783c66e388..1c16f653c8 100644
--- a/lib/fog/aws/models/compute/subnets.rb
+++ b/lib/fog/aws/models/compute/subnets.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Subnets < Fog::Collection
         attribute :filters
 
diff --git a/lib/fog/aws/models/compute/tag.rb b/lib/fog/aws/models/compute/tag.rb
index b115dc9cb3..66cdb9671b 100644
--- a/lib/fog/aws/models/compute/tag.rb
+++ b/lib/fog/aws/models/compute/tag.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Tag < Fog::Model
         identity  :key
 
diff --git a/lib/fog/aws/models/compute/tags.rb b/lib/fog/aws/models/compute/tags.rb
index e16ecd508e..4400153a2d 100644
--- a/lib/fog/aws/models/compute/tags.rb
+++ b/lib/fog/aws/models/compute/tags.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Tags < Fog::Collection
         attribute :filters
 
diff --git a/lib/fog/aws/models/compute/volume.rb b/lib/fog/aws/models/compute/volume.rb
index ffb3d2d50e..c3704ed84b 100644
--- a/lib/fog/aws/models/compute/volume.rb
+++ b/lib/fog/aws/models/compute/volume.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Volume < Fog::Model
         identity  :id,                    :aliases => 'volumeId'
 
diff --git a/lib/fog/aws/models/compute/volumes.rb b/lib/fog/aws/models/compute/volumes.rb
index 69931484ba..d60a322248 100644
--- a/lib/fog/aws/models/compute/volumes.rb
+++ b/lib/fog/aws/models/compute/volumes.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Volumes < Fog::Collection
         attribute :filters
         attribute :server
diff --git a/lib/fog/aws/models/compute/vpc.rb b/lib/fog/aws/models/compute/vpc.rb
index 829185f662..de33b9da96 100644
--- a/lib/fog/aws/models/compute/vpc.rb
+++ b/lib/fog/aws/models/compute/vpc.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class VPC < Fog::Model
         identity :id,                :aliases => 'vpcId'
 
diff --git a/lib/fog/aws/models/compute/vpcs.rb b/lib/fog/aws/models/compute/vpcs.rb
index 298d06d559..ff667a2fa7 100644
--- a/lib/fog/aws/models/compute/vpcs.rb
+++ b/lib/fog/aws/models/compute/vpcs.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Vpcs < Fog::Collection
         attribute :filters
 

From bbe6937175e2eea96ba5ad68fa8575acab52465a Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Sat, 15 Sep 2018 00:05:12 +0900
Subject: [PATCH 04/39] git grep -l "    module Compute" --
 lib/fog/aws/parsers/compute/ | xargs sed -i "" "s/    module Compute/   
 module AWS/g"

---
 lib/fog/aws/parsers/compute/allocate_address.rb                 | 2 +-
 lib/fog/aws/parsers/compute/assign_private_ip_addresses.rb      | 2 +-
 lib/fog/aws/parsers/compute/associate_address.rb                | 2 +-
 lib/fog/aws/parsers/compute/associate_route_table.rb            | 2 +-
 lib/fog/aws/parsers/compute/attach_network_interface.rb         | 2 +-
 lib/fog/aws/parsers/compute/attach_volume.rb                    | 2 +-
 lib/fog/aws/parsers/compute/basic.rb                            | 2 +-
 lib/fog/aws/parsers/compute/cancel_spot_instance_requests.rb    | 2 +-
 lib/fog/aws/parsers/compute/copy_image.rb                       | 2 +-
 lib/fog/aws/parsers/compute/copy_snapshot.rb                    | 2 +-
 lib/fog/aws/parsers/compute/create_dhcp_options.rb              | 2 +-
 lib/fog/aws/parsers/compute/create_image.rb                     | 2 +-
 lib/fog/aws/parsers/compute/create_internet_gateway.rb          | 2 +-
 lib/fog/aws/parsers/compute/create_key_pair.rb                  | 2 +-
 lib/fog/aws/parsers/compute/create_network_acl.rb               | 2 +-
 lib/fog/aws/parsers/compute/create_network_interface.rb         | 2 +-
 lib/fog/aws/parsers/compute/create_route_table.rb               | 2 +-
 lib/fog/aws/parsers/compute/create_security_group.rb            | 2 +-
 lib/fog/aws/parsers/compute/create_snapshot.rb                  | 2 +-
 lib/fog/aws/parsers/compute/create_subnet.rb                    | 2 +-
 lib/fog/aws/parsers/compute/create_volume.rb                    | 2 +-
 lib/fog/aws/parsers/compute/create_vpc.rb                       | 2 +-
 lib/fog/aws/parsers/compute/deregister_image.rb                 | 2 +-
 lib/fog/aws/parsers/compute/describe_account_attributes.rb      | 2 +-
 lib/fog/aws/parsers/compute/describe_addresses.rb               | 2 +-
 lib/fog/aws/parsers/compute/describe_availability_zones.rb      | 2 +-
 lib/fog/aws/parsers/compute/describe_classic_link_instances.rb  | 2 +-
 lib/fog/aws/parsers/compute/describe_dhcp_options.rb            | 2 +-
 lib/fog/aws/parsers/compute/describe_images.rb                  | 2 +-
 lib/fog/aws/parsers/compute/describe_instance_attribute.rb      | 2 +-
 lib/fog/aws/parsers/compute/describe_instance_status.rb         | 2 +-
 lib/fog/aws/parsers/compute/describe_instances.rb               | 2 +-
 lib/fog/aws/parsers/compute/describe_internet_gateways.rb       | 2 +-
 lib/fog/aws/parsers/compute/describe_key_pairs.rb               | 2 +-
 lib/fog/aws/parsers/compute/describe_network_acls.rb            | 2 +-
 .../aws/parsers/compute/describe_network_interface_attribute.rb | 2 +-
 lib/fog/aws/parsers/compute/describe_network_interfaces.rb      | 2 +-
 lib/fog/aws/parsers/compute/describe_placement_groups.rb        | 2 +-
 lib/fog/aws/parsers/compute/describe_regions.rb                 | 2 +-
 lib/fog/aws/parsers/compute/describe_reserved_instances.rb      | 2 +-
 .../parsers/compute/describe_reserved_instances_offerings.rb    | 2 +-
 lib/fog/aws/parsers/compute/describe_route_tables.rb            | 2 +-
 lib/fog/aws/parsers/compute/describe_security_groups.rb         | 2 +-
 lib/fog/aws/parsers/compute/describe_snapshots.rb               | 2 +-
 lib/fog/aws/parsers/compute/describe_spot_price_history.rb      | 2 +-
 lib/fog/aws/parsers/compute/describe_subnets.rb                 | 2 +-
 lib/fog/aws/parsers/compute/describe_tags.rb                    | 2 +-
 lib/fog/aws/parsers/compute/describe_volume_status.rb           | 2 +-
 lib/fog/aws/parsers/compute/describe_volumes.rb                 | 2 +-
 lib/fog/aws/parsers/compute/describe_volumes_modifications.rb   | 2 +-
 lib/fog/aws/parsers/compute/describe_vpc_attribute.rb           | 2 +-
 lib/fog/aws/parsers/compute/describe_vpc_classic_link.rb        | 2 +-
 .../parsers/compute/describe_vpc_classic_link_dns_support.rb    | 2 +-
 lib/fog/aws/parsers/compute/describe_vpcs.rb                    | 2 +-
 lib/fog/aws/parsers/compute/detach_volume.rb                    | 2 +-
 lib/fog/aws/parsers/compute/get_console_output.rb               | 2 +-
 lib/fog/aws/parsers/compute/get_password_data.rb                | 2 +-
 lib/fog/aws/parsers/compute/import_key_pair.rb                  | 2 +-
 lib/fog/aws/parsers/compute/modify_subnet_attribute.rb          | 2 +-
 lib/fog/aws/parsers/compute/modify_volume.rb                    | 2 +-
 lib/fog/aws/parsers/compute/monitor_unmonitor_instances.rb      | 2 +-
 lib/fog/aws/parsers/compute/move_address_to_vpc.rb              | 2 +-
 lib/fog/aws/parsers/compute/network_acl_parser.rb               | 2 +-
 lib/fog/aws/parsers/compute/network_interface_parser.rb         | 2 +-
 .../aws/parsers/compute/purchase_reserved_instances_offering.rb | 2 +-
 lib/fog/aws/parsers/compute/register_image.rb                   | 2 +-
 lib/fog/aws/parsers/compute/replace_network_acl_association.rb  | 2 +-
 lib/fog/aws/parsers/compute/restore_address_to_classic.rb       | 2 +-
 lib/fog/aws/parsers/compute/run_instances.rb                    | 2 +-
 lib/fog/aws/parsers/compute/spot_datafeed_subscription.rb       | 2 +-
 lib/fog/aws/parsers/compute/spot_instance_requests.rb           | 2 +-
 lib/fog/aws/parsers/compute/start_stop_instances.rb             | 2 +-
 lib/fog/aws/parsers/compute/terminate_instances.rb              | 2 +-
 73 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/lib/fog/aws/parsers/compute/allocate_address.rb b/lib/fog/aws/parsers/compute/allocate_address.rb
index 0216f1817e..5416d2ffed 100644
--- a/lib/fog/aws/parsers/compute/allocate_address.rb
+++ b/lib/fog/aws/parsers/compute/allocate_address.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class AllocateAddress < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/assign_private_ip_addresses.rb b/lib/fog/aws/parsers/compute/assign_private_ip_addresses.rb
index 122f8dde03..81af6510c3 100644
--- a/lib/fog/aws/parsers/compute/assign_private_ip_addresses.rb
+++ b/lib/fog/aws/parsers/compute/assign_private_ip_addresses.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class AssignPrivateIpAddresses < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/associate_address.rb b/lib/fog/aws/parsers/compute/associate_address.rb
index 236a281ad3..cb0d791a67 100644
--- a/lib/fog/aws/parsers/compute/associate_address.rb
+++ b/lib/fog/aws/parsers/compute/associate_address.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class AssociateAddress < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/associate_route_table.rb b/lib/fog/aws/parsers/compute/associate_route_table.rb
index 5a2143f046..368e76dff6 100644
--- a/lib/fog/aws/parsers/compute/associate_route_table.rb
+++ b/lib/fog/aws/parsers/compute/associate_route_table.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class AssociateRouteTable < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/attach_network_interface.rb b/lib/fog/aws/parsers/compute/attach_network_interface.rb
index 8dee1f70e7..f0898d6afb 100644
--- a/lib/fog/aws/parsers/compute/attach_network_interface.rb
+++ b/lib/fog/aws/parsers/compute/attach_network_interface.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class AttachNetworkInterface < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/attach_volume.rb b/lib/fog/aws/parsers/compute/attach_volume.rb
index dcb5d690c4..ae3eb0e66e 100644
--- a/lib/fog/aws/parsers/compute/attach_volume.rb
+++ b/lib/fog/aws/parsers/compute/attach_volume.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class AttachVolume < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/basic.rb b/lib/fog/aws/parsers/compute/basic.rb
index d8e638e285..610799158a 100644
--- a/lib/fog/aws/parsers/compute/basic.rb
+++ b/lib/fog/aws/parsers/compute/basic.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class Basic < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/cancel_spot_instance_requests.rb b/lib/fog/aws/parsers/compute/cancel_spot_instance_requests.rb
index f03e7300c1..6e28c3cadb 100644
--- a/lib/fog/aws/parsers/compute/cancel_spot_instance_requests.rb
+++ b/lib/fog/aws/parsers/compute/cancel_spot_instance_requests.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class CancelSpotInstanceRequests < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/copy_image.rb b/lib/fog/aws/parsers/compute/copy_image.rb
index 96e21ea91f..ed21ff0f16 100644
--- a/lib/fog/aws/parsers/compute/copy_image.rb
+++ b/lib/fog/aws/parsers/compute/copy_image.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class CopyImage < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/copy_snapshot.rb b/lib/fog/aws/parsers/compute/copy_snapshot.rb
index f57be2d949..d14581c06d 100644
--- a/lib/fog/aws/parsers/compute/copy_snapshot.rb
+++ b/lib/fog/aws/parsers/compute/copy_snapshot.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class CopySnapshot < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/create_dhcp_options.rb b/lib/fog/aws/parsers/compute/create_dhcp_options.rb
index 4dadd93e30..aa927ef621 100644
--- a/lib/fog/aws/parsers/compute/create_dhcp_options.rb
+++ b/lib/fog/aws/parsers/compute/create_dhcp_options.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class CreateDhcpOptions < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/create_image.rb b/lib/fog/aws/parsers/compute/create_image.rb
index 880f1bc299..95364f63dc 100644
--- a/lib/fog/aws/parsers/compute/create_image.rb
+++ b/lib/fog/aws/parsers/compute/create_image.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class CreateImage < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/create_internet_gateway.rb b/lib/fog/aws/parsers/compute/create_internet_gateway.rb
index 856264a6bd..232239cbb3 100644
--- a/lib/fog/aws/parsers/compute/create_internet_gateway.rb
+++ b/lib/fog/aws/parsers/compute/create_internet_gateway.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class CreateInternetGateway < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/create_key_pair.rb b/lib/fog/aws/parsers/compute/create_key_pair.rb
index 678e375cc3..778e1f97ff 100644
--- a/lib/fog/aws/parsers/compute/create_key_pair.rb
+++ b/lib/fog/aws/parsers/compute/create_key_pair.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class CreateKeyPair < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/create_network_acl.rb b/lib/fog/aws/parsers/compute/create_network_acl.rb
index 4ebfa0c104..c96234373f 100644
--- a/lib/fog/aws/parsers/compute/create_network_acl.rb
+++ b/lib/fog/aws/parsers/compute/create_network_acl.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         require 'fog/aws/parsers/compute/network_acl_parser'
 
diff --git a/lib/fog/aws/parsers/compute/create_network_interface.rb b/lib/fog/aws/parsers/compute/create_network_interface.rb
index d965b7630f..b7970609ca 100644
--- a/lib/fog/aws/parsers/compute/create_network_interface.rb
+++ b/lib/fog/aws/parsers/compute/create_network_interface.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         require 'fog/aws/parsers/compute/network_interface_parser'
 
diff --git a/lib/fog/aws/parsers/compute/create_route_table.rb b/lib/fog/aws/parsers/compute/create_route_table.rb
index 19e42ba444..a66fae0975 100644
--- a/lib/fog/aws/parsers/compute/create_route_table.rb
+++ b/lib/fog/aws/parsers/compute/create_route_table.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class CreateRouteTable < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/create_security_group.rb b/lib/fog/aws/parsers/compute/create_security_group.rb
index c64dd8d06e..d5d79fdc74 100644
--- a/lib/fog/aws/parsers/compute/create_security_group.rb
+++ b/lib/fog/aws/parsers/compute/create_security_group.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class CreateSecurityGroup < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/create_snapshot.rb b/lib/fog/aws/parsers/compute/create_snapshot.rb
index 4535b2343e..42ddf07f96 100644
--- a/lib/fog/aws/parsers/compute/create_snapshot.rb
+++ b/lib/fog/aws/parsers/compute/create_snapshot.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class CreateSnapshot < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/create_subnet.rb b/lib/fog/aws/parsers/compute/create_subnet.rb
index d1f831e55f..22b264a361 100644
--- a/lib/fog/aws/parsers/compute/create_subnet.rb
+++ b/lib/fog/aws/parsers/compute/create_subnet.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class CreateSubnet < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/create_volume.rb b/lib/fog/aws/parsers/compute/create_volume.rb
index e9a0699d58..d91d61c507 100644
--- a/lib/fog/aws/parsers/compute/create_volume.rb
+++ b/lib/fog/aws/parsers/compute/create_volume.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class CreateVolume < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/create_vpc.rb b/lib/fog/aws/parsers/compute/create_vpc.rb
index e20e5a3369..61931406a1 100644
--- a/lib/fog/aws/parsers/compute/create_vpc.rb
+++ b/lib/fog/aws/parsers/compute/create_vpc.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class CreateVpc < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/deregister_image.rb b/lib/fog/aws/parsers/compute/deregister_image.rb
index 176f3eb128..a6f5d36dff 100644
--- a/lib/fog/aws/parsers/compute/deregister_image.rb
+++ b/lib/fog/aws/parsers/compute/deregister_image.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DeregisterImage < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/describe_account_attributes.rb b/lib/fog/aws/parsers/compute/describe_account_attributes.rb
index 29ca5ec179..ce89c02868 100644
--- a/lib/fog/aws/parsers/compute/describe_account_attributes.rb
+++ b/lib/fog/aws/parsers/compute/describe_account_attributes.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeAccountAttributes < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_addresses.rb b/lib/fog/aws/parsers/compute/describe_addresses.rb
index 39007fb669..de3d352fc9 100644
--- a/lib/fog/aws/parsers/compute/describe_addresses.rb
+++ b/lib/fog/aws/parsers/compute/describe_addresses.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeAddresses < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_availability_zones.rb b/lib/fog/aws/parsers/compute/describe_availability_zones.rb
index 16484e8707..0ea1cd203b 100644
--- a/lib/fog/aws/parsers/compute/describe_availability_zones.rb
+++ b/lib/fog/aws/parsers/compute/describe_availability_zones.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeAvailabilityZones < Fog::Parsers::Base
           def start_element(name, attrs = [])
diff --git a/lib/fog/aws/parsers/compute/describe_classic_link_instances.rb b/lib/fog/aws/parsers/compute/describe_classic_link_instances.rb
index 451af4483c..9e30384414 100644
--- a/lib/fog/aws/parsers/compute/describe_classic_link_instances.rb
+++ b/lib/fog/aws/parsers/compute/describe_classic_link_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeClassicLinkInstances < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_dhcp_options.rb b/lib/fog/aws/parsers/compute/describe_dhcp_options.rb
index 061c04fb38..a3222f029a 100644
--- a/lib/fog/aws/parsers/compute/describe_dhcp_options.rb
+++ b/lib/fog/aws/parsers/compute/describe_dhcp_options.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeDhcpOptions < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_images.rb b/lib/fog/aws/parsers/compute/describe_images.rb
index 9d88eef1eb..a7e3817f8f 100644
--- a/lib/fog/aws/parsers/compute/describe_images.rb
+++ b/lib/fog/aws/parsers/compute/describe_images.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeImages < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_instance_attribute.rb b/lib/fog/aws/parsers/compute/describe_instance_attribute.rb
index 2af2e05af8..60a6ad043d 100644
--- a/lib/fog/aws/parsers/compute/describe_instance_attribute.rb
+++ b/lib/fog/aws/parsers/compute/describe_instance_attribute.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeInstanceAttribute < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_instance_status.rb b/lib/fog/aws/parsers/compute/describe_instance_status.rb
index 502d6a1267..02793cfda1 100644
--- a/lib/fog/aws/parsers/compute/describe_instance_status.rb
+++ b/lib/fog/aws/parsers/compute/describe_instance_status.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeInstanceStatus < Fog::Parsers::Base
           def new_instance!
diff --git a/lib/fog/aws/parsers/compute/describe_instances.rb b/lib/fog/aws/parsers/compute/describe_instances.rb
index 8d8eb9d4b5..bdaf03aff2 100644
--- a/lib/fog/aws/parsers/compute/describe_instances.rb
+++ b/lib/fog/aws/parsers/compute/describe_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeInstances < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_internet_gateways.rb b/lib/fog/aws/parsers/compute/describe_internet_gateways.rb
index 093b713599..acfde17df2 100644
--- a/lib/fog/aws/parsers/compute/describe_internet_gateways.rb
+++ b/lib/fog/aws/parsers/compute/describe_internet_gateways.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeInternetGateways < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_key_pairs.rb b/lib/fog/aws/parsers/compute/describe_key_pairs.rb
index 21be7ab203..09b92a9850 100644
--- a/lib/fog/aws/parsers/compute/describe_key_pairs.rb
+++ b/lib/fog/aws/parsers/compute/describe_key_pairs.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeKeyPairs < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_network_acls.rb b/lib/fog/aws/parsers/compute/describe_network_acls.rb
index c020614686..0b9f841963 100644
--- a/lib/fog/aws/parsers/compute/describe_network_acls.rb
+++ b/lib/fog/aws/parsers/compute/describe_network_acls.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         require 'fog/aws/parsers/compute/network_acl_parser'
 
diff --git a/lib/fog/aws/parsers/compute/describe_network_interface_attribute.rb b/lib/fog/aws/parsers/compute/describe_network_interface_attribute.rb
index d42193ab51..a62b77510a 100644
--- a/lib/fog/aws/parsers/compute/describe_network_interface_attribute.rb
+++ b/lib/fog/aws/parsers/compute/describe_network_interface_attribute.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeNetworkInterfaceAttribute < NetworkInterfaceParser
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_network_interfaces.rb b/lib/fog/aws/parsers/compute/describe_network_interfaces.rb
index 28d4db18bb..15ba2c761b 100644
--- a/lib/fog/aws/parsers/compute/describe_network_interfaces.rb
+++ b/lib/fog/aws/parsers/compute/describe_network_interfaces.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         require 'fog/aws/parsers/compute/network_interface_parser'
 
diff --git a/lib/fog/aws/parsers/compute/describe_placement_groups.rb b/lib/fog/aws/parsers/compute/describe_placement_groups.rb
index 7901081a84..849ab3b7fb 100644
--- a/lib/fog/aws/parsers/compute/describe_placement_groups.rb
+++ b/lib/fog/aws/parsers/compute/describe_placement_groups.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribePlacementGroups < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_regions.rb b/lib/fog/aws/parsers/compute/describe_regions.rb
index f0147269da..beabf72b5c 100644
--- a/lib/fog/aws/parsers/compute/describe_regions.rb
+++ b/lib/fog/aws/parsers/compute/describe_regions.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeRegions < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_reserved_instances.rb b/lib/fog/aws/parsers/compute/describe_reserved_instances.rb
index 6dd5ec59fb..9aa736a0ec 100644
--- a/lib/fog/aws/parsers/compute/describe_reserved_instances.rb
+++ b/lib/fog/aws/parsers/compute/describe_reserved_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeReservedInstances < Fog::Parsers::Base
           def get_default_item
diff --git a/lib/fog/aws/parsers/compute/describe_reserved_instances_offerings.rb b/lib/fog/aws/parsers/compute/describe_reserved_instances_offerings.rb
index 42c91d1cd4..967b2a0d9a 100644
--- a/lib/fog/aws/parsers/compute/describe_reserved_instances_offerings.rb
+++ b/lib/fog/aws/parsers/compute/describe_reserved_instances_offerings.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeReservedInstancesOfferings < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_route_tables.rb b/lib/fog/aws/parsers/compute/describe_route_tables.rb
index 506903deda..32db01be7a 100644
--- a/lib/fog/aws/parsers/compute/describe_route_tables.rb
+++ b/lib/fog/aws/parsers/compute/describe_route_tables.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeRouteTables < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_security_groups.rb b/lib/fog/aws/parsers/compute/describe_security_groups.rb
index c3562d103a..868514f156 100644
--- a/lib/fog/aws/parsers/compute/describe_security_groups.rb
+++ b/lib/fog/aws/parsers/compute/describe_security_groups.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeSecurityGroups < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_snapshots.rb b/lib/fog/aws/parsers/compute/describe_snapshots.rb
index 7057d59dd6..b81377d3ec 100644
--- a/lib/fog/aws/parsers/compute/describe_snapshots.rb
+++ b/lib/fog/aws/parsers/compute/describe_snapshots.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeSnapshots < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_spot_price_history.rb b/lib/fog/aws/parsers/compute/describe_spot_price_history.rb
index 45c6fd748d..8d31695d20 100644
--- a/lib/fog/aws/parsers/compute/describe_spot_price_history.rb
+++ b/lib/fog/aws/parsers/compute/describe_spot_price_history.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeSpotPriceHistory < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_subnets.rb b/lib/fog/aws/parsers/compute/describe_subnets.rb
index ed347df749..37c49fad12 100644
--- a/lib/fog/aws/parsers/compute/describe_subnets.rb
+++ b/lib/fog/aws/parsers/compute/describe_subnets.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeSubnets < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_tags.rb b/lib/fog/aws/parsers/compute/describe_tags.rb
index 7859f88c59..42158043bd 100644
--- a/lib/fog/aws/parsers/compute/describe_tags.rb
+++ b/lib/fog/aws/parsers/compute/describe_tags.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeTags < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_volume_status.rb b/lib/fog/aws/parsers/compute/describe_volume_status.rb
index 9a37fe680e..507a39cabe 100644
--- a/lib/fog/aws/parsers/compute/describe_volume_status.rb
+++ b/lib/fog/aws/parsers/compute/describe_volume_status.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeVolumeStatus < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_volumes.rb b/lib/fog/aws/parsers/compute/describe_volumes.rb
index 8ee0f61ced..6c447b65ee 100644
--- a/lib/fog/aws/parsers/compute/describe_volumes.rb
+++ b/lib/fog/aws/parsers/compute/describe_volumes.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeVolumes < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_volumes_modifications.rb b/lib/fog/aws/parsers/compute/describe_volumes_modifications.rb
index 70a665c236..8f9b4789a4 100644
--- a/lib/fog/aws/parsers/compute/describe_volumes_modifications.rb
+++ b/lib/fog/aws/parsers/compute/describe_volumes_modifications.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeVolumesModifications < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_vpc_attribute.rb b/lib/fog/aws/parsers/compute/describe_vpc_attribute.rb
index 7834219d04..edd3ab0b50 100644
--- a/lib/fog/aws/parsers/compute/describe_vpc_attribute.rb
+++ b/lib/fog/aws/parsers/compute/describe_vpc_attribute.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeVpcAttribute < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_vpc_classic_link.rb b/lib/fog/aws/parsers/compute/describe_vpc_classic_link.rb
index ae7666aca6..b6102540be 100644
--- a/lib/fog/aws/parsers/compute/describe_vpc_classic_link.rb
+++ b/lib/fog/aws/parsers/compute/describe_vpc_classic_link.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeVpcClassicLink < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_vpc_classic_link_dns_support.rb b/lib/fog/aws/parsers/compute/describe_vpc_classic_link_dns_support.rb
index 14cef8ce34..ac24f8816e 100644
--- a/lib/fog/aws/parsers/compute/describe_vpc_classic_link_dns_support.rb
+++ b/lib/fog/aws/parsers/compute/describe_vpc_classic_link_dns_support.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeVpcClassicLinkDnsSupport < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/describe_vpcs.rb b/lib/fog/aws/parsers/compute/describe_vpcs.rb
index baec10028a..661c4d02a4 100644
--- a/lib/fog/aws/parsers/compute/describe_vpcs.rb
+++ b/lib/fog/aws/parsers/compute/describe_vpcs.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DescribeVpcs < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/detach_volume.rb b/lib/fog/aws/parsers/compute/detach_volume.rb
index 5def4620cd..d62e538bdb 100644
--- a/lib/fog/aws/parsers/compute/detach_volume.rb
+++ b/lib/fog/aws/parsers/compute/detach_volume.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class DetachVolume < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/get_console_output.rb b/lib/fog/aws/parsers/compute/get_console_output.rb
index e7533de6c6..d08d335313 100644
--- a/lib/fog/aws/parsers/compute/get_console_output.rb
+++ b/lib/fog/aws/parsers/compute/get_console_output.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class GetConsoleOutput < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/get_password_data.rb b/lib/fog/aws/parsers/compute/get_password_data.rb
index 688ba5c3e4..fac632f0f4 100644
--- a/lib/fog/aws/parsers/compute/get_password_data.rb
+++ b/lib/fog/aws/parsers/compute/get_password_data.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class GetPasswordData < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/import_key_pair.rb b/lib/fog/aws/parsers/compute/import_key_pair.rb
index 9d8a68792d..688c9a06c4 100644
--- a/lib/fog/aws/parsers/compute/import_key_pair.rb
+++ b/lib/fog/aws/parsers/compute/import_key_pair.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class ImportKeyPair < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/modify_subnet_attribute.rb b/lib/fog/aws/parsers/compute/modify_subnet_attribute.rb
index 398b160400..aa9d2bfa6e 100644
--- a/lib/fog/aws/parsers/compute/modify_subnet_attribute.rb
+++ b/lib/fog/aws/parsers/compute/modify_subnet_attribute.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class ModifySubnetAttribute < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/modify_volume.rb b/lib/fog/aws/parsers/compute/modify_volume.rb
index 544e51491d..1814d076d8 100644
--- a/lib/fog/aws/parsers/compute/modify_volume.rb
+++ b/lib/fog/aws/parsers/compute/modify_volume.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class ModifyVolume < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/monitor_unmonitor_instances.rb b/lib/fog/aws/parsers/compute/monitor_unmonitor_instances.rb
index 3065401e08..5899c39d9e 100644
--- a/lib/fog/aws/parsers/compute/monitor_unmonitor_instances.rb
+++ b/lib/fog/aws/parsers/compute/monitor_unmonitor_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class MonitorUnmonitorInstances < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/move_address_to_vpc.rb b/lib/fog/aws/parsers/compute/move_address_to_vpc.rb
index cf893536d0..339c8d403a 100644
--- a/lib/fog/aws/parsers/compute/move_address_to_vpc.rb
+++ b/lib/fog/aws/parsers/compute/move_address_to_vpc.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class MoveAddressToVpc < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/network_acl_parser.rb b/lib/fog/aws/parsers/compute/network_acl_parser.rb
index 884354c8d5..d58a12d695 100644
--- a/lib/fog/aws/parsers/compute/network_acl_parser.rb
+++ b/lib/fog/aws/parsers/compute/network_acl_parser.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class NetworkAclParser < Fog::Parsers::Base
           def reset_nacl
diff --git a/lib/fog/aws/parsers/compute/network_interface_parser.rb b/lib/fog/aws/parsers/compute/network_interface_parser.rb
index a1bfeb4849..16f54aa4dc 100644
--- a/lib/fog/aws/parsers/compute/network_interface_parser.rb
+++ b/lib/fog/aws/parsers/compute/network_interface_parser.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class NetworkInterfaceParser < Fog::Parsers::Base
           def reset_nic
diff --git a/lib/fog/aws/parsers/compute/purchase_reserved_instances_offering.rb b/lib/fog/aws/parsers/compute/purchase_reserved_instances_offering.rb
index 7f42ff4331..d893a73742 100644
--- a/lib/fog/aws/parsers/compute/purchase_reserved_instances_offering.rb
+++ b/lib/fog/aws/parsers/compute/purchase_reserved_instances_offering.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class PurchaseReservedInstancesOffering < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/register_image.rb b/lib/fog/aws/parsers/compute/register_image.rb
index efdf1ab46e..6a32c9cd6e 100644
--- a/lib/fog/aws/parsers/compute/register_image.rb
+++ b/lib/fog/aws/parsers/compute/register_image.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class RegisterImage < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/replace_network_acl_association.rb b/lib/fog/aws/parsers/compute/replace_network_acl_association.rb
index 6656c75676..6220e9b203 100644
--- a/lib/fog/aws/parsers/compute/replace_network_acl_association.rb
+++ b/lib/fog/aws/parsers/compute/replace_network_acl_association.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class ReplaceNetworkAclAssociation < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/restore_address_to_classic.rb b/lib/fog/aws/parsers/compute/restore_address_to_classic.rb
index c4a8d32919..c2977de21c 100644
--- a/lib/fog/aws/parsers/compute/restore_address_to_classic.rb
+++ b/lib/fog/aws/parsers/compute/restore_address_to_classic.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class RestoreAddressToClassic < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/compute/run_instances.rb b/lib/fog/aws/parsers/compute/run_instances.rb
index 5e188053e4..097716902d 100644
--- a/lib/fog/aws/parsers/compute/run_instances.rb
+++ b/lib/fog/aws/parsers/compute/run_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class RunInstances < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/spot_datafeed_subscription.rb b/lib/fog/aws/parsers/compute/spot_datafeed_subscription.rb
index 314c6f3227..60d792fe92 100644
--- a/lib/fog/aws/parsers/compute/spot_datafeed_subscription.rb
+++ b/lib/fog/aws/parsers/compute/spot_datafeed_subscription.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class SpotDatafeedSubscription < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/spot_instance_requests.rb b/lib/fog/aws/parsers/compute/spot_instance_requests.rb
index d8a481b527..58b2aa880f 100644
--- a/lib/fog/aws/parsers/compute/spot_instance_requests.rb
+++ b/lib/fog/aws/parsers/compute/spot_instance_requests.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class SpotInstanceRequests < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/start_stop_instances.rb b/lib/fog/aws/parsers/compute/start_stop_instances.rb
index 70d1a2d601..0ba6c305e7 100644
--- a/lib/fog/aws/parsers/compute/start_stop_instances.rb
+++ b/lib/fog/aws/parsers/compute/start_stop_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class StartStopInstances < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/compute/terminate_instances.rb b/lib/fog/aws/parsers/compute/terminate_instances.rb
index dfdbb52faa..478f2f825f 100644
--- a/lib/fog/aws/parsers/compute/terminate_instances.rb
+++ b/lib/fog/aws/parsers/compute/terminate_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Compute
+    module AWS
       module AWS
         class TerminateInstances < Fog::Parsers::Base
           def reset

From 6d45ed5eab089c61a7d19c34e70e83e2601552e4 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Sat, 15 Sep 2018 00:05:26 +0900
Subject: [PATCH 05/39] git grep -l "      module AWS" --
 lib/fog/aws/parsers/compute/ | xargs sed -i "" "s/      module AWS/     
 module Compute/g"

---
 lib/fog/aws/parsers/compute/allocate_address.rb                 | 2 +-
 lib/fog/aws/parsers/compute/assign_private_ip_addresses.rb      | 2 +-
 lib/fog/aws/parsers/compute/associate_address.rb                | 2 +-
 lib/fog/aws/parsers/compute/associate_route_table.rb            | 2 +-
 lib/fog/aws/parsers/compute/attach_network_interface.rb         | 2 +-
 lib/fog/aws/parsers/compute/attach_volume.rb                    | 2 +-
 lib/fog/aws/parsers/compute/basic.rb                            | 2 +-
 lib/fog/aws/parsers/compute/cancel_spot_instance_requests.rb    | 2 +-
 lib/fog/aws/parsers/compute/copy_image.rb                       | 2 +-
 lib/fog/aws/parsers/compute/copy_snapshot.rb                    | 2 +-
 lib/fog/aws/parsers/compute/create_dhcp_options.rb              | 2 +-
 lib/fog/aws/parsers/compute/create_image.rb                     | 2 +-
 lib/fog/aws/parsers/compute/create_internet_gateway.rb          | 2 +-
 lib/fog/aws/parsers/compute/create_key_pair.rb                  | 2 +-
 lib/fog/aws/parsers/compute/create_network_acl.rb               | 2 +-
 lib/fog/aws/parsers/compute/create_network_interface.rb         | 2 +-
 lib/fog/aws/parsers/compute/create_route_table.rb               | 2 +-
 lib/fog/aws/parsers/compute/create_security_group.rb            | 2 +-
 lib/fog/aws/parsers/compute/create_snapshot.rb                  | 2 +-
 lib/fog/aws/parsers/compute/create_subnet.rb                    | 2 +-
 lib/fog/aws/parsers/compute/create_volume.rb                    | 2 +-
 lib/fog/aws/parsers/compute/create_vpc.rb                       | 2 +-
 lib/fog/aws/parsers/compute/deregister_image.rb                 | 2 +-
 lib/fog/aws/parsers/compute/describe_account_attributes.rb      | 2 +-
 lib/fog/aws/parsers/compute/describe_addresses.rb               | 2 +-
 lib/fog/aws/parsers/compute/describe_availability_zones.rb      | 2 +-
 lib/fog/aws/parsers/compute/describe_classic_link_instances.rb  | 2 +-
 lib/fog/aws/parsers/compute/describe_dhcp_options.rb            | 2 +-
 lib/fog/aws/parsers/compute/describe_images.rb                  | 2 +-
 lib/fog/aws/parsers/compute/describe_instance_attribute.rb      | 2 +-
 lib/fog/aws/parsers/compute/describe_instance_status.rb         | 2 +-
 lib/fog/aws/parsers/compute/describe_instances.rb               | 2 +-
 lib/fog/aws/parsers/compute/describe_internet_gateways.rb       | 2 +-
 lib/fog/aws/parsers/compute/describe_key_pairs.rb               | 2 +-
 lib/fog/aws/parsers/compute/describe_network_acls.rb            | 2 +-
 .../aws/parsers/compute/describe_network_interface_attribute.rb | 2 +-
 lib/fog/aws/parsers/compute/describe_network_interfaces.rb      | 2 +-
 lib/fog/aws/parsers/compute/describe_placement_groups.rb        | 2 +-
 lib/fog/aws/parsers/compute/describe_regions.rb                 | 2 +-
 lib/fog/aws/parsers/compute/describe_reserved_instances.rb      | 2 +-
 .../parsers/compute/describe_reserved_instances_offerings.rb    | 2 +-
 lib/fog/aws/parsers/compute/describe_route_tables.rb            | 2 +-
 lib/fog/aws/parsers/compute/describe_security_groups.rb         | 2 +-
 lib/fog/aws/parsers/compute/describe_snapshots.rb               | 2 +-
 lib/fog/aws/parsers/compute/describe_spot_price_history.rb      | 2 +-
 lib/fog/aws/parsers/compute/describe_subnets.rb                 | 2 +-
 lib/fog/aws/parsers/compute/describe_tags.rb                    | 2 +-
 lib/fog/aws/parsers/compute/describe_volume_status.rb           | 2 +-
 lib/fog/aws/parsers/compute/describe_volumes.rb                 | 2 +-
 lib/fog/aws/parsers/compute/describe_volumes_modifications.rb   | 2 +-
 lib/fog/aws/parsers/compute/describe_vpc_attribute.rb           | 2 +-
 lib/fog/aws/parsers/compute/describe_vpc_classic_link.rb        | 2 +-
 .../parsers/compute/describe_vpc_classic_link_dns_support.rb    | 2 +-
 lib/fog/aws/parsers/compute/describe_vpcs.rb                    | 2 +-
 lib/fog/aws/parsers/compute/detach_volume.rb                    | 2 +-
 lib/fog/aws/parsers/compute/get_console_output.rb               | 2 +-
 lib/fog/aws/parsers/compute/get_password_data.rb                | 2 +-
 lib/fog/aws/parsers/compute/import_key_pair.rb                  | 2 +-
 lib/fog/aws/parsers/compute/modify_subnet_attribute.rb          | 2 +-
 lib/fog/aws/parsers/compute/modify_volume.rb                    | 2 +-
 lib/fog/aws/parsers/compute/monitor_unmonitor_instances.rb      | 2 +-
 lib/fog/aws/parsers/compute/move_address_to_vpc.rb              | 2 +-
 lib/fog/aws/parsers/compute/network_acl_parser.rb               | 2 +-
 lib/fog/aws/parsers/compute/network_interface_parser.rb         | 2 +-
 .../aws/parsers/compute/purchase_reserved_instances_offering.rb | 2 +-
 lib/fog/aws/parsers/compute/register_image.rb                   | 2 +-
 lib/fog/aws/parsers/compute/replace_network_acl_association.rb  | 2 +-
 lib/fog/aws/parsers/compute/restore_address_to_classic.rb       | 2 +-
 lib/fog/aws/parsers/compute/run_instances.rb                    | 2 +-
 lib/fog/aws/parsers/compute/spot_datafeed_subscription.rb       | 2 +-
 lib/fog/aws/parsers/compute/spot_instance_requests.rb           | 2 +-
 lib/fog/aws/parsers/compute/start_stop_instances.rb             | 2 +-
 lib/fog/aws/parsers/compute/terminate_instances.rb              | 2 +-
 73 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/lib/fog/aws/parsers/compute/allocate_address.rb b/lib/fog/aws/parsers/compute/allocate_address.rb
index 5416d2ffed..35afb48db1 100644
--- a/lib/fog/aws/parsers/compute/allocate_address.rb
+++ b/lib/fog/aws/parsers/compute/allocate_address.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class AllocateAddress < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/assign_private_ip_addresses.rb b/lib/fog/aws/parsers/compute/assign_private_ip_addresses.rb
index 81af6510c3..23d1dee782 100644
--- a/lib/fog/aws/parsers/compute/assign_private_ip_addresses.rb
+++ b/lib/fog/aws/parsers/compute/assign_private_ip_addresses.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class AssignPrivateIpAddresses < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/associate_address.rb b/lib/fog/aws/parsers/compute/associate_address.rb
index cb0d791a67..c88b492a48 100644
--- a/lib/fog/aws/parsers/compute/associate_address.rb
+++ b/lib/fog/aws/parsers/compute/associate_address.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class AssociateAddress < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/associate_route_table.rb b/lib/fog/aws/parsers/compute/associate_route_table.rb
index 368e76dff6..054770813b 100644
--- a/lib/fog/aws/parsers/compute/associate_route_table.rb
+++ b/lib/fog/aws/parsers/compute/associate_route_table.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class AssociateRouteTable < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/attach_network_interface.rb b/lib/fog/aws/parsers/compute/attach_network_interface.rb
index f0898d6afb..fca042270c 100644
--- a/lib/fog/aws/parsers/compute/attach_network_interface.rb
+++ b/lib/fog/aws/parsers/compute/attach_network_interface.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class AttachNetworkInterface < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/attach_volume.rb b/lib/fog/aws/parsers/compute/attach_volume.rb
index ae3eb0e66e..924fa908fe 100644
--- a/lib/fog/aws/parsers/compute/attach_volume.rb
+++ b/lib/fog/aws/parsers/compute/attach_volume.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class AttachVolume < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/basic.rb b/lib/fog/aws/parsers/compute/basic.rb
index 610799158a..138f5fd969 100644
--- a/lib/fog/aws/parsers/compute/basic.rb
+++ b/lib/fog/aws/parsers/compute/basic.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class Basic < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/cancel_spot_instance_requests.rb b/lib/fog/aws/parsers/compute/cancel_spot_instance_requests.rb
index 6e28c3cadb..e3e9c426db 100644
--- a/lib/fog/aws/parsers/compute/cancel_spot_instance_requests.rb
+++ b/lib/fog/aws/parsers/compute/cancel_spot_instance_requests.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class CancelSpotInstanceRequests < Fog::Parsers::Base
           def reset
             @spot_instance_request = {}
diff --git a/lib/fog/aws/parsers/compute/copy_image.rb b/lib/fog/aws/parsers/compute/copy_image.rb
index ed21ff0f16..13219eb361 100644
--- a/lib/fog/aws/parsers/compute/copy_image.rb
+++ b/lib/fog/aws/parsers/compute/copy_image.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class CopyImage < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/copy_snapshot.rb b/lib/fog/aws/parsers/compute/copy_snapshot.rb
index d14581c06d..6388ef9dbc 100644
--- a/lib/fog/aws/parsers/compute/copy_snapshot.rb
+++ b/lib/fog/aws/parsers/compute/copy_snapshot.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class CopySnapshot < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/create_dhcp_options.rb b/lib/fog/aws/parsers/compute/create_dhcp_options.rb
index aa927ef621..e1700c89bd 100644
--- a/lib/fog/aws/parsers/compute/create_dhcp_options.rb
+++ b/lib/fog/aws/parsers/compute/create_dhcp_options.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class CreateDhcpOptions < Fog::Parsers::Base
           def reset
             @dhcp_options = { 'dhcpConfigurationSet' => {}, 'tagSet' => {} }
diff --git a/lib/fog/aws/parsers/compute/create_image.rb b/lib/fog/aws/parsers/compute/create_image.rb
index 95364f63dc..b62accae16 100644
--- a/lib/fog/aws/parsers/compute/create_image.rb
+++ b/lib/fog/aws/parsers/compute/create_image.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class CreateImage < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/create_internet_gateway.rb b/lib/fog/aws/parsers/compute/create_internet_gateway.rb
index 232239cbb3..0d9242e432 100644
--- a/lib/fog/aws/parsers/compute/create_internet_gateway.rb
+++ b/lib/fog/aws/parsers/compute/create_internet_gateway.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class CreateInternetGateway < Fog::Parsers::Base
           def reset
             @internet_gateway = { 'attachmentSet' => {}, 'tagSet' => {} }
diff --git a/lib/fog/aws/parsers/compute/create_key_pair.rb b/lib/fog/aws/parsers/compute/create_key_pair.rb
index 778e1f97ff..4530b7389e 100644
--- a/lib/fog/aws/parsers/compute/create_key_pair.rb
+++ b/lib/fog/aws/parsers/compute/create_key_pair.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class CreateKeyPair < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/create_network_acl.rb b/lib/fog/aws/parsers/compute/create_network_acl.rb
index c96234373f..f3f980ff9e 100644
--- a/lib/fog/aws/parsers/compute/create_network_acl.rb
+++ b/lib/fog/aws/parsers/compute/create_network_acl.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         require 'fog/aws/parsers/compute/network_acl_parser'
 
         class CreateNetworkAcl < NetworkAclParser
diff --git a/lib/fog/aws/parsers/compute/create_network_interface.rb b/lib/fog/aws/parsers/compute/create_network_interface.rb
index b7970609ca..7392310aae 100644
--- a/lib/fog/aws/parsers/compute/create_network_interface.rb
+++ b/lib/fog/aws/parsers/compute/create_network_interface.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         require 'fog/aws/parsers/compute/network_interface_parser'
 
         class CreateNetworkInterface < NetworkInterfaceParser
diff --git a/lib/fog/aws/parsers/compute/create_route_table.rb b/lib/fog/aws/parsers/compute/create_route_table.rb
index a66fae0975..2f103f670c 100644
--- a/lib/fog/aws/parsers/compute/create_route_table.rb
+++ b/lib/fog/aws/parsers/compute/create_route_table.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class CreateRouteTable < Fog::Parsers::Base
           def reset
             @in_route_set = false
diff --git a/lib/fog/aws/parsers/compute/create_security_group.rb b/lib/fog/aws/parsers/compute/create_security_group.rb
index d5d79fdc74..edc9e95f4c 100644
--- a/lib/fog/aws/parsers/compute/create_security_group.rb
+++ b/lib/fog/aws/parsers/compute/create_security_group.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class CreateSecurityGroup < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/create_snapshot.rb b/lib/fog/aws/parsers/compute/create_snapshot.rb
index 42ddf07f96..5dbf4a91ed 100644
--- a/lib/fog/aws/parsers/compute/create_snapshot.rb
+++ b/lib/fog/aws/parsers/compute/create_snapshot.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class CreateSnapshot < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/create_subnet.rb b/lib/fog/aws/parsers/compute/create_subnet.rb
index 22b264a361..c53a8d4f1b 100644
--- a/lib/fog/aws/parsers/compute/create_subnet.rb
+++ b/lib/fog/aws/parsers/compute/create_subnet.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class CreateSubnet < Fog::Parsers::Base
           def reset
             @subnet = { 'tagSet' => {} }
diff --git a/lib/fog/aws/parsers/compute/create_volume.rb b/lib/fog/aws/parsers/compute/create_volume.rb
index d91d61c507..afe2c3fcab 100644
--- a/lib/fog/aws/parsers/compute/create_volume.rb
+++ b/lib/fog/aws/parsers/compute/create_volume.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class CreateVolume < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/create_vpc.rb b/lib/fog/aws/parsers/compute/create_vpc.rb
index 61931406a1..7ad5bcff6d 100644
--- a/lib/fog/aws/parsers/compute/create_vpc.rb
+++ b/lib/fog/aws/parsers/compute/create_vpc.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class CreateVpc < Fog::Parsers::Base
           def reset
             @vpc = { 'tagSet' => {} }
diff --git a/lib/fog/aws/parsers/compute/deregister_image.rb b/lib/fog/aws/parsers/compute/deregister_image.rb
index a6f5d36dff..cec293af65 100644
--- a/lib/fog/aws/parsers/compute/deregister_image.rb
+++ b/lib/fog/aws/parsers/compute/deregister_image.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DeregisterImage < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/describe_account_attributes.rb b/lib/fog/aws/parsers/compute/describe_account_attributes.rb
index ce89c02868..30944b71d1 100644
--- a/lib/fog/aws/parsers/compute/describe_account_attributes.rb
+++ b/lib/fog/aws/parsers/compute/describe_account_attributes.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeAccountAttributes < Fog::Parsers::Base
           def reset
             @attribute = { 'values' => []}
diff --git a/lib/fog/aws/parsers/compute/describe_addresses.rb b/lib/fog/aws/parsers/compute/describe_addresses.rb
index de3d352fc9..893c15af82 100644
--- a/lib/fog/aws/parsers/compute/describe_addresses.rb
+++ b/lib/fog/aws/parsers/compute/describe_addresses.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeAddresses < Fog::Parsers::Base
           def reset
             @address = {}
diff --git a/lib/fog/aws/parsers/compute/describe_availability_zones.rb b/lib/fog/aws/parsers/compute/describe_availability_zones.rb
index 0ea1cd203b..1f7f5c87a7 100644
--- a/lib/fog/aws/parsers/compute/describe_availability_zones.rb
+++ b/lib/fog/aws/parsers/compute/describe_availability_zones.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeAvailabilityZones < Fog::Parsers::Base
           def start_element(name, attrs = [])
             case name
diff --git a/lib/fog/aws/parsers/compute/describe_classic_link_instances.rb b/lib/fog/aws/parsers/compute/describe_classic_link_instances.rb
index 9e30384414..175b08e6dc 100644
--- a/lib/fog/aws/parsers/compute/describe_classic_link_instances.rb
+++ b/lib/fog/aws/parsers/compute/describe_classic_link_instances.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeClassicLinkInstances < Fog::Parsers::Base
           def reset
             @instance = { 'tagSet' => {}, 'groups' => [] }
diff --git a/lib/fog/aws/parsers/compute/describe_dhcp_options.rb b/lib/fog/aws/parsers/compute/describe_dhcp_options.rb
index a3222f029a..30a4e602e1 100644
--- a/lib/fog/aws/parsers/compute/describe_dhcp_options.rb
+++ b/lib/fog/aws/parsers/compute/describe_dhcp_options.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeDhcpOptions < Fog::Parsers::Base
           def reset
             @dhcp_options = { 'dhcpConfigurationSet' => {}, 'tagSet' => {} }
diff --git a/lib/fog/aws/parsers/compute/describe_images.rb b/lib/fog/aws/parsers/compute/describe_images.rb
index a7e3817f8f..c02c5b934a 100644
--- a/lib/fog/aws/parsers/compute/describe_images.rb
+++ b/lib/fog/aws/parsers/compute/describe_images.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeImages < Fog::Parsers::Base
           def reset
             @block_device_mapping = {}
diff --git a/lib/fog/aws/parsers/compute/describe_instance_attribute.rb b/lib/fog/aws/parsers/compute/describe_instance_attribute.rb
index 60a6ad043d..967fdc1976 100644
--- a/lib/fog/aws/parsers/compute/describe_instance_attribute.rb
+++ b/lib/fog/aws/parsers/compute/describe_instance_attribute.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeInstanceAttribute < Fog::Parsers::Base
           def reset
             @response                             = { }
diff --git a/lib/fog/aws/parsers/compute/describe_instance_status.rb b/lib/fog/aws/parsers/compute/describe_instance_status.rb
index 02793cfda1..bf5c6d7828 100644
--- a/lib/fog/aws/parsers/compute/describe_instance_status.rb
+++ b/lib/fog/aws/parsers/compute/describe_instance_status.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeInstanceStatus < Fog::Parsers::Base
           def new_instance!
             @instance = { 'instanceState' => {}, 'systemStatus' => { 'details' => [] }, 'instanceStatus' => { 'details' => [] }, 'eventsSet' => [] }
diff --git a/lib/fog/aws/parsers/compute/describe_instances.rb b/lib/fog/aws/parsers/compute/describe_instances.rb
index bdaf03aff2..8080a5ae12 100644
--- a/lib/fog/aws/parsers/compute/describe_instances.rb
+++ b/lib/fog/aws/parsers/compute/describe_instances.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeInstances < Fog::Parsers::Base
           def reset
             @block_device_mapping = {}
diff --git a/lib/fog/aws/parsers/compute/describe_internet_gateways.rb b/lib/fog/aws/parsers/compute/describe_internet_gateways.rb
index acfde17df2..93612809fa 100644
--- a/lib/fog/aws/parsers/compute/describe_internet_gateways.rb
+++ b/lib/fog/aws/parsers/compute/describe_internet_gateways.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeInternetGateways < Fog::Parsers::Base
           def reset
             @internet_gateway = { 'attachmentSet' => {}, 'tagSet' => {} }
diff --git a/lib/fog/aws/parsers/compute/describe_key_pairs.rb b/lib/fog/aws/parsers/compute/describe_key_pairs.rb
index 09b92a9850..71894eacf9 100644
--- a/lib/fog/aws/parsers/compute/describe_key_pairs.rb
+++ b/lib/fog/aws/parsers/compute/describe_key_pairs.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeKeyPairs < Fog::Parsers::Base
           def reset
             @key = {}
diff --git a/lib/fog/aws/parsers/compute/describe_network_acls.rb b/lib/fog/aws/parsers/compute/describe_network_acls.rb
index 0b9f841963..e057cf7831 100644
--- a/lib/fog/aws/parsers/compute/describe_network_acls.rb
+++ b/lib/fog/aws/parsers/compute/describe_network_acls.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         require 'fog/aws/parsers/compute/network_acl_parser'
 
         class DescribeNetworkAcls < NetworkAclParser
diff --git a/lib/fog/aws/parsers/compute/describe_network_interface_attribute.rb b/lib/fog/aws/parsers/compute/describe_network_interface_attribute.rb
index a62b77510a..eab033fd9c 100644
--- a/lib/fog/aws/parsers/compute/describe_network_interface_attribute.rb
+++ b/lib/fog/aws/parsers/compute/describe_network_interface_attribute.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeNetworkInterfaceAttribute < NetworkInterfaceParser
           def reset
             @response             = { }
diff --git a/lib/fog/aws/parsers/compute/describe_network_interfaces.rb b/lib/fog/aws/parsers/compute/describe_network_interfaces.rb
index 15ba2c761b..3642884ed2 100644
--- a/lib/fog/aws/parsers/compute/describe_network_interfaces.rb
+++ b/lib/fog/aws/parsers/compute/describe_network_interfaces.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         require 'fog/aws/parsers/compute/network_interface_parser'
 
         class DescribeNetworkInterfaces < NetworkInterfaceParser
diff --git a/lib/fog/aws/parsers/compute/describe_placement_groups.rb b/lib/fog/aws/parsers/compute/describe_placement_groups.rb
index 849ab3b7fb..203a226910 100644
--- a/lib/fog/aws/parsers/compute/describe_placement_groups.rb
+++ b/lib/fog/aws/parsers/compute/describe_placement_groups.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribePlacementGroups < Fog::Parsers::Base
           def reset
             @placement_group = {}
diff --git a/lib/fog/aws/parsers/compute/describe_regions.rb b/lib/fog/aws/parsers/compute/describe_regions.rb
index beabf72b5c..58ee80c7f7 100644
--- a/lib/fog/aws/parsers/compute/describe_regions.rb
+++ b/lib/fog/aws/parsers/compute/describe_regions.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeRegions < Fog::Parsers::Base
           def reset
             @region = {}
diff --git a/lib/fog/aws/parsers/compute/describe_reserved_instances.rb b/lib/fog/aws/parsers/compute/describe_reserved_instances.rb
index 9aa736a0ec..a7d8f35272 100644
--- a/lib/fog/aws/parsers/compute/describe_reserved_instances.rb
+++ b/lib/fog/aws/parsers/compute/describe_reserved_instances.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeReservedInstances < Fog::Parsers::Base
           def get_default_item
             {'tagSet' => {}, 'recurringCharges' => []}
diff --git a/lib/fog/aws/parsers/compute/describe_reserved_instances_offerings.rb b/lib/fog/aws/parsers/compute/describe_reserved_instances_offerings.rb
index 967b2a0d9a..c0dcc2978b 100644
--- a/lib/fog/aws/parsers/compute/describe_reserved_instances_offerings.rb
+++ b/lib/fog/aws/parsers/compute/describe_reserved_instances_offerings.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeReservedInstancesOfferings < Fog::Parsers::Base
           def reset
             @reserved_instances_offering = {}
diff --git a/lib/fog/aws/parsers/compute/describe_route_tables.rb b/lib/fog/aws/parsers/compute/describe_route_tables.rb
index 32db01be7a..f6c76f0c46 100644
--- a/lib/fog/aws/parsers/compute/describe_route_tables.rb
+++ b/lib/fog/aws/parsers/compute/describe_route_tables.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeRouteTables < Fog::Parsers::Base
           def reset
             @association = { 'routeTableAssociationId' => nil, 'routeTableId' => nil, 'subnetId' => nil, 'main' => false }
diff --git a/lib/fog/aws/parsers/compute/describe_security_groups.rb b/lib/fog/aws/parsers/compute/describe_security_groups.rb
index 868514f156..9b89003eb6 100644
--- a/lib/fog/aws/parsers/compute/describe_security_groups.rb
+++ b/lib/fog/aws/parsers/compute/describe_security_groups.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeSecurityGroups < Fog::Parsers::Base
           def reset
             @group = {}
diff --git a/lib/fog/aws/parsers/compute/describe_snapshots.rb b/lib/fog/aws/parsers/compute/describe_snapshots.rb
index b81377d3ec..ba3980d039 100644
--- a/lib/fog/aws/parsers/compute/describe_snapshots.rb
+++ b/lib/fog/aws/parsers/compute/describe_snapshots.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeSnapshots < Fog::Parsers::Base
           def reset
             @response = { 'snapshotSet' => [] }
diff --git a/lib/fog/aws/parsers/compute/describe_spot_price_history.rb b/lib/fog/aws/parsers/compute/describe_spot_price_history.rb
index 8d31695d20..27ab6e409a 100644
--- a/lib/fog/aws/parsers/compute/describe_spot_price_history.rb
+++ b/lib/fog/aws/parsers/compute/describe_spot_price_history.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeSpotPriceHistory < Fog::Parsers::Base
           def reset
             @spot_price = {}
diff --git a/lib/fog/aws/parsers/compute/describe_subnets.rb b/lib/fog/aws/parsers/compute/describe_subnets.rb
index 37c49fad12..20821dd68f 100644
--- a/lib/fog/aws/parsers/compute/describe_subnets.rb
+++ b/lib/fog/aws/parsers/compute/describe_subnets.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeSubnets < Fog::Parsers::Base
           def reset
             @subnet = { 'tagSet' => {} }
diff --git a/lib/fog/aws/parsers/compute/describe_tags.rb b/lib/fog/aws/parsers/compute/describe_tags.rb
index 42158043bd..00145e5d15 100644
--- a/lib/fog/aws/parsers/compute/describe_tags.rb
+++ b/lib/fog/aws/parsers/compute/describe_tags.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeTags < Fog::Parsers::Base
           def reset
             @tag = {}
diff --git a/lib/fog/aws/parsers/compute/describe_volume_status.rb b/lib/fog/aws/parsers/compute/describe_volume_status.rb
index 507a39cabe..943c70aeb5 100644
--- a/lib/fog/aws/parsers/compute/describe_volume_status.rb
+++ b/lib/fog/aws/parsers/compute/describe_volume_status.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeVolumeStatus < Fog::Parsers::Base
           def reset
             @action_set = {}
diff --git a/lib/fog/aws/parsers/compute/describe_volumes.rb b/lib/fog/aws/parsers/compute/describe_volumes.rb
index 6c447b65ee..247de7655d 100644
--- a/lib/fog/aws/parsers/compute/describe_volumes.rb
+++ b/lib/fog/aws/parsers/compute/describe_volumes.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeVolumes < Fog::Parsers::Base
           def reset
             @attachment = {}
diff --git a/lib/fog/aws/parsers/compute/describe_volumes_modifications.rb b/lib/fog/aws/parsers/compute/describe_volumes_modifications.rb
index 8f9b4789a4..ab79135c27 100644
--- a/lib/fog/aws/parsers/compute/describe_volumes_modifications.rb
+++ b/lib/fog/aws/parsers/compute/describe_volumes_modifications.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeVolumesModifications < Fog::Parsers::Base
           def reset
             @response     = { 'volumeModificationSet' => [] }
diff --git a/lib/fog/aws/parsers/compute/describe_vpc_attribute.rb b/lib/fog/aws/parsers/compute/describe_vpc_attribute.rb
index edd3ab0b50..80afe35875 100644
--- a/lib/fog/aws/parsers/compute/describe_vpc_attribute.rb
+++ b/lib/fog/aws/parsers/compute/describe_vpc_attribute.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeVpcAttribute < Fog::Parsers::Base
           def reset
             @response                = { }
diff --git a/lib/fog/aws/parsers/compute/describe_vpc_classic_link.rb b/lib/fog/aws/parsers/compute/describe_vpc_classic_link.rb
index b6102540be..2214ecf6a5 100644
--- a/lib/fog/aws/parsers/compute/describe_vpc_classic_link.rb
+++ b/lib/fog/aws/parsers/compute/describe_vpc_classic_link.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeVpcClassicLink < Fog::Parsers::Base
           def reset
             @vpc = { 'tagSet' => {} }
diff --git a/lib/fog/aws/parsers/compute/describe_vpc_classic_link_dns_support.rb b/lib/fog/aws/parsers/compute/describe_vpc_classic_link_dns_support.rb
index ac24f8816e..f6e4af288b 100644
--- a/lib/fog/aws/parsers/compute/describe_vpc_classic_link_dns_support.rb
+++ b/lib/fog/aws/parsers/compute/describe_vpc_classic_link_dns_support.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeVpcClassicLinkDnsSupport < Fog::Parsers::Base
           def reset
             @vpc      = {}
diff --git a/lib/fog/aws/parsers/compute/describe_vpcs.rb b/lib/fog/aws/parsers/compute/describe_vpcs.rb
index 661c4d02a4..dccbe3c250 100644
--- a/lib/fog/aws/parsers/compute/describe_vpcs.rb
+++ b/lib/fog/aws/parsers/compute/describe_vpcs.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DescribeVpcs < Fog::Parsers::Base
           def reset
             @response = { 'vpcSet' => [] }
diff --git a/lib/fog/aws/parsers/compute/detach_volume.rb b/lib/fog/aws/parsers/compute/detach_volume.rb
index d62e538bdb..76885fc0fc 100644
--- a/lib/fog/aws/parsers/compute/detach_volume.rb
+++ b/lib/fog/aws/parsers/compute/detach_volume.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class DetachVolume < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/get_console_output.rb b/lib/fog/aws/parsers/compute/get_console_output.rb
index d08d335313..d344a084e5 100644
--- a/lib/fog/aws/parsers/compute/get_console_output.rb
+++ b/lib/fog/aws/parsers/compute/get_console_output.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class GetConsoleOutput < Fog::Parsers::Base
           def reset
             @response = {}
diff --git a/lib/fog/aws/parsers/compute/get_password_data.rb b/lib/fog/aws/parsers/compute/get_password_data.rb
index fac632f0f4..6b5b31b35c 100644
--- a/lib/fog/aws/parsers/compute/get_password_data.rb
+++ b/lib/fog/aws/parsers/compute/get_password_data.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class GetPasswordData < Fog::Parsers::Base
           def reset
             @response = {}
diff --git a/lib/fog/aws/parsers/compute/import_key_pair.rb b/lib/fog/aws/parsers/compute/import_key_pair.rb
index 688c9a06c4..46a13cab66 100644
--- a/lib/fog/aws/parsers/compute/import_key_pair.rb
+++ b/lib/fog/aws/parsers/compute/import_key_pair.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class ImportKeyPair < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/modify_subnet_attribute.rb b/lib/fog/aws/parsers/compute/modify_subnet_attribute.rb
index aa9d2bfa6e..71a731d554 100644
--- a/lib/fog/aws/parsers/compute/modify_subnet_attribute.rb
+++ b/lib/fog/aws/parsers/compute/modify_subnet_attribute.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class ModifySubnetAttribute < Fog::Parsers::Base
           def reset
             @response = {  }
diff --git a/lib/fog/aws/parsers/compute/modify_volume.rb b/lib/fog/aws/parsers/compute/modify_volume.rb
index 1814d076d8..501874653d 100644
--- a/lib/fog/aws/parsers/compute/modify_volume.rb
+++ b/lib/fog/aws/parsers/compute/modify_volume.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class ModifyVolume < Fog::Parsers::Base
           def reset
             @response = {'volumeModification' => {}}
diff --git a/lib/fog/aws/parsers/compute/monitor_unmonitor_instances.rb b/lib/fog/aws/parsers/compute/monitor_unmonitor_instances.rb
index 5899c39d9e..a269d4245c 100644
--- a/lib/fog/aws/parsers/compute/monitor_unmonitor_instances.rb
+++ b/lib/fog/aws/parsers/compute/monitor_unmonitor_instances.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class MonitorUnmonitorInstances < Fog::Parsers::Base
           def reset
             @response = {}
diff --git a/lib/fog/aws/parsers/compute/move_address_to_vpc.rb b/lib/fog/aws/parsers/compute/move_address_to_vpc.rb
index 339c8d403a..3a2e8ed712 100644
--- a/lib/fog/aws/parsers/compute/move_address_to_vpc.rb
+++ b/lib/fog/aws/parsers/compute/move_address_to_vpc.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class MoveAddressToVpc < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/network_acl_parser.rb b/lib/fog/aws/parsers/compute/network_acl_parser.rb
index d58a12d695..a86b5ba1de 100644
--- a/lib/fog/aws/parsers/compute/network_acl_parser.rb
+++ b/lib/fog/aws/parsers/compute/network_acl_parser.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class NetworkAclParser < Fog::Parsers::Base
           def reset_nacl
             @network_acl = { 'associationSet' => [], 'entrySet' => [], 'tagSet' => {} }
diff --git a/lib/fog/aws/parsers/compute/network_interface_parser.rb b/lib/fog/aws/parsers/compute/network_interface_parser.rb
index 16f54aa4dc..bc8e2dd214 100644
--- a/lib/fog/aws/parsers/compute/network_interface_parser.rb
+++ b/lib/fog/aws/parsers/compute/network_interface_parser.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class NetworkInterfaceParser < Fog::Parsers::Base
           def reset_nic
             @nic = { 'groupSet' => {}, 'attachment' => {}, 'association' => {}, 'tagSet' => {}, 'privateIpAddressesSet' => [] }
diff --git a/lib/fog/aws/parsers/compute/purchase_reserved_instances_offering.rb b/lib/fog/aws/parsers/compute/purchase_reserved_instances_offering.rb
index d893a73742..6e9b83a713 100644
--- a/lib/fog/aws/parsers/compute/purchase_reserved_instances_offering.rb
+++ b/lib/fog/aws/parsers/compute/purchase_reserved_instances_offering.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class PurchaseReservedInstancesOffering < Fog::Parsers::Base
           def reset
             @response = {}
diff --git a/lib/fog/aws/parsers/compute/register_image.rb b/lib/fog/aws/parsers/compute/register_image.rb
index 6a32c9cd6e..e0e5afa620 100644
--- a/lib/fog/aws/parsers/compute/register_image.rb
+++ b/lib/fog/aws/parsers/compute/register_image.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class RegisterImage < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/replace_network_acl_association.rb b/lib/fog/aws/parsers/compute/replace_network_acl_association.rb
index 6220e9b203..1dafa49d35 100644
--- a/lib/fog/aws/parsers/compute/replace_network_acl_association.rb
+++ b/lib/fog/aws/parsers/compute/replace_network_acl_association.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class ReplaceNetworkAclAssociation < Fog::Parsers::Base
           def reset
             @response = {}
diff --git a/lib/fog/aws/parsers/compute/restore_address_to_classic.rb b/lib/fog/aws/parsers/compute/restore_address_to_classic.rb
index c2977de21c..71b91d5182 100644
--- a/lib/fog/aws/parsers/compute/restore_address_to_classic.rb
+++ b/lib/fog/aws/parsers/compute/restore_address_to_classic.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class RestoreAddressToClassic < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/compute/run_instances.rb b/lib/fog/aws/parsers/compute/run_instances.rb
index 097716902d..d091ea1db4 100644
--- a/lib/fog/aws/parsers/compute/run_instances.rb
+++ b/lib/fog/aws/parsers/compute/run_instances.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class RunInstances < Fog::Parsers::Base
           def reset
             @block_device_mapping = {}
diff --git a/lib/fog/aws/parsers/compute/spot_datafeed_subscription.rb b/lib/fog/aws/parsers/compute/spot_datafeed_subscription.rb
index 60d792fe92..5f36e4e7e9 100644
--- a/lib/fog/aws/parsers/compute/spot_datafeed_subscription.rb
+++ b/lib/fog/aws/parsers/compute/spot_datafeed_subscription.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class SpotDatafeedSubscription < Fog::Parsers::Base
           def reset
             @response = { 'spotDatafeedSubscription' => {} }
diff --git a/lib/fog/aws/parsers/compute/spot_instance_requests.rb b/lib/fog/aws/parsers/compute/spot_instance_requests.rb
index 58b2aa880f..5b7c7fde27 100644
--- a/lib/fog/aws/parsers/compute/spot_instance_requests.rb
+++ b/lib/fog/aws/parsers/compute/spot_instance_requests.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class SpotInstanceRequests < Fog::Parsers::Base
           def reset
             @block_device_mapping = {}
diff --git a/lib/fog/aws/parsers/compute/start_stop_instances.rb b/lib/fog/aws/parsers/compute/start_stop_instances.rb
index 0ba6c305e7..0957db7feb 100644
--- a/lib/fog/aws/parsers/compute/start_stop_instances.rb
+++ b/lib/fog/aws/parsers/compute/start_stop_instances.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class StartStopInstances < Fog::Parsers::Base
           def reset
             @instance = { 'currentState' => {}, 'previousState' => {} }
diff --git a/lib/fog/aws/parsers/compute/terminate_instances.rb b/lib/fog/aws/parsers/compute/terminate_instances.rb
index 478f2f825f..2e33036a70 100644
--- a/lib/fog/aws/parsers/compute/terminate_instances.rb
+++ b/lib/fog/aws/parsers/compute/terminate_instances.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Compute
         class TerminateInstances < Fog::Parsers::Base
           def reset
             @instance = { 'previousState' => {}, 'currentState' => {} }

From af3564d0dba702326151057544fe253be9bacb26 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Wed, 12 Sep 2018 18:34:50 +0900
Subject: [PATCH 06/39] git grep -l "Compute::AWS" -- lib/ | xargs sed -i ""
 "s/Compute::AWS/AWS::Compute/g"

---
 lib/fog/aws.rb                                 |  4 ++--
 lib/fog/aws/compute.rb                         |  8 ++++----
 lib/fog/aws/credential_fetcher.rb              |  2 +-
 lib/fog/aws/efs.rb                             |  2 +-
 lib/fog/aws/models/compute/addresses.rb        |  2 +-
 lib/fog/aws/models/compute/dhcp_options.rb     | 10 +++++-----
 lib/fog/aws/models/compute/flavors.rb          |  8 ++++----
 lib/fog/aws/models/compute/images.rb           |  2 +-
 .../aws/models/compute/internet_gateways.rb    | 10 +++++-----
 lib/fog/aws/models/compute/key_pairs.rb        |  2 +-
 lib/fog/aws/models/compute/network_acl.rb      |  4 ++--
 lib/fog/aws/models/compute/network_acls.rb     |  8 ++++----
 .../aws/models/compute/network_interfaces.rb   |  4 ++--
 lib/fog/aws/models/compute/route_tables.rb     | 10 +++++-----
 lib/fog/aws/models/compute/security_groups.rb  |  2 +-
 lib/fog/aws/models/compute/servers.rb          |  6 +++---
 lib/fog/aws/models/compute/snapshots.rb        |  2 +-
 lib/fog/aws/models/compute/spot_requests.rb    |  2 +-
 lib/fog/aws/models/compute/subnets.rb          |  2 +-
 lib/fog/aws/models/compute/tags.rb             |  2 +-
 lib/fog/aws/models/compute/volume.rb           |  2 +-
 lib/fog/aws/models/compute/volumes.rb          |  2 +-
 lib/fog/aws/models/compute/vpcs.rb             |  2 +-
 .../requests/cloud_watch/put_metric_alarm.rb   |  4 ++--
 .../aws/requests/compute/allocate_address.rb   |  4 ++--
 .../compute/assign_private_ip_addresses.rb     |  6 +++---
 .../aws/requests/compute/associate_address.rb  | 10 +++++-----
 .../requests/compute/associate_dhcp_options.rb |  4 ++--
 .../requests/compute/associate_route_table.rb  |  6 +++---
 .../compute/attach_classic_link_vpc.rb         | 10 +++++-----
 .../compute/attach_internet_gateway.rb         |  4 ++--
 .../compute/attach_network_interface.rb        |  8 ++++----
 lib/fog/aws/requests/compute/attach_volume.rb  | 10 +++++-----
 .../compute/authorize_security_group_egress.rb |  8 ++++----
 .../authorize_security_group_ingress.rb        | 18 +++++++++---------
 .../compute/cancel_spot_instance_requests.rb   |  4 ++--
 lib/fog/aws/requests/compute/copy_image.rb     |  2 +-
 lib/fog/aws/requests/compute/copy_snapshot.rb  |  2 +-
 .../requests/compute/create_dhcp_options.rb    |  2 +-
 lib/fog/aws/requests/compute/create_image.rb   |  2 +-
 .../compute/create_internet_gateway.rb         |  2 +-
 .../aws/requests/compute/create_key_pair.rb    |  4 ++--
 .../aws/requests/compute/create_network_acl.rb |  4 ++--
 .../compute/create_network_acl_entry.rb        |  6 +++---
 .../compute/create_network_interface.rb        |  8 ++++----
 .../requests/compute/create_placement_group.rb |  2 +-
 lib/fog/aws/requests/compute/create_route.rb   | 16 ++++++++--------
 .../aws/requests/compute/create_route_table.rb |  4 ++--
 .../requests/compute/create_security_group.rb  |  4 ++--
 .../aws/requests/compute/create_snapshot.rb    |  2 +-
 .../create_spot_datafeed_subscription.rb       |  2 +-
 lib/fog/aws/requests/compute/create_subnet.rb  |  8 ++++----
 lib/fog/aws/requests/compute/create_tags.rb    |  2 +-
 lib/fog/aws/requests/compute/create_volume.rb  | 18 +++++++++---------
 lib/fog/aws/requests/compute/create_vpc.rb     |  6 +++---
 .../requests/compute/delete_dhcp_options.rb    |  4 ++--
 .../compute/delete_internet_gateway.rb         |  4 ++--
 .../aws/requests/compute/delete_key_pair.rb    |  2 +-
 .../aws/requests/compute/delete_network_acl.rb |  6 +++---
 .../compute/delete_network_acl_entry.rb        |  6 +++---
 .../compute/delete_network_interface.rb        |  6 +++---
 .../requests/compute/delete_placement_group.rb |  2 +-
 lib/fog/aws/requests/compute/delete_route.rb   |  8 ++++----
 .../aws/requests/compute/delete_route_table.rb |  6 +++---
 .../requests/compute/delete_security_group.rb  | 14 +++++++-------
 .../aws/requests/compute/delete_snapshot.rb    |  4 ++--
 .../delete_spot_datafeed_subscription.rb       |  2 +-
 lib/fog/aws/requests/compute/delete_subnet.rb  |  4 ++--
 lib/fog/aws/requests/compute/delete_tags.rb    |  2 +-
 lib/fog/aws/requests/compute/delete_volume.rb  |  6 +++---
 lib/fog/aws/requests/compute/delete_vpc.rb     |  4 ++--
 .../aws/requests/compute/deregister_image.rb   |  4 ++--
 .../compute/describe_account_attributes.rb     |  2 +-
 .../aws/requests/compute/describe_addresses.rb |  2 +-
 .../compute/describe_availability_zones.rb     |  2 +-
 .../compute/describe_classic_link_instances.rb |  2 +-
 .../requests/compute/describe_dhcp_options.rb  |  2 +-
 .../aws/requests/compute/describe_images.rb    |  2 +-
 .../compute/describe_instance_attribute.rb     |  4 ++--
 .../compute/describe_instance_status.rb        |  2 +-
 .../aws/requests/compute/describe_instances.rb |  4 ++--
 .../compute/describe_internet_gateways.rb      |  2 +-
 .../aws/requests/compute/describe_key_pairs.rb |  2 +-
 .../requests/compute/describe_network_acls.rb  |  2 +-
 .../describe_network_interface_attribute.rb    |  6 +++---
 .../compute/describe_network_interfaces.rb     |  2 +-
 .../compute/describe_placement_groups.rb       |  2 +-
 .../aws/requests/compute/describe_regions.rb   |  2 +-
 .../compute/describe_reserved_instances.rb     |  2 +-
 .../describe_reserved_instances_offerings.rb   |  2 +-
 .../requests/compute/describe_route_tables.rb  |  2 +-
 .../compute/describe_security_groups.rb        |  2 +-
 .../aws/requests/compute/describe_snapshots.rb |  2 +-
 .../describe_spot_datafeed_subscription.rb     |  2 +-
 .../compute/describe_spot_instance_requests.rb |  2 +-
 .../compute/describe_spot_price_history.rb     |  6 +++---
 .../aws/requests/compute/describe_subnets.rb   |  2 +-
 lib/fog/aws/requests/compute/describe_tags.rb  |  2 +-
 .../requests/compute/describe_volume_status.rb |  2 +-
 .../aws/requests/compute/describe_volumes.rb   |  2 +-
 .../compute/describe_volumes_modifications.rb  |  2 +-
 .../requests/compute/describe_vpc_attribute.rb |  6 +++---
 .../compute/describe_vpc_classic_link.rb       |  4 ++--
 .../describe_vpc_classic_link_dns_support.rb   |  2 +-
 lib/fog/aws/requests/compute/describe_vpcs.rb  |  2 +-
 .../compute/detach_classic_link_vpc.rb         |  6 +++---
 .../compute/detach_internet_gateway.rb         |  4 ++--
 .../compute/detach_network_interface.rb        |  4 ++--
 lib/fog/aws/requests/compute/detach_volume.rb  |  6 +++---
 .../compute/disable_vpc_classic_link.rb        |  4 ++--
 .../disable_vpc_classic_link_dns_support.rb    |  4 ++--
 .../requests/compute/disassociate_address.rb   |  6 +++---
 .../compute/disassociate_route_table.rb        |  6 +++---
 .../compute/enable_vpc_classic_link.rb         |  4 ++--
 .../enable_vpc_classic_link_dns_support.rb     |  4 ++--
 .../aws/requests/compute/get_console_output.rb |  4 ++--
 .../aws/requests/compute/get_password_data.rb  |  4 ++--
 .../aws/requests/compute/import_key_pair.rb    |  4 ++--
 .../requests/compute/modify_image_attribute.rb |  4 ++--
 .../compute/modify_instance_attribute.rb       |  2 +-
 .../modify_network_interface_attribute.rb      | 12 ++++++------
 .../compute/modify_snapshot_attribute.rb       |  2 +-
 .../compute/modify_subnet_attribute.rb         |  2 +-
 lib/fog/aws/requests/compute/modify_volume.rb  |  6 +++---
 .../compute/modify_volume_attribute.rb         |  4 ++--
 .../requests/compute/modify_vpc_attribute.rb   | 10 +++++-----
 .../aws/requests/compute/monitor_instances.rb  |  4 ++--
 .../requests/compute/move_address_to_vpc.rb    |  4 ++--
 .../purchase_reserved_instances_offering.rb    |  2 +-
 .../aws/requests/compute/reboot_instances.rb   |  4 ++--
 lib/fog/aws/requests/compute/register_image.rb |  4 ++--
 .../aws/requests/compute/release_address.rb    |  6 +++---
 .../compute/replace_network_acl_association.rb |  6 +++---
 .../compute/replace_network_acl_entry.rb       |  6 +++---
 lib/fog/aws/requests/compute/replace_route.rb  | 16 ++++++++--------
 .../requests/compute/request_spot_instances.rb | 10 +++++-----
 .../reset_network_interface_attribute.rb       |  8 ++++----
 .../compute/restore_address_to_classic.rb      |  6 +++---
 .../compute/revoke_security_group_egress.rb    |  4 ++--
 .../compute/revoke_security_group_ingress.rb   |  4 ++--
 lib/fog/aws/requests/compute/run_instances.rb  |  4 ++--
 .../aws/requests/compute/start_instances.rb    |  4 ++--
 lib/fog/aws/requests/compute/stop_instances.rb |  4 ++--
 .../requests/compute/terminate_instances.rb    |  4 ++--
 .../requests/compute/unmonitor_instances.rb    |  4 ++--
 .../aws/requests/elb/create_load_balancer.rb   | 14 +++++++-------
 .../deregister_instances_from_load_balancer.rb |  2 +-
 .../requests/elb/describe_instance_health.rb   |  2 +-
 lib/fog/aws/requests/elb/describe_tags.rb      |  2 +-
 .../register_instances_with_load_balancer.rb   |  2 +-
 .../rds/authorize_db_security_group_ingress.rb |  2 +-
 lib/fog/aws/requests/rds/create_db_instance.rb |  2 +-
 .../aws/requests/rds/create_db_subnet_group.rb |  4 ++--
 lib/fog/aws/requests/rds/modify_db_instance.rb |  2 +-
 .../rds/revoke_db_security_group_ingress.rb    |  2 +-
 lib/fog/aws/service_mapper.rb                  |  2 +-
 156 files changed, 350 insertions(+), 350 deletions(-)

diff --git a/lib/fog/aws.rb b/lib/fog/aws.rb
index a70da1e647..2837110602 100644
--- a/lib/fog/aws.rb
+++ b/lib/fog/aws.rb
@@ -204,7 +204,7 @@ def self.parse_security_group_options(group_name, options)
         options = group_name
       elsif group_name
         if options.key?('GroupName')
-          raise Fog::Compute::AWS::Error, 'Arguments specified both group_name and GroupName in options'
+          raise Fog::AWS::Compute::Error, 'Arguments specified both group_name and GroupName in options'
         end
         options = options.clone
         options['GroupName'] = group_name
@@ -212,7 +212,7 @@ def self.parse_security_group_options(group_name, options)
       name_specified = options.key?('GroupName') && !options['GroupName'].nil?
       group_id_specified = options.key?('GroupId') && !options['GroupId'].nil?
       unless name_specified || group_id_specified
-        raise Fog::Compute::AWS::Error, 'Neither GroupName nor GroupId specified'
+        raise Fog::AWS::Compute::Error, 'Neither GroupName nor GroupId specified'
       end
       if name_specified && group_id_specified
         options.delete('GroupName')
diff --git a/lib/fog/aws/compute.rb b/lib/fog/aws/compute.rb
index 7d2e3d4f19..f70172c5e8 100644
--- a/lib/fog/aws/compute.rb
+++ b/lib/fog/aws/compute.rb
@@ -634,7 +634,7 @@ def _request(body, headers, idempotent, parser, retries = 0)
             raise if match.empty?
             raise case match[:code]
                 when 'NotFound', 'Unknown'
-                  Fog::Compute::AWS::NotFound.slurp(error, match[:message])
+                  Fog::AWS::Compute::NotFound.slurp(error, match[:message])
                 when 'RequestLimitExceeded'                  
                   if @retry_request_limit_exceeded && retries < max_retries
                     jitter = rand * 10 * @retry_jitter_magnitude
@@ -644,12 +644,12 @@ def _request(body, headers, idempotent, parser, retries = 0)
                     retries += 1
                     retry
                   elsif @retry_request_limit_exceeded
-                    Fog::Compute::AWS::RequestLimitExceeded.slurp(error, "Max retries exceeded (#{max_retries}) #{match[:code]} => #{match[:message]}")
+                    Fog::AWS::Compute::RequestLimitExceeded.slurp(error, "Max retries exceeded (#{max_retries}) #{match[:code]} => #{match[:message]}")
                   else
-                    Fog::Compute::AWS::RequestLimitExceeded.slurp(error, "#{match[:code]} => #{match[:message]}")
+                    Fog::AWS::Compute::RequestLimitExceeded.slurp(error, "#{match[:code]} => #{match[:message]}")
                   end
                 else
-                  Fog::Compute::AWS::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
+                  Fog::AWS::Compute::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
                 end
           end
         end
diff --git a/lib/fog/aws/credential_fetcher.rb b/lib/fog/aws/credential_fetcher.rb
index c355ce3712..e44ee508ff 100644
--- a/lib/fog/aws/credential_fetcher.rb
+++ b/lib/fog/aws/credential_fetcher.rb
@@ -11,7 +11,7 @@ module CredentialFetcher
       module ServiceMethods
         def fetch_credentials(options)
           if options[:use_iam_profile] && Fog.mocking?
-            return Fog::Compute::AWS::Mock.data[:iam_role_based_creds]
+            return Fog::AWS::Compute::Mock.data[:iam_role_based_creds]
           end
           if options[:use_iam_profile]
             begin
diff --git a/lib/fog/aws/efs.rb b/lib/fog/aws/efs.rb
index 2e33632ed1..f5f02033da 100644
--- a/lib/fog/aws/efs.rb
+++ b/lib/fog/aws/efs.rb
@@ -64,7 +64,7 @@ def initialize(options={})
         end
 
         def mock_compute
-          @mock_compute ||= Fog::Compute::AWS.new(:aws_access_key_id => @aws_access_key_id, :aws_secret_access_key => @aws_secret_access_key, :region => @region)
+          @mock_compute ||= Fog::AWS::Compute.new(:aws_access_key_id => @aws_access_key_id, :aws_secret_access_key => @aws_secret_access_key, :region => @region)
         end
       end
 
diff --git a/lib/fog/aws/models/compute/addresses.rb b/lib/fog/aws/models/compute/addresses.rb
index a027da92ff..8d1056fa66 100644
--- a/lib/fog/aws/models/compute/addresses.rb
+++ b/lib/fog/aws/models/compute/addresses.rb
@@ -7,7 +7,7 @@ class Addresses < Fog::Collection
         attribute :filters
         attribute :server
 
-        model Fog::Compute::AWS::Address
+        model Fog::AWS::Compute::Address
 
         # Used to create an IP address
         #
diff --git a/lib/fog/aws/models/compute/dhcp_options.rb b/lib/fog/aws/models/compute/dhcp_options.rb
index d7a69508b2..6ba7042391 100644
--- a/lib/fog/aws/models/compute/dhcp_options.rb
+++ b/lib/fog/aws/models/compute/dhcp_options.rb
@@ -6,7 +6,7 @@ class Compute
       class DhcpOptions < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::DhcpOption
+        model Fog::AWS::Compute::DhcpOption
 
         # Creates a new dhcp option
         #
@@ -17,7 +17,7 @@ class DhcpOptions < Fog::Collection
         # Returns the details of the new DHCP options
         #
         #>> AWS.dhcp_options.new
-        #=>   <Fog::Compute::AWS::DhcpOption
+        #=>   <Fog::AWS::Compute::DhcpOption
         #id=nil,
         #dhcp_configuration_set=nil,
         #tag_set=nil
@@ -38,10 +38,10 @@ def initialize(attributes)
         # Returns an array of all DhcpOptions
         #
         #>> AWS.dhcp_options.all
-        #<Fog::Compute::AWS::DhcpOptions
+        #<Fog::AWS::Compute::DhcpOptions
         #filters={}
         #[
-        #<Fog::Compute::AWS::DhcpOption
+        #<Fog::AWS::Compute::DhcpOption
         #id="dopt-some-id",
         #dhcp_configuration_set={"vpcId"=>"vpc-some-id", "state"=>"available"},
         #tag_set={}
@@ -68,7 +68,7 @@ def all(filters_arg = filters)
         # ==== Returns
         #
         #>> AWS.dhcp_options.get("dopt-12345678")
-        #=>   <Fog::Compute::AWS::DhcpOption
+        #=>   <Fog::AWS::Compute::DhcpOption
         #id="dopt-12345678",
         #dhcp_configuration_set={"vpcId"=>"vpc-12345678", "state"=>"available"},
         #tag_set={}
diff --git a/lib/fog/aws/models/compute/flavors.rb b/lib/fog/aws/models/compute/flavors.rb
index eea1d11690..7ad77f2ef1 100644
--- a/lib/fog/aws/models/compute/flavors.rb
+++ b/lib/fog/aws/models/compute/flavors.rb
@@ -907,7 +907,7 @@ class Compute
       ]
 
       class Flavors < Fog::Collection
-        model Fog::Compute::AWS::Flavor
+        model Fog::AWS::Compute::Flavor
 
         # Returns an array of all flavors that have been created
         #
@@ -1031,7 +1031,7 @@ class Flavors < Fog::Collection
         #        ebs_optimized_available=false,
         #        instance_store_volumes=0
         #      >,
-        #      <Fog::Compute::AWS::Flavor
+        #      <Fog::AWS::Compute::Flavor
         #        id="m3.xlarge",
         #        bits=64,
         #        cores=13,
@@ -1041,7 +1041,7 @@ class Flavors < Fog::Collection
         #        ebs_optimized_available=true,
         #        instance_store_volumes=2
         #      >,
-        #      <Fog::Compute::AWS::Flavor
+        #      <Fog::AWS::Compute::Flavor
         #        id="m3.2xlarge",
         #        bits=64,
         #        cores=26,
@@ -1076,7 +1076,7 @@ class Flavors < Fog::Collection
         #
 
         def all
-          load(Fog::Compute::AWS::FLAVORS)
+          load(Fog::AWS::Compute::FLAVORS)
           self
         end
 
diff --git a/lib/fog/aws/models/compute/images.rb b/lib/fog/aws/models/compute/images.rb
index 66466dc0df..bf833097c1 100644
--- a/lib/fog/aws/models/compute/images.rb
+++ b/lib/fog/aws/models/compute/images.rb
@@ -6,7 +6,7 @@ class Compute
       class Images < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::Image
+        model Fog::AWS::Compute::Image
 
         # Creates a new Amazon machine image
         #
diff --git a/lib/fog/aws/models/compute/internet_gateways.rb b/lib/fog/aws/models/compute/internet_gateways.rb
index 9949350977..90a318857d 100644
--- a/lib/fog/aws/models/compute/internet_gateways.rb
+++ b/lib/fog/aws/models/compute/internet_gateways.rb
@@ -6,7 +6,7 @@ class Compute
       class InternetGateways < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::InternetGateway
+        model Fog::AWS::Compute::InternetGateway
 
         # Creates a new internet gateway
         #
@@ -17,7 +17,7 @@ class InternetGateways < Fog::Collection
         # Returns the details of the new InternetGateway
         #
         #>> AWS.internet_gateways.new
-        #=>   <Fog::Compute::AWS::InternetGateway
+        #=>   <Fog::AWS::Compute::InternetGateway
         #id=nil,
         #attachment_set=nil,
         #tag_set=nil
@@ -38,10 +38,10 @@ def initialize(attributes)
         # Returns an array of all InternetGateways
         #
         #>> AWS.internet_gateways.all
-        #<Fog::Compute::AWS::InternetGateways
+        #<Fog::AWS::Compute::InternetGateways
         #filters={}
         #[
-        #<Fog::Compute::AWS::InternetGateway
+        #<Fog::AWS::Compute::InternetGateway
         #id="igw-some-id",
         #attachment_set={"vpcId"=>"vpc-some-id", "state"=>"available"},
         #tag_set={}
@@ -68,7 +68,7 @@ def all(filters_arg = filters)
         # ==== Returns
         #
         #>> AWS.internet_gateways.get("igw-12345678")
-        #=>   <Fog::Compute::AWS::InternetGateway
+        #=>   <Fog::AWS::Compute::InternetGateway
         #id="igw-12345678",
         #attachment_set={"vpcId"=>"vpc-12345678", "state"=>"available"},
         #tag_set={}
diff --git a/lib/fog/aws/models/compute/key_pairs.rb b/lib/fog/aws/models/compute/key_pairs.rb
index eb2d44c811..a000149deb 100644
--- a/lib/fog/aws/models/compute/key_pairs.rb
+++ b/lib/fog/aws/models/compute/key_pairs.rb
@@ -7,7 +7,7 @@ class KeyPairs < Fog::Collection
         attribute :filters
         attribute :key_name
 
-        model Fog::Compute::AWS::KeyPair
+        model Fog::AWS::Compute::KeyPair
 
         # Used to create a key pair.  There are 3 arguments and only name is required.  You can generate a new key_pair as follows:
         # AWS.key_pairs.create(:name => "test", :fingerprint => "123", :private_key => '234234')
diff --git a/lib/fog/aws/models/compute/network_acl.rb b/lib/fog/aws/models/compute/network_acl.rb
index 0401b16796..67f9a79226 100644
--- a/lib/fog/aws/models/compute/network_acl.rb
+++ b/lib/fog/aws/models/compute/network_acl.rb
@@ -25,7 +25,7 @@ def add_outbound_rule(rule_number, protocol, rule_action, cidr_block, options =
 
         # Add a new rule
         #
-        # network_acl.add_rule(100, Fog::Compute::AWS::NetworkAcl::TCP, 'allow', '0.0.0.0/0', true, 'PortRange.From' => 22, 'PortRange.To' => 22)
+        # network_acl.add_rule(100, Fog::AWS::Compute::NetworkAcl::TCP, 'allow', '0.0.0.0/0', true, 'PortRange.From' => 22, 'PortRange.To' => 22)
         #
         # ==== Parameters
         # * rule_number<~Integer>   - The rule number for the entry, between 100 and 32766
@@ -91,7 +91,7 @@ def update_outbound_rule(rule_number, protocol, rule_action, cidr_block, options
 
         # Update a specific rule number
         #
-        # network_acl.update_rule(100, Fog::Compute::AWS::NetworkAcl::TCP, 'allow', '0.0.0.0/0', true, 'PortRange.From' => 22, 'PortRange.To' => 22)
+        # network_acl.update_rule(100, Fog::AWS::Compute::NetworkAcl::TCP, 'allow', '0.0.0.0/0', true, 'PortRange.From' => 22, 'PortRange.To' => 22)
         #
         # ==== Parameters
         # * rule_number<~Integer>   - The rule number for the entry, between 100 and 32766
diff --git a/lib/fog/aws/models/compute/network_acls.rb b/lib/fog/aws/models/compute/network_acls.rb
index 9150ef3b37..aa14c04e66 100644
--- a/lib/fog/aws/models/compute/network_acls.rb
+++ b/lib/fog/aws/models/compute/network_acls.rb
@@ -6,7 +6,7 @@ class Compute
       class NetworkAcls < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::NetworkAcl
+        model Fog::AWS::Compute::NetworkAcl
 
         # Creates a new network ACL
         #
@@ -16,7 +16,7 @@ class NetworkAcls < Fog::Collection
         #
         # Returns the details of the new network ACL
         #
-        #>> <Fog::Compute::AWS::NetworkAcl
+        #>> <Fog::AWS::Compute::NetworkAcl
         #     network_acl_id=nil,
         #     vpc_id=nil,
         #     default=nil,
@@ -42,7 +42,7 @@ def initialize(attributes)
         #  <Fog::AWS::Compute::NetworkAcls
         #    filters={}
         #    [
-        #      <Fog::Compute::AWS::NetworkAcl
+        #      <Fog::AWS::Compute::NetworkAcl
         #        network_acl_id="acl-abcdefgh",
         #        vpc_id="vpc-abcdefgh",
         #        default=true,
@@ -93,7 +93,7 @@ def all(filters_arg = filters)
         # ==== Returns
         #
         #>> AWS.network_acls.get("acl-abcdefgh")
-        #  <Fog::Compute::AWS::NetworkAcl
+        #  <Fog::AWS::Compute::NetworkAcl
         #    network_acl_id="acl-abcdefgh",
         #    vpc_id="vpc-abcdefgh",
         #    default=true,
diff --git a/lib/fog/aws/models/compute/network_interfaces.rb b/lib/fog/aws/models/compute/network_interfaces.rb
index 42effe7de6..f6b68660b0 100644
--- a/lib/fog/aws/models/compute/network_interfaces.rb
+++ b/lib/fog/aws/models/compute/network_interfaces.rb
@@ -6,7 +6,7 @@ class Compute
       class NetworkInterfaces < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::NetworkInterface
+        model Fog::AWS::Compute::NetworkInterface
 
         # Creates a new network interface
         #
@@ -58,7 +58,7 @@ def initialize(attributes)
         #  <Fog::AWS::Compute::NetworkInterfaces
         #    filters={}
         #    [
-        #      <Fog::Compute::AWS::NetworkInterface
+        #      <Fog::AWS::Compute::NetworkInterface
         #        network_interface_id="eni-da5dc7ca",
         #        state=nil,
         #        request_id=nil,
diff --git a/lib/fog/aws/models/compute/route_tables.rb b/lib/fog/aws/models/compute/route_tables.rb
index 5ec748940f..043d768e15 100644
--- a/lib/fog/aws/models/compute/route_tables.rb
+++ b/lib/fog/aws/models/compute/route_tables.rb
@@ -6,7 +6,7 @@ class Compute
       class RouteTables < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::RouteTable
+        model Fog::AWS::Compute::RouteTable
 
         # Creates a new route table
         #
@@ -17,7 +17,7 @@ class RouteTables < Fog::Collection
         # Returns the details of the new route table
         #
         #>> AWS.route_tables.new
-        # <Fog::Compute::AWS::RouteTable
+        # <Fog::AWS::Compute::RouteTable
         # id=nil,
         # vpc_id=nil,
         # routes=nil,
@@ -40,10 +40,10 @@ def initialize(attributes)
         # Returns an array of all route tables
         #
         #>> AWS.route_tables.all
-        # <Fog::Compute::AWS::RouteTables
+        # <Fog::AWS::Compute::RouteTables
         # filters={}
         # [
-        # <Fog::Compute::AWS::RouteTable
+        # <Fog::AWS::Compute::RouteTable
         # id="rtb-41e8552f",
         # TODO
         # >
@@ -70,7 +70,7 @@ def all(filters_arg = filters)
         # ==== Returns
         #
         #>> AWS.route_tables.get("rtb-41e8552f")
-        # <Fog::Compute::AWS::RouteTable
+        # <Fog::AWS::Compute::RouteTable
         # id="rtb-41e8552f",
         # TODO
         # >
diff --git a/lib/fog/aws/models/compute/security_groups.rb b/lib/fog/aws/models/compute/security_groups.rb
index 7d83023b6d..aa9d3929f3 100644
--- a/lib/fog/aws/models/compute/security_groups.rb
+++ b/lib/fog/aws/models/compute/security_groups.rb
@@ -6,7 +6,7 @@ class Compute
       class SecurityGroups < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::SecurityGroup
+        model Fog::AWS::Compute::SecurityGroup
 
         # Creates a new security group
         #
diff --git a/lib/fog/aws/models/compute/servers.rb b/lib/fog/aws/models/compute/servers.rb
index 7103a552d1..116eb5f817 100644
--- a/lib/fog/aws/models/compute/servers.rb
+++ b/lib/fog/aws/models/compute/servers.rb
@@ -6,7 +6,7 @@ class Compute
       class Servers < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::Server
+        model Fog::AWS::Compute::Server
 
         # Creates a new server
         #
@@ -166,7 +166,7 @@ def save_many(template, min_servers = 1, max_servers = nil)
               Fog.wait_for {
                 begin
                   service.create_tags(server.identity, tags)
-                rescue Fog::Compute::AWS::NotFound
+                rescue Fog::AWS::Compute::NotFound
                   false
                 end
               }
@@ -191,7 +191,7 @@ def _setup_bootstrap(server)
 
           security_group = service.security_groups.get(server.groups.first)
           if security_group.nil?
-            raise Fog::Compute::AWS::Error, "The security group" \
+            raise Fog::AWS::Compute::Error, "The security group" \
               " #{server.groups.first} doesn't exist."
           end
 
diff --git a/lib/fog/aws/models/compute/snapshots.rb b/lib/fog/aws/models/compute/snapshots.rb
index 5920ad5a4f..49da3a7306 100644
--- a/lib/fog/aws/models/compute/snapshots.rb
+++ b/lib/fog/aws/models/compute/snapshots.rb
@@ -7,7 +7,7 @@ class Snapshots < Fog::Collection
         attribute :filters
         attribute :volume
 
-        model Fog::Compute::AWS::Snapshot
+        model Fog::AWS::Compute::Snapshot
 
         def initialize(attributes)
           self.filters ||= { 'RestorableBy' => 'self' }
diff --git a/lib/fog/aws/models/compute/spot_requests.rb b/lib/fog/aws/models/compute/spot_requests.rb
index 91c97fc2ae..c47b707798 100644
--- a/lib/fog/aws/models/compute/spot_requests.rb
+++ b/lib/fog/aws/models/compute/spot_requests.rb
@@ -6,7 +6,7 @@ class Compute
       class SpotRequests < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::SpotRequest
+        model Fog::AWS::Compute::SpotRequest
 
         def initialize(attributes)
           self.filters ||= {}
diff --git a/lib/fog/aws/models/compute/subnets.rb b/lib/fog/aws/models/compute/subnets.rb
index 1c16f653c8..415f6cdbc7 100644
--- a/lib/fog/aws/models/compute/subnets.rb
+++ b/lib/fog/aws/models/compute/subnets.rb
@@ -6,7 +6,7 @@ class Compute
       class Subnets < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::Subnet
+        model Fog::AWS::Compute::Subnet
 
         # Creates a new subnet
         #
diff --git a/lib/fog/aws/models/compute/tags.rb b/lib/fog/aws/models/compute/tags.rb
index 4400153a2d..8e979a1179 100644
--- a/lib/fog/aws/models/compute/tags.rb
+++ b/lib/fog/aws/models/compute/tags.rb
@@ -6,7 +6,7 @@ class Compute
       class Tags < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::Tag
+        model Fog::AWS::Compute::Tag
 
         def initialize(attributes)
           self.filters ||= {}
diff --git a/lib/fog/aws/models/compute/volume.rb b/lib/fog/aws/models/compute/volume.rb
index c3704ed84b..d595b18185 100644
--- a/lib/fog/aws/models/compute/volume.rb
+++ b/lib/fog/aws/models/compute/volume.rb
@@ -118,7 +118,7 @@ def detach(force = false)
         end
 
         def server=(_)
-          raise NoMethodError, 'use Fog::Compute::AWS::Volume#attach(server, device)'
+          raise NoMethodError, 'use Fog::AWS::Compute::Volume#attach(server, device)'
         end
 
         private
diff --git a/lib/fog/aws/models/compute/volumes.rb b/lib/fog/aws/models/compute/volumes.rb
index d60a322248..96bb34c0de 100644
--- a/lib/fog/aws/models/compute/volumes.rb
+++ b/lib/fog/aws/models/compute/volumes.rb
@@ -7,7 +7,7 @@ class Volumes < Fog::Collection
         attribute :filters
         attribute :server
 
-        model Fog::Compute::AWS::Volume
+        model Fog::AWS::Compute::Volume
 
         # Used to create a volume.  There are 3 arguments and availability_zone and size are required.  You can generate a new key_pair as follows:
         # AWS.volumes.create(:availability_zone => 'us-east-1a', :size => 10)
diff --git a/lib/fog/aws/models/compute/vpcs.rb b/lib/fog/aws/models/compute/vpcs.rb
index ff667a2fa7..d92ae27e9e 100644
--- a/lib/fog/aws/models/compute/vpcs.rb
+++ b/lib/fog/aws/models/compute/vpcs.rb
@@ -6,7 +6,7 @@ class Compute
       class Vpcs < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::VPC
+        model Fog::AWS::Compute::VPC
 
         # Creates a new VPC
         #
diff --git a/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb b/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb
index f159790064..1cdd069656 100644
--- a/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb
+++ b/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb
@@ -61,13 +61,13 @@ def put_metric_alarm(options)
           supported_actions = [ "InsufficientDataActions", "OKActions", "AlarmActions" ]
           found_actions = options.keys.select {|key| supported_actions.include? key }
           if found_actions.empty?
-            raise Fog::Compute::AWS::Error.new("The request must contain at least one of #{supported_actions.join(", ")}'")
+            raise Fog::AWS::Compute::Error.new("The request must contain at least one of #{supported_actions.join(", ")}'")
           end
 
           requirements = [ "AlarmName", "ComparisonOperator", "EvaluationPeriods", "Namespace", "Period", "Statistic", "Threshold" ]
           requirements.each do |req|
             unless options.key?(req)
-              raise Fog::Compute::AWS::Error.new("The request must contain a the parameter '%s'" % req)
+              raise Fog::AWS::Compute::Error.new("The request must contain a the parameter '%s'" % req)
             end
           end
 
diff --git a/lib/fog/aws/requests/compute/allocate_address.rb b/lib/fog/aws/requests/compute/allocate_address.rb
index 70eb643742..6a5c5f6f91 100644
--- a/lib/fog/aws/requests/compute/allocate_address.rb
+++ b/lib/fog/aws/requests/compute/allocate_address.rb
@@ -20,7 +20,7 @@ def allocate_address(domain='standard')
           request(
             'Action'  => 'AllocateAddress',
             'Domain'  => domain,
-            :parser   => Fog::Parsers::Compute::AWS::AllocateAddress.new
+            :parser   => Fog::Parsers::AWS::Compute::AllocateAddress.new
           )
         end
       end
@@ -28,7 +28,7 @@ def allocate_address(domain='standard')
       class Mock
         def allocate_address(domain = 'standard')
           unless describe_addresses.body['addressesSet'].size < self.data[:limits][:addresses]
-            raise Fog::Compute::AWS::Error, "AddressLimitExceeded => Too many addresses allocated"
+            raise Fog::AWS::Compute::Error, "AddressLimitExceeded => Too many addresses allocated"
           end
 
           response = Excon::Response.new
diff --git a/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb b/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb
index a1dde0e13e..f440c93f0b 100644
--- a/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb
+++ b/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb
@@ -20,7 +20,7 @@ class Real
         # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-AssignPrivateIpAddresses.html]
         def assign_private_ip_addresses(network_interface_id, options={})
           if options['PrivateIpAddresses'] && options['SecondaryPrivateIpAddressCount']
-            raise Fog::Compute::AWS::Error.new("You may specify secondaryPrivateIpAddressCount or specific secondary private IP addresses, but not both.")
+            raise Fog::AWS::Compute::Error.new("You may specify secondaryPrivateIpAddressCount or specific secondary private IP addresses, but not both.")
           end
 
           if private_ip_addresses = options.delete('PrivateIpAddresses')
@@ -30,7 +30,7 @@ def assign_private_ip_addresses(network_interface_id, options={})
           request({
             'Action'  => 'AssignPrivateIpAddresses',
             'NetworkInterfaceId' => network_interface_id,
-            :parser   => Fog::Parsers::Compute::AWS::AssignPrivateIpAddresses.new
+            :parser   => Fog::Parsers::AWS::Compute::AssignPrivateIpAddresses.new
           }.merge(options))
         end
       end
@@ -38,7 +38,7 @@ def assign_private_ip_addresses(network_interface_id, options={})
       class Mock
         def assign_private_ip_addresses(network_interface_id, options={})
           if options['PrivateIpAddresses'] && options['SecondaryPrivateIpAddressCount']
-            raise Fog::Compute::AWS::Error.new("You may specify secondaryPrivateIpAddressCount or specific secondary private IP addresses, but not both.")
+            raise Fog::AWS::Compute::Error.new("You may specify secondaryPrivateIpAddressCount or specific secondary private IP addresses, but not both.")
           end
 
           response = Excon::Response.new
diff --git a/lib/fog/aws/requests/compute/associate_address.rb b/lib/fog/aws/requests/compute/associate_address.rb
index 73cbb809d4..e5abe7fbd2 100644
--- a/lib/fog/aws/requests/compute/associate_address.rb
+++ b/lib/fog/aws/requests/compute/associate_address.rb
@@ -48,7 +48,7 @@ def associate_address(*args)
             'PrivateIpAddress'   => params[:private_ip_address],
             'AllowReassociation' => params[:allow_reassociation],
             :idempotent          => true,
-            :parser              => Fog::Parsers::Compute::AWS::AssociateAddress.new
+            :parser              => Fog::Parsers::AWS::Compute::AssociateAddress.new
           )
         end
       end
@@ -119,13 +119,13 @@ def associate_address(*args)
             end
             response
           elsif !instance
-            raise Fog::Compute::AWS::NotFound.new("You must specify either an InstanceId or a NetworkInterfaceID")
+            raise Fog::AWS::Compute::NotFound.new("You must specify either an InstanceId or a NetworkInterfaceID")
           elsif !address
-            raise Fog::Compute::AWS::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
+            raise Fog::AWS::Compute::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
           elsif params[:network_interface_id].nil? && params[:allocation_id].nil?
-            raise Fog::Compute::AWS::NotFound.new("You must specify an AllocationId when specifying a NetworkInterfaceID")
+            raise Fog::AWS::Compute::NotFound.new("You must specify an AllocationId when specifying a NetworkInterfaceID")
           else (!instance.nil? && params[:network_interface_id].nil?) || (params[:instance_id].nil? && !params[:network_interface_id].nil?)
-            raise Fog::Compute::AWS::Error.new("You must specify either an InstanceId or a NetworkInterfaceID")
+            raise Fog::AWS::Compute::Error.new("You must specify either an InstanceId or a NetworkInterfaceID")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/associate_dhcp_options.rb b/lib/fog/aws/requests/compute/associate_dhcp_options.rb
index f49bbecbf3..f29d3e634c 100644
--- a/lib/fog/aws/requests/compute/associate_dhcp_options.rb
+++ b/lib/fog/aws/requests/compute/associate_dhcp_options.rb
@@ -23,7 +23,7 @@ def associate_dhcp_options(dhcp_options_id, vpc_id)
             'DhcpOptionsId'        => dhcp_options_id,
             'VpcId'                => vpc_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::Compute::AWS::Basic.new
+            :parser       => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -44,7 +44,7 @@ def associate_dhcp_options(dhcp_options_id, vpc_id)
             elsif !vpc_id
               message << 'The request must contain the parameter vpc_id'
             end
-            raise Fog::Compute::AWS::Error.new(message)
+            raise Fog::AWS::Compute::Error.new(message)
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/associate_route_table.rb b/lib/fog/aws/requests/compute/associate_route_table.rb
index 704415db93..3aca001bf6 100644
--- a/lib/fog/aws/requests/compute/associate_route_table.rb
+++ b/lib/fog/aws/requests/compute/associate_route_table.rb
@@ -21,7 +21,7 @@ def associate_route_table(routeTableId, subnetId)
             'Action'       => 'AssociateRouteTable',
             'RouteTableId' => routeTableId,
             'SubnetId'     => subnetId,
-            :parser        => Fog::Parsers::Compute::AWS::AssociateRouteTable.new
+            :parser        => Fog::Parsers::AWS::Compute::AssociateRouteTable.new
           )
         end
       end
@@ -42,9 +42,9 @@ def associate_route_table(routeTableId, subnetId)
             }
             response
           elsif routetable.nil?
-            raise Fog::Compute::AWS::NotFound.new("The routeTable ID '#{routeTableId}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The routeTable ID '#{routeTableId}' does not exist")
           else
-            raise Fog::Compute::AWS::NotFound.new("The subnet ID '#{subnetId}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The subnet ID '#{subnetId}' does not exist")
           end
         end
 
diff --git a/lib/fog/aws/requests/compute/attach_classic_link_vpc.rb b/lib/fog/aws/requests/compute/attach_classic_link_vpc.rb
index e634c9df65..106c32024a 100644
--- a/lib/fog/aws/requests/compute/attach_classic_link_vpc.rb
+++ b/lib/fog/aws/requests/compute/attach_classic_link_vpc.rb
@@ -24,7 +24,7 @@ def attach_classic_link_vpc(instance_id, vpc_id, security_group_ids, dry_run=fal
             'VpcId'     => vpc_id,
             'InstanceId'=> instance_id,
             'DryRun'    => dry_run,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           }.merge(Fog::AWS.indexed_param('SecurityGroupId', security_group_ids)))
 
         end
@@ -38,10 +38,10 @@ def attach_classic_link_vpc(instance_id, vpc_id, security_group_ids, dry_run=fal
           instance = self.data[:instances][instance_id]
           if vpc && instance
             if instance['instanceState']['name'] != 'running' || instance['vpcId']
-              raise Fog::Compute::AWS::Error.new("Client.InvalidInstanceID.NotLinkable => Instance #{instance_id} is unlinkable")
+              raise Fog::AWS::Compute::Error.new("Client.InvalidInstanceID.NotLinkable => Instance #{instance_id} is unlinkable")
             end
             if instance['classicLinkVpcId']
-              raise Fog::Compute::AWS::Error.new("Client.InvalidInstanceID.InstanceAlreadyLinked => Instance #{instance_id} is already linked")
+              raise Fog::AWS::Compute::Error.new("Client.InvalidInstanceID.InstanceAlreadyLinked => Instance #{instance_id} is already linked")
             end
 
             response.status = 200
@@ -55,9 +55,9 @@ def attach_classic_link_vpc(instance_id, vpc_id, security_group_ids, dry_run=fal
             end
             response
           elsif !instance
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist.")
           elsif !vpc
-            raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist.")
           end
 
         end
diff --git a/lib/fog/aws/requests/compute/attach_internet_gateway.rb b/lib/fog/aws/requests/compute/attach_internet_gateway.rb
index c2d3f4ccd2..e1829cf2a4 100644
--- a/lib/fog/aws/requests/compute/attach_internet_gateway.rb
+++ b/lib/fog/aws/requests/compute/attach_internet_gateway.rb
@@ -22,7 +22,7 @@ def attach_internet_gateway(internet_gateway_id, vpc_id)
             'InternetGatewayId'    => internet_gateway_id,
             'VpcId'                => vpc_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::Compute::AWS::Basic.new
+            :parser       => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -43,7 +43,7 @@ def attach_internet_gateway(internet_gateway_id, vpc_id)
             elsif !vpc_id
               message << 'The request must contain the parameter vpc_id'
             end
-            raise Fog::Compute::AWS::Error.new(message)
+            raise Fog::AWS::Compute::Error.new(message)
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/attach_network_interface.rb b/lib/fog/aws/requests/compute/attach_network_interface.rb
index 83c4fab5b0..48a35fd2bf 100644
--- a/lib/fog/aws/requests/compute/attach_network_interface.rb
+++ b/lib/fog/aws/requests/compute/attach_network_interface.rb
@@ -24,7 +24,7 @@ def attach_network_interface(nic_id, instance_id, device_index)
             'NetworkInterfaceId' => nic_id,
             'InstanceId'         => instance_id,
             'DeviceIndex'        => device_index,
-            :parser => Fog::Parsers::Compute::AWS::AttachNetworkInterface.new
+            :parser => Fog::Parsers::AWS::Compute::AttachNetworkInterface.new
           )
         end
       end
@@ -35,9 +35,9 @@ def attach_network_interface(nic_id, instance_id, device_index)
           if ! self.data[:instances].find{ |i,i_conf|
             i_conf['instanceId'] == instance_id
           }
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist")
           elsif self.data[:network_interfaces].find{ |ni,ni_conf| ni_conf['attachment']['instanceId'] == instance_id && ni_conf['attachment']['deviceIndex'] == device_index }
-            raise Fog::Compute::AWS::Error.new("InvalidParameterValue => Instance '#{instance_id}' already has an interface attached at device index '#{device_index}'.")
+            raise Fog::AWS::Compute::Error.new("InvalidParameterValue => Instance '#{instance_id}' already has an interface attached at device index '#{device_index}'.")
           elsif self.data[:network_interfaces][nic_id]
             attachment = self.data[:network_interfaces][nic_id]['attachment']
             attachment['attachmentId'] = Fog::AWS::Mock.request_id
@@ -50,7 +50,7 @@ def attach_network_interface(nic_id, instance_id, device_index)
               'attachmentId' => attachment['attachmentId']
             }
           else
-            raise Fog::Compute::AWS::NotFound.new("The network interface '#{nic_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network interface '#{nic_id}' does not exist")
           end
 
           response
diff --git a/lib/fog/aws/requests/compute/attach_volume.rb b/lib/fog/aws/requests/compute/attach_volume.rb
index 58f2ad9749..3d83ccb58d 100644
--- a/lib/fog/aws/requests/compute/attach_volume.rb
+++ b/lib/fog/aws/requests/compute/attach_volume.rb
@@ -29,7 +29,7 @@ def attach_volume(instance_id, volume_id, device)
             'InstanceId'  => instance_id,
             'Device'      => device,
             :idempotent   => true,
-            :parser       => Fog::Parsers::Compute::AWS::AttachVolume.new
+            :parser       => Fog::Parsers::AWS::Compute::AttachVolume.new
           )
         end
       end
@@ -43,7 +43,7 @@ def attach_volume(instance_id, volume_id, device)
             volume = self.data[:volumes][volume_id]
             if instance && volume
               unless volume['status'] == 'available'
-                raise Fog::Compute::AWS::Error.new("Client.VolumeInUse => Volume #{volume_id} is unavailable")
+                raise Fog::AWS::Compute::Error.new("Client.VolumeInUse => Volume #{volume_id} is unavailable")
               end
 
               data = {
@@ -61,9 +61,9 @@ def attach_volume(instance_id, volume_id, device)
               }.merge!(data)
               response
             elsif !instance
-              raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist.")
+              raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist.")
             elsif !volume
-              raise Fog::Compute::AWS::NotFound.new("The volume '#{volume_id}' does not exist.")
+              raise Fog::AWS::Compute::NotFound.new("The volume '#{volume_id}' does not exist.")
             end
           else
             message = 'MissingParameter => '
@@ -74,7 +74,7 @@ def attach_volume(instance_id, volume_id, device)
             else
               message << 'The request must contain the parameter device'
             end
-            raise Fog::Compute::AWS::Error.new(message)
+            raise Fog::AWS::Compute::Error.new(message)
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/authorize_security_group_egress.rb b/lib/fog/aws/requests/compute/authorize_security_group_egress.rb
index b9b662b1b2..3e97926a93 100644
--- a/lib/fog/aws/requests/compute/authorize_security_group_egress.rb
+++ b/lib/fog/aws/requests/compute/authorize_security_group_egress.rb
@@ -49,7 +49,7 @@ def authorize_security_group_egress(group_name, options = {})
           request({
             'Action'    => 'AuthorizeSecurityGroupEgress',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(options))
         end
       end
@@ -66,7 +66,7 @@ def authorize_security_group_egress(group_name, options = {})
 
           response = Excon::Response.new
           group ||
-            raise(Fog::Compute::AWS::NotFound.new("The security group '#{group_name}' does not exist"))
+            raise(Fog::AWS::Compute::NotFound.new("The security group '#{group_name}' does not exist"))
 
           verify_permission_options(options, group['vpcId'] != nil)
 
@@ -75,11 +75,11 @@ def authorize_security_group_egress(group_name, options = {})
           normalized_permissions.each do |permission|
             if matching_group_permission = find_matching_permission_egress(group, permission)
               if permission['groups'].any? {|pg| matching_group_permission['groups'].include?(pg) }
-                raise Fog::Compute::AWS::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
+                raise Fog::AWS::Compute::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
               end
 
               if permission['ipRanges'].any? {|pr| matching_group_permission['ipRanges'].include?(pr) }
-                raise Fog::Compute::AWS::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
+                raise Fog::AWS::Compute::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
               end
             end
           end
diff --git a/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb b/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb
index 7c37c9f9cf..fc171359f1 100644
--- a/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb
+++ b/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb
@@ -49,7 +49,7 @@ def authorize_security_group_ingress(group_name, options = {})
           request({
             'Action'    => 'AuthorizeSecurityGroupIngress',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(options))
         end
 
@@ -89,7 +89,7 @@ def authorize_security_group_ingress(group_name, options = {})
 
           response = Excon::Response.new
           group ||
-            raise(Fog::Compute::AWS::NotFound.new("The security group '#{group_name}' does not exist"))
+            raise(Fog::AWS::Compute::NotFound.new("The security group '#{group_name}' does not exist"))
 
           verify_permission_options(options, group['vpcId'] != nil)
 
@@ -98,11 +98,11 @@ def authorize_security_group_ingress(group_name, options = {})
           normalized_permissions.each do |permission|
             if matching_group_permission = find_matching_permission(group, permission)
               if permission['groups'].any? {|pg| matching_group_permission['groups'].include?(pg) }
-                raise Fog::Compute::AWS::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
+                raise Fog::AWS::Compute::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
               end
 
               if permission['ipRanges'].any? {|pr| matching_group_permission['ipRanges'].include?(pr) }
-                raise Fog::Compute::AWS::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
+                raise Fog::AWS::Compute::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
               end
             end
           end
@@ -128,17 +128,17 @@ def authorize_security_group_ingress(group_name, options = {})
 
         def verify_permission_options(options, is_vpc)
           if options.size <= 1
-            raise Fog::Compute::AWS::Error.new("InvalidRequest => The request received was invalid.")
+            raise Fog::AWS::Compute::Error.new("InvalidRequest => The request received was invalid.")
           end
           if !is_vpc && options['IpProtocol'] && !['tcp', 'udp', 'icmp'].include?(options['IpProtocol'])
-            raise Fog::Compute::AWS::Error.new("InvalidPermission.Malformed => Unsupported IP protocol \"#{options['IpProtocol']}\"  - supported: [tcp, udp, icmp]")
+            raise Fog::AWS::Compute::Error.new("InvalidPermission.Malformed => Unsupported IP protocol \"#{options['IpProtocol']}\"  - supported: [tcp, udp, icmp]")
           end
           if !is_vpc && (options['IpProtocol'] && (!options['FromPort'] || !options['ToPort']))
-            raise Fog::Compute::AWS::Error.new("InvalidPermission.Malformed => TCP/UDP port (-1) out of range")
+            raise Fog::AWS::Compute::Error.new("InvalidPermission.Malformed => TCP/UDP port (-1) out of range")
           end
           if options.key?('IpPermissions')
             if !options['IpPermissions'].is_a?(Array) || options['IpPermissions'].empty?
-              raise Fog::Compute::AWS::Error.new("InvalidRequest => The request received was invalid.")
+              raise Fog::AWS::Compute::Error.new("InvalidRequest => The request received was invalid.")
             end
             options['IpPermissions'].each {|p| verify_permission_options(p, is_vpc) }
           end
@@ -196,7 +196,7 @@ def normalize_permissions(options)
                                    self.data[:security_groups][group_id]
                                  end
                 security_group ||
-                  raise(Fog::Compute::AWS::NotFound.new("The security group '#{group_name || group_id}' does not exist"))
+                  raise(Fog::AWS::Compute::NotFound.new("The security group '#{group_name || group_id}' does not exist"))
 
                 {
                   'groupName' => authorized_group['GroupName'] || security_group['groupName'],
diff --git a/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb b/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb
index aa40f3d1cf..aafac1bbb3 100644
--- a/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb
+++ b/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb
@@ -23,7 +23,7 @@ def cancel_spot_instance_requests(spot_instance_request_id)
           request({
             'Action'    => 'CancelSpotInstanceRequests',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::CancelSpotInstanceRequests.new
+            :parser     => Fog::Parsers::AWS::Compute::CancelSpotInstanceRequests.new
           }.merge!(params))
         end
       end
@@ -34,7 +34,7 @@ def cancel_spot_instance_requests(spot_instance_request_id)
           spot_request = self.data[:spot_requests][spot_instance_request_id]
 
           unless spot_request
-            raise Fog::Compute::AWS::NotFound.new("The spot instance request ID '#{spot_instance_request_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The spot instance request ID '#{spot_instance_request_id}' does not exist")
           end
 
           spot_request['fault']['code'] = 'request-cancelled'
diff --git a/lib/fog/aws/requests/compute/copy_image.rb b/lib/fog/aws/requests/compute/copy_image.rb
index 0bbf15ebc8..8eeebf1d1a 100644
--- a/lib/fog/aws/requests/compute/copy_image.rb
+++ b/lib/fog/aws/requests/compute/copy_image.rb
@@ -28,7 +28,7 @@ def copy_image(source_image_id, source_region, name = nil, description = nil, cl
             'Name'            => name,
             'Description'     => description,
             'ClientToken'     => client_token,
-            :parser           => Fog::Parsers::Compute::AWS::CopyImage.new
+            :parser           => Fog::Parsers::AWS::Compute::CopyImage.new
           )
         end
       end
diff --git a/lib/fog/aws/requests/compute/copy_snapshot.rb b/lib/fog/aws/requests/compute/copy_snapshot.rb
index 2c21ee7ded..f66e88b8c7 100644
--- a/lib/fog/aws/requests/compute/copy_snapshot.rb
+++ b/lib/fog/aws/requests/compute/copy_snapshot.rb
@@ -33,7 +33,7 @@ def copy_snapshot(source_snapshot_id, source_region, options = {})
             'SourceSnapshotId' => source_snapshot_id,
             'SourceRegion'     => source_region,
             'Description'      => options['Description'],
-            :parser            => Fog::Parsers::Compute::AWS::CopySnapshot.new
+            :parser            => Fog::Parsers::AWS::Compute::CopySnapshot.new
           }
           params['Encrypted'] = true if options['Encrypted']
           params['KmsKeyId']  = options['KmsKeyId'] if options['Encrypted'] && options['KmsKeyId']
diff --git a/lib/fog/aws/requests/compute/create_dhcp_options.rb b/lib/fog/aws/requests/compute/create_dhcp_options.rb
index 3816ec612e..8b4047b4ae 100644
--- a/lib/fog/aws/requests/compute/create_dhcp_options.rb
+++ b/lib/fog/aws/requests/compute/create_dhcp_options.rb
@@ -21,7 +21,7 @@ def create_dhcp_options(dhcp_configurations = {})
           request({
             'Action'    => 'CreateDhcpOptions',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::CreateDhcpOptions.new
+            :parser     => Fog::Parsers::AWS::Compute::CreateDhcpOptions.new
           }.merge!(params))
         end
         private
diff --git a/lib/fog/aws/requests/compute/create_image.rb b/lib/fog/aws/requests/compute/create_image.rb
index 49a59dfb07..f690fbdb13 100644
--- a/lib/fog/aws/requests/compute/create_image.rb
+++ b/lib/fog/aws/requests/compute/create_image.rb
@@ -39,7 +39,7 @@ def create_image(instance_id, name, description, no_reboot = false, options={})
             'Name'              => name,
             'Description'       => description,
             'NoReboot'          => no_reboot.to_s,
-            :parser             => Fog::Parsers::Compute::AWS::CreateImage.new
+            :parser             => Fog::Parsers::AWS::Compute::CreateImage.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/create_internet_gateway.rb b/lib/fog/aws/requests/compute/create_internet_gateway.rb
index ba0aee2175..da915d1f86 100644
--- a/lib/fog/aws/requests/compute/create_internet_gateway.rb
+++ b/lib/fog/aws/requests/compute/create_internet_gateway.rb
@@ -25,7 +25,7 @@ class Real
         def create_internet_gateway()
           request({
             'Action'     => 'CreateInternetGateway',
-            :parser      => Fog::Parsers::Compute::AWS::CreateInternetGateway.new
+            :parser      => Fog::Parsers::AWS::Compute::CreateInternetGateway.new
           })
         end
       end
diff --git a/lib/fog/aws/requests/compute/create_key_pair.rb b/lib/fog/aws/requests/compute/create_key_pair.rb
index 688b1b4ed0..f1a8b441e5 100644
--- a/lib/fog/aws/requests/compute/create_key_pair.rb
+++ b/lib/fog/aws/requests/compute/create_key_pair.rb
@@ -22,7 +22,7 @@ def create_key_pair(key_name)
           request(
             'Action'  => 'CreateKeyPair',
             'KeyName' => key_name,
-            :parser   => Fog::Parsers::Compute::AWS::CreateKeyPair.new
+            :parser   => Fog::Parsers::AWS::Compute::CreateKeyPair.new
           )
         end
       end
@@ -43,7 +43,7 @@ def create_key_pair(key_name)
             }.merge!(data)
             response
           else
-            raise Fog::Compute::AWS::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
+            raise Fog::AWS::Compute::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/create_network_acl.rb b/lib/fog/aws/requests/compute/create_network_acl.rb
index 45bf4adbe5..9bb069a512 100644
--- a/lib/fog/aws/requests/compute/create_network_acl.rb
+++ b/lib/fog/aws/requests/compute/create_network_acl.rb
@@ -42,7 +42,7 @@ def create_network_acl(vpcId, options = {})
           request({
             'Action' => 'CreateNetworkAcl',
             'VpcId'  => vpcId,
-            :parser  => Fog::Parsers::Compute::AWS::CreateNetworkAcl.new
+            :parser  => Fog::Parsers::AWS::Compute::CreateNetworkAcl.new
           }.merge!(options))
         end
       end
@@ -54,7 +54,7 @@ def create_network_acl(vpcId, options = {})
             id = Fog::AWS::Mock.network_acl_id
 
             unless self.data[:vpcs].find { |s| s['vpcId'] == vpcId }
-              raise Fog::Compute::AWS::Error.new("Unknown VPC '#{vpcId}' specified")
+              raise Fog::AWS::Compute::Error.new("Unknown VPC '#{vpcId}' specified")
             end
 
             data = {
diff --git a/lib/fog/aws/requests/compute/create_network_acl_entry.rb b/lib/fog/aws/requests/compute/create_network_acl_entry.rb
index e8b57b2d15..2f43e03e09 100644
--- a/lib/fog/aws/requests/compute/create_network_acl_entry.rb
+++ b/lib/fog/aws/requests/compute/create_network_acl_entry.rb
@@ -35,7 +35,7 @@ def create_network_acl_entry(network_acl_id, rule_number, protocol, rule_action,
             'RuleAction'   => rule_action,
             'Egress'       => egress,
             'CidrBlock'    => cidr_block,
-            :parser        => Fog::Parsers::Compute::AWS::Basic.new
+            :parser        => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(options))
         end
       end
@@ -46,7 +46,7 @@ def create_network_acl_entry(network_acl_id, rule_number, protocol, rule_action,
           if self.data[:network_acls][network_acl_id]
 
             if self.data[:network_acls][network_acl_id]['entrySet'].find { |r| r['ruleNumber'] == rule_number && r['egress'] == egress }
-              raise Fog::Compute::AWS::Error.new("Already a rule with that number")
+              raise Fog::AWS::Compute::Error.new("Already a rule with that number")
             end
 
             data = {
@@ -71,7 +71,7 @@ def create_network_acl_entry(network_acl_id, rule_number, protocol, rule_action,
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/create_network_interface.rb b/lib/fog/aws/requests/compute/create_network_interface.rb
index c040bda23f..bd1f69f9ae 100644
--- a/lib/fog/aws/requests/compute/create_network_interface.rb
+++ b/lib/fog/aws/requests/compute/create_network_interface.rb
@@ -54,7 +54,7 @@ def create_network_interface(subnetId, options = {})
           request({
             'Action'     => 'CreateNetworkInterface',
             'SubnetId'   => subnetId,
-            :parser      => Fog::Parsers::Compute::AWS::CreateNetworkInterface.new
+            :parser      => Fog::Parsers::AWS::Compute::CreateNetworkInterface.new
           }.merge!(options))
         end
       end
@@ -65,7 +65,7 @@ def create_network_interface(subnetId, options = {})
           if subnetId
             subnet = self.data[:subnets].find{ |s| s['subnetId'] == subnetId }
             if subnet.nil?
-              raise Fog::Compute::AWS::Error.new("Unknown subnet '#{subnetId}' specified")
+              raise Fog::AWS::Compute::Error.new("Unknown subnet '#{subnetId}' specified")
             else
               id = Fog::AWS::Mock.network_interface_id
               cidr_block = IPAddress.parse(subnet['cidrBlock'])
@@ -75,7 +75,7 @@ def create_network_interface(subnetId, options = {})
                 options['GroupSet'].each do |group_id|
                   group_obj = self.data[:security_groups][group_id]
                   if group_obj.nil?
-                    raise Fog::Compute::AWS::Error.new("Unknown security group '#{group_id}' specified")
+                    raise Fog::AWS::Compute::Error.new("Unknown security group '#{group_id}' specified")
                   end
                   groups[group_id] = group_obj['groupName']
                 end
@@ -93,7 +93,7 @@ def create_network_interface(subnetId, options = {})
                   end
                 end
               elsif self.data[:network_interfaces].map{ |ni,ni_conf| ni_conf['privateIpAddress'] }.include?options['PrivateIpAddress']
-                raise Fog::Compute::AWS::Error.new('InUse => The specified address is already in use.')
+                raise Fog::AWS::Compute::Error.new('InUse => The specified address is already in use.')
               end
 
               data = {
diff --git a/lib/fog/aws/requests/compute/create_placement_group.rb b/lib/fog/aws/requests/compute/create_placement_group.rb
index c16f22e676..153260654a 100644
--- a/lib/fog/aws/requests/compute/create_placement_group.rb
+++ b/lib/fog/aws/requests/compute/create_placement_group.rb
@@ -22,7 +22,7 @@ def create_placement_group(name, strategy)
             'Action'            => 'CreatePlacementGroup',
             'GroupName'         => name,
             'Strategy'          => strategy,
-            :parser             => Fog::Parsers::Compute::AWS::Basic.new
+            :parser             => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
diff --git a/lib/fog/aws/requests/compute/create_route.rb b/lib/fog/aws/requests/compute/create_route.rb
index ceeda3d2ef..80d57ee71d 100644
--- a/lib/fog/aws/requests/compute/create_route.rb
+++ b/lib/fog/aws/requests/compute/create_route.rb
@@ -25,7 +25,7 @@ def create_route(route_table_id, destination_cidr_block, internet_gateway_id=nil
             'Action'                => 'CreateRoute',
             'RouteTableId'          => route_table_id,
             'DestinationCidrBlock'  => destination_cidr_block,
-            :parser                 => Fog::Parsers::Compute::AWS::Basic.new
+            :parser                 => Fog::Parsers::AWS::Compute::Basic.new
           }
           if internet_gateway_id
             request_vars['GatewayId'] = internet_gateway_id
@@ -45,13 +45,13 @@ def create_route(route_table_id, destination_cidr_block, internet_gateway_id=nil
           if !route_table.nil? && destination_cidr_block
             if !internet_gateway_id.nil? || !instance_id.nil? || !network_interface_id.nil?
               if !internet_gateway_id.nil? && self.internet_gateways.all('internet-gateway-id'=>internet_gateway_id).first.nil?
-                raise Fog::Compute::AWS::NotFound.new("The gateway ID '#{internet_gateway_id}' does not exist")
+                raise Fog::AWS::Compute::NotFound.new("The gateway ID '#{internet_gateway_id}' does not exist")
               elsif !instance_id.nil? && self.servers.all('instance-id'=>instance_id).first.nil?
-                raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist")
+                raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist")
               elsif !network_interface_id.nil? && self.network_interfaces.all('networkInterfaceId'=>network_interface_id).first.nil?
-                raise Fog::Compute::AWS::NotFound.new("The networkInterface ID '#{network_interface_id}' does not exist")
+                raise Fog::AWS::Compute::NotFound.new("The networkInterface ID '#{network_interface_id}' does not exist")
               elsif !route_table['routeSet'].find { |route| route['destinationCidrBlock'].eql? destination_cidr_block }.nil?
-                raise Fog::Compute::AWS::Error, "RouteAlreadyExists => The route identified by #{destination_cidr_block} already exists."
+                raise Fog::AWS::Compute::Error, "RouteAlreadyExists => The route identified by #{destination_cidr_block} already exists."
               else
                 response = Excon::Response.new
                 route_table['routeSet'].push({
@@ -73,12 +73,12 @@ def create_route(route_table_id, destination_cidr_block, internet_gateway_id=nil
             else
               message = 'MissingParameter => '
               message << 'The request must contain either a gateway id, a network interface id, or an instance id'
-              raise Fog::Compute::AWS::Error.new(message)
+              raise Fog::AWS::Compute::Error.new(message)
             end
           elsif route_table.nil?
-            raise Fog::Compute::AWS::NotFound.new("The routeTable ID '#{route_table_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The routeTable ID '#{route_table_id}' does not exist")
           elsif destination_cidr_block.empty?
-            raise Fog::Compute::AWS::InvalidParameterValue.new("Value () for parameter destinationCidrBlock is invalid. This is not a valid CIDR block.")
+            raise Fog::AWS::Compute::InvalidParameterValue.new("Value () for parameter destinationCidrBlock is invalid. This is not a valid CIDR block.")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/create_route_table.rb b/lib/fog/aws/requests/compute/create_route_table.rb
index 0b425ad90c..faee524ce9 100644
--- a/lib/fog/aws/requests/compute/create_route_table.rb
+++ b/lib/fog/aws/requests/compute/create_route_table.rb
@@ -27,7 +27,7 @@ def create_route_table(vpc_id)
           request({
             'Action' => 'CreateRouteTable',
             'VpcId' => vpc_id,
-            :parser => Fog::Parsers::Compute::AWS::CreateRouteTable.new
+            :parser => Fog::Parsers::AWS::Compute::CreateRouteTable.new
           })
         end
       end
@@ -60,7 +60,7 @@ def create_route_table(vpc_id)
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The vpc ID '#{vpc_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The vpc ID '#{vpc_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/create_security_group.rb b/lib/fog/aws/requests/compute/create_security_group.rb
index bc48e31191..c68e986c8a 100644
--- a/lib/fog/aws/requests/compute/create_security_group.rb
+++ b/lib/fog/aws/requests/compute/create_security_group.rb
@@ -25,7 +25,7 @@ def create_security_group(name, description, vpc_id=nil)
             'GroupName'         => name,
             'GroupDescription'  => description,
             'VpcId'             => vpc_id,
-            :parser             => Fog::Parsers::Compute::AWS::CreateSecurityGroup.new
+            :parser             => Fog::Parsers::AWS::Compute::CreateSecurityGroup.new
           )
         end
       end
@@ -38,7 +38,7 @@ def create_security_group(name, description, vpc_id=nil)
           group_id = Fog::AWS::Mock.security_group_id
 
           if self.data[:security_groups].find { |_,v| v['groupName'] == name }
-            raise Fog::Compute::AWS::Error,
+            raise Fog::AWS::Compute::Error,
               "InvalidGroup.Duplicate => The security group '#{name}' already exists"
           end
 
diff --git a/lib/fog/aws/requests/compute/create_snapshot.rb b/lib/fog/aws/requests/compute/create_snapshot.rb
index 81aec313d1..4fbccef5b1 100644
--- a/lib/fog/aws/requests/compute/create_snapshot.rb
+++ b/lib/fog/aws/requests/compute/create_snapshot.rb
@@ -26,7 +26,7 @@ def create_snapshot(volume_id, description = nil)
             'Action'      => 'CreateSnapshot',
             'Description' => description,
             'VolumeId'    => volume_id,
-            :parser       => Fog::Parsers::Compute::AWS::CreateSnapshot.new
+            :parser       => Fog::Parsers::AWS::Compute::CreateSnapshot.new
           )
         end
       end
diff --git a/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb b/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb
index 7ae94f9bd8..9cc5cde938 100644
--- a/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb
+++ b/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb
@@ -30,7 +30,7 @@ def create_spot_datafeed_subscription(bucket, prefix)
             'Bucket'    => bucket,
             'Prefix'    => prefix,
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::SpotDatafeedSubscription.new
+            :parser     => Fog::Parsers::AWS::Compute::SpotDatafeedSubscription.new
           )
         end
       end
diff --git a/lib/fog/aws/requests/compute/create_subnet.rb b/lib/fog/aws/requests/compute/create_subnet.rb
index 8af7ac7e02..ac07eed65c 100644
--- a/lib/fog/aws/requests/compute/create_subnet.rb
+++ b/lib/fog/aws/requests/compute/create_subnet.rb
@@ -36,7 +36,7 @@ def create_subnet(vpcId, cidrBlock, options = {})
             'Action'     => 'CreateSubnet',
             'VpcId'      => vpcId,
             'CidrBlock'  => cidrBlock,
-            :parser      => Fog::Parsers::Compute::AWS::CreateSubnet.new
+            :parser      => Fog::Parsers::AWS::Compute::CreateSubnet.new
           }.merge!(options))
         end
       end
@@ -48,14 +48,14 @@ def create_subnet(vpcId, cidrBlock, options = {})
             if cidrBlock && vpcId
               vpc = self.data[:vpcs].find{ |v| v['vpcId'] == vpcId }
               if vpc.nil?
-                raise Fog::Compute::AWS::NotFound.new("The vpc ID '#{vpcId}' does not exist")
+                raise Fog::AWS::Compute::NotFound.new("The vpc ID '#{vpcId}' does not exist")
               end
               if ! ::IPAddress.parse(vpc['cidrBlock']).include?(::IPAddress.parse(cidrBlock))
-                raise Fog::Compute::AWS::Error.new("Range => The CIDR '#{cidrBlock}' is invalid.")
+                raise Fog::AWS::Compute::Error.new("Range => The CIDR '#{cidrBlock}' is invalid.")
               end
               self.data[:subnets].select{ |s| s['vpcId'] == vpcId }.each do |subnet|
                 if ::IPAddress.parse(subnet['cidrBlock']).include?(::IPAddress.parse(cidrBlock))
-                  raise Fog::Compute::AWS::Error.new("Conflict => The CIDR '#{cidrBlock}' conflicts with another subnet")
+                  raise Fog::AWS::Compute::Error.new("Conflict => The CIDR '#{cidrBlock}' conflicts with another subnet")
                 end
               end
 
diff --git a/lib/fog/aws/requests/compute/create_tags.rb b/lib/fog/aws/requests/compute/create_tags.rb
index c2ea76240b..0fb36f551a 100644
--- a/lib/fog/aws/requests/compute/create_tags.rb
+++ b/lib/fog/aws/requests/compute/create_tags.rb
@@ -31,7 +31,7 @@ def create_tags(resources, tags)
           request({
             'Action'    => 'CreateTags',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/create_volume.rb b/lib/fog/aws/requests/compute/create_volume.rb
index f2c64dd36f..9a6049a4f2 100644
--- a/lib/fog/aws/requests/compute/create_volume.rb
+++ b/lib/fog/aws/requests/compute/create_volume.rb
@@ -39,7 +39,7 @@ def create_volume(availability_zone, size, options = {})
             'Action'            => 'CreateVolume',
             'AvailabilityZone'  => availability_zone,
             'Size'              => size,
-            :parser             => Fog::Parsers::Compute::AWS::CreateVolume.new
+            :parser             => Fog::Parsers::AWS::Compute::CreateVolume.new
           }.merge(options))
         end
       end
@@ -55,11 +55,11 @@ def create_volume(availability_zone, size, options = {})
           if availability_zone && (size || options['SnapshotId'])
             snapshot = self.data[:snapshots][options['SnapshotId']]
             if options['SnapshotId'] && !snapshot
-              raise Fog::Compute::AWS::NotFound.new("The snapshot '#{options['SnapshotId']}' does not exist.")
+              raise Fog::AWS::Compute::NotFound.new("The snapshot '#{options['SnapshotId']}' does not exist.")
             end
 
             if snapshot && size && size < snapshot['volumeSize']
-              raise Fog::Compute::AWS::NotFound.new("The snapshot '#{options['SnapshotId']}' has size #{snapshot['volumeSize']} which is greater than #{size}.")
+              raise Fog::AWS::Compute::NotFound.new("The snapshot '#{options['SnapshotId']}' has size #{snapshot['volumeSize']} which is greater than #{size}.")
             elsif snapshot && !size
               size = snapshot['volumeSize']
             end
@@ -67,28 +67,28 @@ def create_volume(availability_zone, size, options = {})
             if options['VolumeType'] == 'io1'
               iops = options['Iops']
               if !iops
-                raise Fog::Compute::AWS::Error.new("InvalidParameterCombination => The parameter iops must be specified for io1 volumes.")
+                raise Fog::AWS::Compute::Error.new("InvalidParameterCombination => The parameter iops must be specified for io1 volumes.")
               end
 
               if size < 10
-                raise Fog::Compute::AWS::Error.new("InvalidParameterValue => Volume of #{size}GiB is too small; minimum is 10GiB.")
+                raise Fog::AWS::Compute::Error.new("InvalidParameterValue => Volume of #{size}GiB is too small; minimum is 10GiB.")
               end
 
               if (iops_to_size_ratio = iops.to_f / size.to_f) > 30.0
-                raise Fog::Compute::AWS::Error.new("InvalidParameterValue => Iops to volume size ratio of #{"%.1f" % iops_to_size_ratio} is too high; maximum is 30.0")
+                raise Fog::AWS::Compute::Error.new("InvalidParameterValue => Iops to volume size ratio of #{"%.1f" % iops_to_size_ratio} is too high; maximum is 30.0")
               end
 
               if iops < 100
-                raise Fog::Compute::AWS::Error.new("VolumeIOPSLimit => Volume iops of #{iops} is too low; minimum is 100.")
+                raise Fog::AWS::Compute::Error.new("VolumeIOPSLimit => Volume iops of #{iops} is too low; minimum is 100.")
               end
 
               if iops > 4000
-                raise Fog::Compute::AWS::Error.new("VolumeIOPSLimit => Volume iops of #{iops} is too high; maximum is 4000.")
+                raise Fog::AWS::Compute::Error.new("VolumeIOPSLimit => Volume iops of #{iops} is too high; maximum is 4000.")
               end
             end
 
             if options['KmsKeyId'] && !options['Encrypted']
-              raise Fog::Compute::AWS::Error.new("InvalidParameterDependency => The parameter KmsKeyId requires the parameter Encrypted to be set.")
+              raise Fog::AWS::Compute::Error.new("InvalidParameterDependency => The parameter KmsKeyId requires the parameter Encrypted to be set.")
             end
 
             response.status = 200
diff --git a/lib/fog/aws/requests/compute/create_vpc.rb b/lib/fog/aws/requests/compute/create_vpc.rb
index ea886d1f46..139f37a666 100644
--- a/lib/fog/aws/requests/compute/create_vpc.rb
+++ b/lib/fog/aws/requests/compute/create_vpc.rb
@@ -31,7 +31,7 @@ def create_vpc(cidrBlock, options = {})
           request({
             'Action' => 'CreateVpc',
             'CidrBlock' => cidrBlock,
-            :parser => Fog::Parsers::Compute::AWS::CreateVpc.new
+            :parser => Fog::Parsers::AWS::Compute::CreateVpc.new
           }.merge!(options))
         end
       end
@@ -82,7 +82,7 @@ def create_vpc(cidrBlock, options = {})
               default_elb_group_name = "default_elb_#{Fog::Mock.random_hex(6)}"
               default_elb_group_id = Fog::AWS::Mock.security_group_id
 
-              Fog::Compute::AWS::Mock.data[region][@aws_access_key_id][:security_groups][default_elb_group_id] = {
+              Fog::AWS::Compute::Mock.data[region][@aws_access_key_id][:security_groups][default_elb_group_id] = {
                 'groupDescription'    => 'default_elb security group',
                 'groupName'           => default_elb_group_name,
                 'groupId'             => default_elb_group_id,
@@ -94,7 +94,7 @@ def create_vpc(cidrBlock, options = {})
               default_group_name = 'default'
               default_group_id = Fog::AWS::Mock.security_group_id
 
-              Fog::Compute::AWS::Mock.data[region][@aws_access_key_id][:security_groups][default_group_id] = {
+              Fog::AWS::Compute::Mock.data[region][@aws_access_key_id][:security_groups][default_group_id] = {
                 'groupDescription'    => default_group_name,
                 'groupName'           => default_group_name,
                 'groupId'             => default_group_id,
diff --git a/lib/fog/aws/requests/compute/delete_dhcp_options.rb b/lib/fog/aws/requests/compute/delete_dhcp_options.rb
index d8f076bc67..70c46c3003 100644
--- a/lib/fog/aws/requests/compute/delete_dhcp_options.rb
+++ b/lib/fog/aws/requests/compute/delete_dhcp_options.rb
@@ -21,7 +21,7 @@ def delete_dhcp_options(dhcp_options_id)
           request(
             'Action' => 'DeleteDhcpOptions',
             'DhcpOptionsId' => dhcp_options_id,
-            :parser => Fog::Parsers::Compute::AWS::Basic.new
+            :parser => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -40,7 +40,7 @@ def delete_dhcp_options(dhcp_options_id)
             else
               message = 'MissingParameter => '
               message << 'The request must contain the parameter dhcp_options_id'
-              raise Fog::Compute::AWS::Error.new(message)
+              raise Fog::AWS::Compute::Error.new(message)
             end
           end
         end
diff --git a/lib/fog/aws/requests/compute/delete_internet_gateway.rb b/lib/fog/aws/requests/compute/delete_internet_gateway.rb
index ce725dc885..c957e11393 100644
--- a/lib/fog/aws/requests/compute/delete_internet_gateway.rb
+++ b/lib/fog/aws/requests/compute/delete_internet_gateway.rb
@@ -19,7 +19,7 @@ def delete_internet_gateway(internet_gateway_id)
           request(
             'Action' => 'DeleteInternetGateway',
             'InternetGatewayId' => internet_gateway_id,
-            :parser => Fog::Parsers::Compute::AWS::Basic.new
+            :parser => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -38,7 +38,7 @@ def delete_internet_gateway(internet_gateway_id)
             else
               message = 'MissingParameter => '
               message << 'The request must contain the parameter internet_gateway_id'
-              raise Fog::Compute::AWS::Error.new(message)
+              raise Fog::AWS::Compute::Error.new(message)
             end
           end
         end
diff --git a/lib/fog/aws/requests/compute/delete_key_pair.rb b/lib/fog/aws/requests/compute/delete_key_pair.rb
index c39cf3b5c7..d359f3d7ca 100644
--- a/lib/fog/aws/requests/compute/delete_key_pair.rb
+++ b/lib/fog/aws/requests/compute/delete_key_pair.rb
@@ -21,7 +21,7 @@ def delete_key_pair(key_name)
             'Action'    => 'DeleteKeyPair',
             'KeyName'   => key_name,
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
diff --git a/lib/fog/aws/requests/compute/delete_network_acl.rb b/lib/fog/aws/requests/compute/delete_network_acl.rb
index 674bcdac18..4919a2a9a8 100644
--- a/lib/fog/aws/requests/compute/delete_network_acl.rb
+++ b/lib/fog/aws/requests/compute/delete_network_acl.rb
@@ -20,7 +20,7 @@ def delete_network_acl(network_acl_id)
           request(
             'Action'       => 'DeleteNetworkAcl',
             'NetworkAclId' => network_acl_id,
-            :parser        => Fog::Parsers::Compute::AWS::Basic.new
+            :parser        => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -31,7 +31,7 @@ def delete_network_acl(network_acl_id)
           if self.data[:network_acls][network_acl_id]
 
             if self.data[:network_acls][network_acl_id]['associationSet'].any?
-              raise Fog::Compute::AWS::Error.new("ACL is in use")
+              raise Fog::AWS::Compute::Error.new("ACL is in use")
             end
 
             self.data[:network_acls].delete(network_acl_id)
@@ -43,7 +43,7 @@ def delete_network_acl(network_acl_id)
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/delete_network_acl_entry.rb b/lib/fog/aws/requests/compute/delete_network_acl_entry.rb
index 7108beab90..263478280e 100644
--- a/lib/fog/aws/requests/compute/delete_network_acl_entry.rb
+++ b/lib/fog/aws/requests/compute/delete_network_acl_entry.rb
@@ -24,7 +24,7 @@ def delete_network_acl_entry(network_acl_id, rule_number, egress)
             'NetworkAclId' => network_acl_id,
             'RuleNumber'   => rule_number,
             'Egress'       => egress,
-            :parser        => Fog::Parsers::Compute::AWS::Basic.new
+            :parser        => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -36,7 +36,7 @@ def delete_network_acl_entry(network_acl_id, rule_number, egress)
             if self.data[:network_acls][network_acl_id]['entrySet'].find { |r| r['ruleNumber'] == rule_number && r['egress'] == egress }
               self.data[:network_acls][network_acl_id]['entrySet'].delete_if { |r| r['ruleNumber'] == rule_number && r['egress'] == egress }
             else
-              raise Fog::Compute::AWS::Error.new("No rule with that number and egress value")
+              raise Fog::AWS::Compute::Error.new("No rule with that number and egress value")
             end
 
             response.status = 200
@@ -46,7 +46,7 @@ def delete_network_acl_entry(network_acl_id, rule_number, egress)
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/delete_network_interface.rb b/lib/fog/aws/requests/compute/delete_network_interface.rb
index f80c37e81c..a86cc7eceb 100644
--- a/lib/fog/aws/requests/compute/delete_network_interface.rb
+++ b/lib/fog/aws/requests/compute/delete_network_interface.rb
@@ -19,7 +19,7 @@ def delete_network_interface(network_interface_id)
           request(
             'Action'             => 'DeleteNetworkInterface',
             'NetworkInterfaceId' => network_interface_id,
-            :parser => Fog::Parsers::Compute::AWS::Basic.new
+            :parser => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -30,7 +30,7 @@ def delete_network_interface(network_interface_id)
           if self.data[:network_interfaces][network_interface_id]
 
             if self.data[:network_interfaces][network_interface_id]['attachment']['attachmentId']
-              raise Fog::Compute::AWS::Error.new("Interface is in use")
+              raise Fog::AWS::Compute::Error.new("Interface is in use")
             end
 
             self.data[:network_interfaces].delete(network_interface_id)
@@ -42,7 +42,7 @@ def delete_network_interface(network_interface_id)
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The network interface '#{network_interface_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network interface '#{network_interface_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/delete_placement_group.rb b/lib/fog/aws/requests/compute/delete_placement_group.rb
index adc5e8457c..2b42359d04 100644
--- a/lib/fog/aws/requests/compute/delete_placement_group.rb
+++ b/lib/fog/aws/requests/compute/delete_placement_group.rb
@@ -21,7 +21,7 @@ def delete_placement_group(name)
             'Action'    => 'DeletePlacementGroup',
             'GroupName' => name,
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
diff --git a/lib/fog/aws/requests/compute/delete_route.rb b/lib/fog/aws/requests/compute/delete_route.rb
index babe77ab86..0b1992b0e8 100644
--- a/lib/fog/aws/requests/compute/delete_route.rb
+++ b/lib/fog/aws/requests/compute/delete_route.rb
@@ -22,7 +22,7 @@ def delete_route(route_table_id, destination_cidr_block)
             'Action'                => 'DeleteRoute',
             'RouteTableId'          => route_table_id,
             'DestinationCidrBlock'  => destination_cidr_block,
-            :parser                 => Fog::Parsers::Compute::AWS::Basic.new
+            :parser                 => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -43,12 +43,12 @@ def delete_route(route_table_id, destination_cidr_block)
               response
             elsif route['gatewayId'] == "local"
               # Cannot delete the default route
-              raise Fog::Compute::AWS::Error, "InvalidParameterValue => cannot remove local route #{destination_cidr_block} in route table #{route_table_id}"
+              raise Fog::AWS::Compute::Error, "InvalidParameterValue => cannot remove local route #{destination_cidr_block} in route table #{route_table_id}"
             else
-              raise Fog::Compute::AWS::NotFound.new("no route with destination-cidr-block #{destination_cidr_block} in route table #{route_table_id}")
+              raise Fog::AWS::Compute::NotFound.new("no route with destination-cidr-block #{destination_cidr_block} in route table #{route_table_id}")
             end
           else
-            raise Fog::Compute::AWS::NotFound.new("no route with destination-cidr-block #{destination_cidr_block} in route table #{route_table_id}")
+            raise Fog::AWS::Compute::NotFound.new("no route with destination-cidr-block #{destination_cidr_block} in route table #{route_table_id}")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/delete_route_table.rb b/lib/fog/aws/requests/compute/delete_route_table.rb
index 5ddb13dc1b..0bc86d6f39 100644
--- a/lib/fog/aws/requests/compute/delete_route_table.rb
+++ b/lib/fog/aws/requests/compute/delete_route_table.rb
@@ -20,7 +20,7 @@ def delete_route_table(route_table_id)
           request(
             'Action'    => 'DeleteRouteTable',
             'RouteTableId'  => route_table_id,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -38,9 +38,9 @@ def delete_route_table(route_table_id)
               }
               response
           elsif route_table.nil?
-            raise Fog::Compute::AWS::NotFound.new("The routeTable ID '#{route_table_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The routeTable ID '#{route_table_id}' does not exist")
           elsif !route_table['associationSet'].empty?
-            raise Fog::Compute::AWS::Error, "DependencyViolation => The routeTable '#{route_table_id}' has dependencies and cannot be deleted."
+            raise Fog::AWS::Compute::Error, "DependencyViolation => The routeTable '#{route_table_id}' has dependencies and cannot be deleted."
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/delete_security_group.rb b/lib/fog/aws/requests/compute/delete_security_group.rb
index 4838ad8cda..dde0c52fc7 100644
--- a/lib/fog/aws/requests/compute/delete_security_group.rb
+++ b/lib/fog/aws/requests/compute/delete_security_group.rb
@@ -19,7 +19,7 @@ class Real
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteSecurityGroup.html]
         def delete_security_group(name, id = nil)
           if name && id
-            raise Fog::Compute::AWS::Error.new("May not specify both group_name and group_id")
+            raise Fog::AWS::Compute::Error.new("May not specify both group_name and group_id")
           end
           if name
             type_id    = 'GroupName'
@@ -32,7 +32,7 @@ def delete_security_group(name, id = nil)
             'Action'    => 'DeleteSecurityGroup',
             type_id     => identifier,
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -40,11 +40,11 @@ def delete_security_group(name, id = nil)
       class Mock
         def delete_security_group(name, id = nil)
           if name == 'default'
-            raise Fog::Compute::AWS::Error.new("InvalidGroup.Reserved => The security group 'default' is reserved")
+            raise Fog::AWS::Compute::Error.new("InvalidGroup.Reserved => The security group 'default' is reserved")
           end
 
           if name && id
-            raise Fog::Compute::AWS::Error.new("May not specify both group_name and group_id")
+            raise Fog::AWS::Compute::Error.new("May not specify both group_name and group_id")
           end
 
           if name
@@ -52,7 +52,7 @@ def delete_security_group(name, id = nil)
           end
 
           unless self.data[:security_groups][id]
-            raise Fog::Compute::AWS::NotFound.new("The security group '#{id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The security group '#{id}' does not exist")
           end
 
           response = Excon::Response.new
@@ -93,11 +93,11 @@ def delete_security_group(name, id = nil)
           end
 
           unless used_by_groups.empty?
-            raise Fog::Compute::AWS::Error.new("InvalidGroup.InUse => Group #{self.data[:owner_id]}:#{name} is used by groups: #{used_by_groups.uniq.join(" ")}")
+            raise Fog::AWS::Compute::Error.new("InvalidGroup.InUse => Group #{self.data[:owner_id]}:#{name} is used by groups: #{used_by_groups.uniq.join(" ")}")
           end
 
           if active_instances.any?
-            raise Fog::Compute::AWS::Error.new("InUse => There are active instances using security group '#{name}'")
+            raise Fog::AWS::Compute::Error.new("InUse => There are active instances using security group '#{name}'")
           end
 
           self.data[:security_groups].delete(id)
diff --git a/lib/fog/aws/requests/compute/delete_snapshot.rb b/lib/fog/aws/requests/compute/delete_snapshot.rb
index c64bdfc0b9..3e3ad73d67 100644
--- a/lib/fog/aws/requests/compute/delete_snapshot.rb
+++ b/lib/fog/aws/requests/compute/delete_snapshot.rb
@@ -21,7 +21,7 @@ def delete_snapshot(snapshot_id)
             'Action'      => 'DeleteSnapshot',
             'SnapshotId'  => snapshot_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::Compute::AWS::Basic.new
+            :parser       => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -37,7 +37,7 @@ def delete_snapshot(snapshot_id)
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The snapshot '#{snapshot_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The snapshot '#{snapshot_id}' does not exist.")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb b/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb
index 0a9e94c23a..51ad2707e7 100644
--- a/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb
+++ b/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb
@@ -17,7 +17,7 @@ def delete_spot_datafeed_subscription
           request(
             'Action'    => 'DeleteSpotDatafeedSubscription',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
diff --git a/lib/fog/aws/requests/compute/delete_subnet.rb b/lib/fog/aws/requests/compute/delete_subnet.rb
index 34874cd14a..86034bfe9d 100644
--- a/lib/fog/aws/requests/compute/delete_subnet.rb
+++ b/lib/fog/aws/requests/compute/delete_subnet.rb
@@ -20,7 +20,7 @@ def delete_subnet(subnet_id)
           request(
             'Action' => 'DeleteSubnet',
             'SubnetId' => subnet_id,
-            :parser => Fog::Parsers::Compute::AWS::Basic.new
+            :parser => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -39,7 +39,7 @@ def delete_subnet(subnet_id)
             else
               message = 'MissingParameter => '
               message << 'The request must contain the parameter subnet_id'
-              raise Fog::Compute::AWS::Error.new(message)
+              raise Fog::AWS::Compute::Error.new(message)
             end
           end
         end
diff --git a/lib/fog/aws/requests/compute/delete_tags.rb b/lib/fog/aws/requests/compute/delete_tags.rb
index 77111a2006..3efb2d70fa 100644
--- a/lib/fog/aws/requests/compute/delete_tags.rb
+++ b/lib/fog/aws/requests/compute/delete_tags.rb
@@ -33,7 +33,7 @@ def delete_tags(resources, tags)
 
           request({
             'Action'            => 'DeleteTags',
-            :parser             => Fog::Parsers::Compute::AWS::Basic.new
+            :parser             => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/delete_volume.rb b/lib/fog/aws/requests/compute/delete_volume.rb
index e3dd3ebc9b..32c115df8d 100644
--- a/lib/fog/aws/requests/compute/delete_volume.rb
+++ b/lib/fog/aws/requests/compute/delete_volume.rb
@@ -21,7 +21,7 @@ def delete_volume(volume_id)
             'Action'    => 'DeleteVolume',
             'VolumeId'  => volume_id,
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -32,7 +32,7 @@ def delete_volume(volume_id)
           if volume = self.data[:volumes][volume_id]
             if volume["attachmentSet"].any?
               attach = volume["attachmentSet"].first
-              raise Fog::Compute::AWS::Error.new("Client.VolumeInUse => Volume #{volume_id} is currently attached to #{attach["instanceId"]}")
+              raise Fog::AWS::Compute::Error.new("Client.VolumeInUse => Volume #{volume_id} is currently attached to #{attach["instanceId"]}")
             end
             self.data[:deleted_at][volume_id] = Time.now
             volume['status'] = 'deleting'
@@ -43,7 +43,7 @@ def delete_volume(volume_id)
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The volume '#{volume_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The volume '#{volume_id}' does not exist.")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/delete_vpc.rb b/lib/fog/aws/requests/compute/delete_vpc.rb
index a2c99b598e..d8e29ece2c 100644
--- a/lib/fog/aws/requests/compute/delete_vpc.rb
+++ b/lib/fog/aws/requests/compute/delete_vpc.rb
@@ -23,7 +23,7 @@ def delete_vpc(vpc_id)
           request(
             'Action' => 'DeleteVpc',
             'VpcId' => vpc_id,
-            :parser => Fog::Parsers::Compute::AWS::Basic.new
+            :parser => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -46,7 +46,7 @@ def delete_vpc(vpc_id)
             else
               message = 'MissingParameter => '
               message << 'The request must contain the parameter vpc_id'
-              raise Fog::Compute::AWS::Error.new(message)
+              raise Fog::AWS::Compute::Error.new(message)
             end
           end
         end
diff --git a/lib/fog/aws/requests/compute/deregister_image.rb b/lib/fog/aws/requests/compute/deregister_image.rb
index c21b892b4b..f85817fda6 100644
--- a/lib/fog/aws/requests/compute/deregister_image.rb
+++ b/lib/fog/aws/requests/compute/deregister_image.rb
@@ -20,7 +20,7 @@ def deregister_image(image_id)
           request(
             'Action'      => 'DeregisterImage',
             'ImageId'     => image_id,
-            :parser       => Fog::Parsers::Compute::AWS::DeregisterImage.new
+            :parser       => Fog::Parsers::AWS::Compute::DeregisterImage.new
           )
         end
       end
@@ -40,7 +40,7 @@ def deregister_image(image_id)
             if !instance_id
               message << 'The request must contain the parameter image_id'
             end
-            raise Fog::Compute::AWS::Error.new(message)
+            raise Fog::AWS::Compute::Error.new(message)
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_account_attributes.rb b/lib/fog/aws/requests/compute/describe_account_attributes.rb
index 222509ae77..27c462cc76 100644
--- a/lib/fog/aws/requests/compute/describe_account_attributes.rb
+++ b/lib/fog/aws/requests/compute/describe_account_attributes.rb
@@ -25,7 +25,7 @@ def describe_account_attributes(filters = {})
           request({
             'Action'    => 'DescribeAccountAttributes',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeAccountAttributes.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeAccountAttributes.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_addresses.rb b/lib/fog/aws/requests/compute/describe_addresses.rb
index fd5264289a..89b291c983 100644
--- a/lib/fog/aws/requests/compute/describe_addresses.rb
+++ b/lib/fog/aws/requests/compute/describe_addresses.rb
@@ -27,7 +27,7 @@ def describe_addresses(filters = {})
           request({
             'Action'    => 'DescribeAddresses',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeAddresses.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeAddresses.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_availability_zones.rb b/lib/fog/aws/requests/compute/describe_availability_zones.rb
index 519295506d..861bc264eb 100644
--- a/lib/fog/aws/requests/compute/describe_availability_zones.rb
+++ b/lib/fog/aws/requests/compute/describe_availability_zones.rb
@@ -28,7 +28,7 @@ def describe_availability_zones(filters = {})
           request({
             'Action'    => 'DescribeAvailabilityZones',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeAvailabilityZones.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeAvailabilityZones.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_classic_link_instances.rb b/lib/fog/aws/requests/compute/describe_classic_link_instances.rb
index 93877f097b..3982ab3b4a 100644
--- a/lib/fog/aws/requests/compute/describe_classic_link_instances.rb
+++ b/lib/fog/aws/requests/compute/describe_classic_link_instances.rb
@@ -32,7 +32,7 @@ def describe_classic_link_instances(options={})
           params.merge!(Fog::AWS.indexed_filters(options[:filters])) if options[:filters]
           request({
             'Action'    => 'DescribeClassicLinkInstances',
-            :parser     => Fog::Parsers::Compute::AWS::DescribeClassicLinkInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeClassicLinkInstances.new
           }.merge(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_dhcp_options.rb b/lib/fog/aws/requests/compute/describe_dhcp_options.rb
index 9ae9b10ea4..c37e675d1c 100644
--- a/lib/fog/aws/requests/compute/describe_dhcp_options.rb
+++ b/lib/fog/aws/requests/compute/describe_dhcp_options.rb
@@ -33,7 +33,7 @@ def describe_dhcp_options(filters = {})
           request({
             'Action' => 'DescribeDhcpOptions',
             :idempotent => true,
-            :parser => Fog::Parsers::Compute::AWS::DescribeDhcpOptions.new
+            :parser => Fog::Parsers::AWS::Compute::DescribeDhcpOptions.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_images.rb b/lib/fog/aws/requests/compute/describe_images.rb
index 1d37a3d826..1af5a81950 100644
--- a/lib/fog/aws/requests/compute/describe_images.rb
+++ b/lib/fog/aws/requests/compute/describe_images.rb
@@ -51,7 +51,7 @@ def describe_images(filters = {})
           request({
             'Action'    => 'DescribeImages',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeImages.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeImages.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_instance_attribute.rb b/lib/fog/aws/requests/compute/describe_instance_attribute.rb
index 501bb74b88..eba75264cf 100644
--- a/lib/fog/aws/requests/compute/describe_instance_attribute.rb
+++ b/lib/fog/aws/requests/compute/describe_instance_attribute.rb
@@ -46,7 +46,7 @@ def describe_instance_attribute(instance_id, attribute)
             'Action'       => 'DescribeInstanceAttribute',
             'InstanceId'   => instance_id,
             'Attribute'    => attribute,
-            :parser        => Fog::Parsers::Compute::AWS::DescribeInstanceAttribute.new
+            :parser        => Fog::Parsers::AWS::Compute::DescribeInstanceAttribute.new
           )
         end
       end
@@ -78,7 +78,7 @@ def describe_instance_attribute(instance_id, attribute)
             end
           response
           else
-            raise Fog::Compute::AWS::NotFound.new("The Instance '#{instance_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The Instance '#{instance_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_instance_status.rb b/lib/fog/aws/requests/compute/describe_instance_status.rb
index ba07c56880..706dc94581 100644
--- a/lib/fog/aws/requests/compute/describe_instance_status.rb
+++ b/lib/fog/aws/requests/compute/describe_instance_status.rb
@@ -23,7 +23,7 @@ def describe_instance_status(filters = {})
           request({
             'Action'    => 'DescribeInstanceStatus',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeInstanceStatus.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeInstanceStatus.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_instances.rb b/lib/fog/aws/requests/compute/describe_instances.rb
index e6867f2d1a..8960855018 100644
--- a/lib/fog/aws/requests/compute/describe_instances.rb
+++ b/lib/fog/aws/requests/compute/describe_instances.rb
@@ -81,7 +81,7 @@ def describe_instances(filters = {})
           request({
             'Action'    => 'DescribeInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeInstances.new
           }.merge!(params))
         end
       end
@@ -178,7 +178,7 @@ def describe_instances(filters = {})
 
           # Error if filtering for a brand new instance directly
           if (filters['instance-id'] || filters['instanceId']) && !brand_new_instances.empty?
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{brand_new_instances.first['instanceId']}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{brand_new_instances.first['instanceId']}' does not exist")
           end
 
           # Otherwise don't include it in the list
diff --git a/lib/fog/aws/requests/compute/describe_internet_gateways.rb b/lib/fog/aws/requests/compute/describe_internet_gateways.rb
index d01fa3e538..295ca8e603 100644
--- a/lib/fog/aws/requests/compute/describe_internet_gateways.rb
+++ b/lib/fog/aws/requests/compute/describe_internet_gateways.rb
@@ -32,7 +32,7 @@ def describe_internet_gateways(filters = {})
           request({
             'Action' => 'DescribeInternetGateways',
             :idempotent => true,
-            :parser => Fog::Parsers::Compute::AWS::DescribeInternetGateways.new
+            :parser => Fog::Parsers::AWS::Compute::DescribeInternetGateways.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_key_pairs.rb b/lib/fog/aws/requests/compute/describe_key_pairs.rb
index cd98d2d9a4..079c0e50e1 100644
--- a/lib/fog/aws/requests/compute/describe_key_pairs.rb
+++ b/lib/fog/aws/requests/compute/describe_key_pairs.rb
@@ -27,7 +27,7 @@ def describe_key_pairs(filters = {})
           request({
             'Action'    => 'DescribeKeyPairs',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeKeyPairs.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeKeyPairs.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_network_acls.rb b/lib/fog/aws/requests/compute/describe_network_acls.rb
index 98b6e00ce9..62b42f4af9 100644
--- a/lib/fog/aws/requests/compute/describe_network_acls.rb
+++ b/lib/fog/aws/requests/compute/describe_network_acls.rb
@@ -43,7 +43,7 @@ def describe_network_acls(filters = {})
           request({
             'Action' => 'DescribeNetworkAcls',
             :idempotent => true,
-            :parser => Fog::Parsers::Compute::AWS::DescribeNetworkAcls.new
+            :parser => Fog::Parsers::AWS::Compute::DescribeNetworkAcls.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb b/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb
index 7f3d85a75b..7abed093a9 100644
--- a/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb
+++ b/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb
@@ -34,7 +34,7 @@ def describe_network_interface_attribute(network_interface_id, attribute)
             'Action'             => 'DescribeNetworkInterfaceAttribute',
             'NetworkInterfaceId' => network_interface_id,
             'Attribute'          => attribute,
-            :parser              => Fog::Parsers::Compute::AWS::DescribeNetworkInterfaceAttribute.new
+            :parser              => Fog::Parsers::AWS::Compute::DescribeNetworkInterfaceAttribute.new
           )
         end
       end
@@ -46,7 +46,7 @@ def describe_network_interface_attribute(network_interface_id, attribute)
 
 
           unless network_interface
-            raise Fog::Compute::AWS::NotFound.new("The network interface '#{network_interface_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network interface '#{network_interface_id}' does not exist")
           end
 
           response.status = 200
@@ -58,7 +58,7 @@ def describe_network_interface_attribute(network_interface_id, attribute)
           when 'description', 'groupSet', 'sourceDestCheck', 'attachment'
             response.body[attribute] = network_interface[attribute]
           else
-            raise Fog::Compute::AWS::Error.new("Illegal attribute '#{attribute}' specified")
+            raise Fog::AWS::Compute::Error.new("Illegal attribute '#{attribute}' specified")
           end
           response
         end
diff --git a/lib/fog/aws/requests/compute/describe_network_interfaces.rb b/lib/fog/aws/requests/compute/describe_network_interfaces.rb
index 47f67be78c..53191bfb39 100644
--- a/lib/fog/aws/requests/compute/describe_network_interfaces.rb
+++ b/lib/fog/aws/requests/compute/describe_network_interfaces.rb
@@ -57,7 +57,7 @@ def describe_network_interfaces(filters = {})
           request({
             'Action' => 'DescribeNetworkInterfaces',
             :idempotent => true,
-            :parser => Fog::Parsers::Compute::AWS::DescribeNetworkInterfaces.new
+            :parser => Fog::Parsers::AWS::Compute::DescribeNetworkInterfaces.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_placement_groups.rb b/lib/fog/aws/requests/compute/describe_placement_groups.rb
index a3f65418ba..495eb8c733 100644
--- a/lib/fog/aws/requests/compute/describe_placement_groups.rb
+++ b/lib/fog/aws/requests/compute/describe_placement_groups.rb
@@ -24,7 +24,7 @@ def describe_placement_groups(filters = {})
           request({
             'Action'    => 'DescribePlacementGroups',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribePlacementGroups.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribePlacementGroups.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_regions.rb b/lib/fog/aws/requests/compute/describe_regions.rb
index c0b34b5528..c622f2e796 100644
--- a/lib/fog/aws/requests/compute/describe_regions.rb
+++ b/lib/fog/aws/requests/compute/describe_regions.rb
@@ -27,7 +27,7 @@ def describe_regions(filters = {})
           request({
             'Action'    => 'DescribeRegions',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeRegions.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeRegions.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_reserved_instances.rb b/lib/fog/aws/requests/compute/describe_reserved_instances.rb
index e81d5f9b27..254870a2e7 100644
--- a/lib/fog/aws/requests/compute/describe_reserved_instances.rb
+++ b/lib/fog/aws/requests/compute/describe_reserved_instances.rb
@@ -40,7 +40,7 @@ def describe_reserved_instances(filters = {})
           request({
             'Action'    => 'DescribeReservedInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeReservedInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeReservedInstances.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb b/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb
index 1153928b8e..05a2a8653c 100644
--- a/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb
+++ b/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb
@@ -47,7 +47,7 @@ def describe_reserved_instances_offerings(filters = {})
           request({
             'Action'    => 'DescribeReservedInstancesOfferings',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeReservedInstancesOfferings.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeReservedInstancesOfferings.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_route_tables.rb b/lib/fog/aws/requests/compute/describe_route_tables.rb
index a4d737588c..7fad1c3e75 100644
--- a/lib/fog/aws/requests/compute/describe_route_tables.rb
+++ b/lib/fog/aws/requests/compute/describe_route_tables.rb
@@ -47,7 +47,7 @@ def describe_route_tables(filters = {})
           params = Fog::AWS.indexed_filters(filters)
           request({
             'Action'    => 'DescribeRouteTables',
-            :parser     => Fog::Parsers::Compute::AWS::DescribeRouteTables.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeRouteTables.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_security_groups.rb b/lib/fog/aws/requests/compute/describe_security_groups.rb
index c5ca9a66f9..42db2424db 100644
--- a/lib/fog/aws/requests/compute/describe_security_groups.rb
+++ b/lib/fog/aws/requests/compute/describe_security_groups.rb
@@ -38,7 +38,7 @@ def describe_security_groups(filters = {})
           request({
             'Action'    => 'DescribeSecurityGroups',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeSecurityGroups.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeSecurityGroups.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_snapshots.rb b/lib/fog/aws/requests/compute/describe_snapshots.rb
index dca6cda867..94405cd9ef 100644
--- a/lib/fog/aws/requests/compute/describe_snapshots.rb
+++ b/lib/fog/aws/requests/compute/describe_snapshots.rb
@@ -44,7 +44,7 @@ def describe_snapshots(filters = {}, options = {})
           request({
             'Action'    => 'DescribeSnapshots',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeSnapshots.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeSnapshots.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb b/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb
index 25e0ca9e1c..2253603168 100644
--- a/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb
+++ b/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb
@@ -24,7 +24,7 @@ def describe_spot_datafeed_subscription
           request({
             'Action'    => 'DescribeSpotDatafeedSubscription',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::SpotDatafeedSubscription.new
+            :parser     => Fog::Parsers::AWS::Compute::SpotDatafeedSubscription.new
           })
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb b/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb
index b24e4e336a..297c1d9dc4 100644
--- a/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb
+++ b/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb
@@ -37,7 +37,7 @@ def describe_spot_instance_requests(filters = {})
           request({
             'Action'    => 'DescribeSpotInstanceRequests',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::SpotInstanceRequests.new
+            :parser     => Fog::Parsers::AWS::Compute::SpotInstanceRequests.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_spot_price_history.rb b/lib/fog/aws/requests/compute/describe_spot_price_history.rb
index 9c4c14221f..ac7455455e 100644
--- a/lib/fog/aws/requests/compute/describe_spot_price_history.rb
+++ b/lib/fog/aws/requests/compute/describe_spot_price_history.rb
@@ -52,7 +52,7 @@ def describe_spot_price_history(filters = {})
           request({
             'Action'    => 'DescribeSpotPriceHistory',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeSpotPriceHistory.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeSpotPriceHistory.new
           }.merge!(params))
         end
       end
@@ -82,14 +82,14 @@ def describe_spot_price_history(filters = {})
           zones = params['AvailabilityZone']
           if (!zones.nil? && !all_zones.include?([*zones].shuffle.first))
             az_error = "InvalidParameterValue => Invalid availability zone: [#{zones}]"
-            raise Fog::Compute::AWS::Error, az_error
+            raise Fog::AWS::Compute::Error, az_error
           end
           zones = all_zones if zones.nil?
 
           max_results = params['MaxResults'] || Fog::Mock.random_numbers(3).to_i
           if !(max_results.is_a?(Integer) && max_results > 0)
             max_results_error = "InvalidParameterValue => Invalid value '#{max_results}' for maxResults"
-            raise Fog::Compute::AWS::Error, max_results_error
+            raise Fog::AWS::Compute::Error, max_results_error
           end
 
           all_instance_types = flavors.map { |f| f.id }
diff --git a/lib/fog/aws/requests/compute/describe_subnets.rb b/lib/fog/aws/requests/compute/describe_subnets.rb
index ff7554d942..3f99aee04d 100644
--- a/lib/fog/aws/requests/compute/describe_subnets.rb
+++ b/lib/fog/aws/requests/compute/describe_subnets.rb
@@ -37,7 +37,7 @@ def describe_subnets(filters = {})
           request({
             'Action'    => 'DescribeSubnets',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeSubnets.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeSubnets.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_tags.rb b/lib/fog/aws/requests/compute/describe_tags.rb
index 273db7c161..f4ccb806f3 100644
--- a/lib/fog/aws/requests/compute/describe_tags.rb
+++ b/lib/fog/aws/requests/compute/describe_tags.rb
@@ -25,7 +25,7 @@ def describe_tags(filters = {})
           request({
             'Action'    => 'DescribeTags',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeTags.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeTags.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_volume_status.rb b/lib/fog/aws/requests/compute/describe_volume_status.rb
index 7a8d57d200..454d317bd1 100644
--- a/lib/fog/aws/requests/compute/describe_volume_status.rb
+++ b/lib/fog/aws/requests/compute/describe_volume_status.rb
@@ -20,7 +20,7 @@ def describe_volume_status(filters = {})
           request({
             'Action'    => 'DescribeVolumeStatus',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeVolumeStatus.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeVolumeStatus.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_volumes.rb b/lib/fog/aws/requests/compute/describe_volumes.rb
index ae7b4ef43b..0f9f098f3a 100644
--- a/lib/fog/aws/requests/compute/describe_volumes.rb
+++ b/lib/fog/aws/requests/compute/describe_volumes.rb
@@ -40,7 +40,7 @@ def describe_volumes(filters = {})
           request({
             'Action'    => 'DescribeVolumes',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeVolumes.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeVolumes.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_volumes_modifications.rb b/lib/fog/aws/requests/compute/describe_volumes_modifications.rb
index 59e790a94f..1fdeca996d 100644
--- a/lib/fog/aws/requests/compute/describe_volumes_modifications.rb
+++ b/lib/fog/aws/requests/compute/describe_volumes_modifications.rb
@@ -34,7 +34,7 @@ def describe_volumes_modifications(filters = {})
           request({
             'Action'    => 'DescribeVolumesModifications',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeVolumesModifications.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeVolumesModifications.new
           }.merge(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_vpc_attribute.rb b/lib/fog/aws/requests/compute/describe_vpc_attribute.rb
index 011f2482e5..76aaa307b9 100644
--- a/lib/fog/aws/requests/compute/describe_vpc_attribute.rb
+++ b/lib/fog/aws/requests/compute/describe_vpc_attribute.rb
@@ -23,7 +23,7 @@ def describe_vpc_attribute(vpc_id, attribute)
             'Action'    => 'DescribeVpcAttribute',
             'VpcId'     => vpc_id,
             'Attribute' => attribute,
-            :parser     => Fog::Parsers::Compute::AWS::DescribeVpcAttribute.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeVpcAttribute.new
           )
         end
       end
@@ -42,11 +42,11 @@ def describe_vpc_attribute(vpc_id, attribute)
             when 'enableDnsSupport', 'enableDnsHostnames'
               response.body[attribute] = vpc[attribute]
             else
-              raise Fog::Compute::AWS::Error.new("Illegal attribute '#{attribute}' specified")
+              raise Fog::AWS::Compute::Error.new("Illegal attribute '#{attribute}' specified")
             end
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_vpc_classic_link.rb b/lib/fog/aws/requests/compute/describe_vpc_classic_link.rb
index 6a7f86436f..a612c58a20 100644
--- a/lib/fog/aws/requests/compute/describe_vpc_classic_link.rb
+++ b/lib/fog/aws/requests/compute/describe_vpc_classic_link.rb
@@ -26,7 +26,7 @@ def describe_vpc_classic_link(options={})
           params.merge!(Fog::AWS.indexed_filters(options[:filters])) if options[:filters]
           request({
             'Action'    => 'DescribeVpcClassicLink',
-            :parser     => Fog::Parsers::Compute::AWS::DescribeVpcClassicLink.new
+            :parser     => Fog::Parsers::AWS::Compute::DescribeVpcClassicLink.new
           }.merge(params))
         end
       end
@@ -38,7 +38,7 @@ def describe_vpc_classic_link(options={})
           if vpc_ids = options[:vpc_ids]
             vpcs = vpc_ids.collect do |vpc_id|
               vpc = vpcs.find{ |v| v['vpcId'] == vpc_id }
-              raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist") unless vpc
+              raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist") unless vpc
               vpc
             end
           end
diff --git a/lib/fog/aws/requests/compute/describe_vpc_classic_link_dns_support.rb b/lib/fog/aws/requests/compute/describe_vpc_classic_link_dns_support.rb
index dd1c7ffc85..8010e84a54 100644
--- a/lib/fog/aws/requests/compute/describe_vpc_classic_link_dns_support.rb
+++ b/lib/fog/aws/requests/compute/describe_vpc_classic_link_dns_support.rb
@@ -29,7 +29,7 @@ def describe_vpc_classic_link_dns_support(options={})
             'Action'     => 'DescribeVpcClassicLinkDnsSupport',
             'MaxResults' => options['MaxResults'],
             'NextToken'  => options['NextToken'],
-            :parser      => Fog::Parsers::Compute::AWS::DescribeVpcClassicLinkDnsSupport.new
+            :parser      => Fog::Parsers::AWS::Compute::DescribeVpcClassicLinkDnsSupport.new
           }.merge(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/describe_vpcs.rb b/lib/fog/aws/requests/compute/describe_vpcs.rb
index ef85a5416d..65c0a1eda7 100644
--- a/lib/fog/aws/requests/compute/describe_vpcs.rb
+++ b/lib/fog/aws/requests/compute/describe_vpcs.rb
@@ -33,7 +33,7 @@ def describe_vpcs(filters = {})
           request({
             'Action' => 'DescribeVpcs',
             :idempotent => true,
-            :parser => Fog::Parsers::Compute::AWS::DescribeVpcs.new
+            :parser => Fog::Parsers::AWS::Compute::DescribeVpcs.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/detach_classic_link_vpc.rb b/lib/fog/aws/requests/compute/detach_classic_link_vpc.rb
index 9e0e27df1d..a00e96df2f 100644
--- a/lib/fog/aws/requests/compute/detach_classic_link_vpc.rb
+++ b/lib/fog/aws/requests/compute/detach_classic_link_vpc.rb
@@ -24,7 +24,7 @@ def detach_classic_link_vpc(instance_id, vpc_id, dry_run=false)
             'VpcId'     => vpc_id,
             'InstanceId'=> instance_id,
             'DryRun'    => dry_run,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -47,9 +47,9 @@ def detach_classic_link_vpc(instance_id, vpc_id, dry_run=false)
             end
             response
           elsif !instance
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist.")
           elsif !vpc
-            raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist.")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/detach_internet_gateway.rb b/lib/fog/aws/requests/compute/detach_internet_gateway.rb
index 9ad8401b9f..26d8219fbb 100644
--- a/lib/fog/aws/requests/compute/detach_internet_gateway.rb
+++ b/lib/fog/aws/requests/compute/detach_internet_gateway.rb
@@ -22,7 +22,7 @@ def detach_internet_gateway(internet_gateway_id, vpc_id)
             'InternetGatewayId'    => internet_gateway_id,
             'VpcId'                => vpc_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::Compute::AWS::Basic.new
+            :parser       => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -43,7 +43,7 @@ def detach_internet_gateway(internet_gateway_id, vpc_id)
             elsif !vpc_id
               message << 'The request must contain the parameter vpc_id'
             end
-            raise Fog::Compute::AWS::Error.new(message)
+            raise Fog::AWS::Compute::Error.new(message)
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/detach_network_interface.rb b/lib/fog/aws/requests/compute/detach_network_interface.rb
index 05d8e77fa9..f1a585763d 100644
--- a/lib/fog/aws/requests/compute/detach_network_interface.rb
+++ b/lib/fog/aws/requests/compute/detach_network_interface.rb
@@ -21,7 +21,7 @@ def detach_network_interface(attachment_id, force = false)
             'Action'       => 'DetachNetworkInterface',
             'AttachmentId' => attachment_id,
             'Force'        => force,
-            :parser        => Fog::Parsers::Compute::AWS::Basic.new
+            :parser        => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -39,7 +39,7 @@ def detach_network_interface(attachment_id, force = false)
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The network interface '#{network_interface_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network interface '#{network_interface_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/detach_volume.rb b/lib/fog/aws/requests/compute/detach_volume.rb
index 6a26178044..350e684f24 100644
--- a/lib/fog/aws/requests/compute/detach_volume.rb
+++ b/lib/fog/aws/requests/compute/detach_volume.rb
@@ -29,7 +29,7 @@ def detach_volume(volume_id, options = {})
             'Action'    => 'DetachVolume',
             'VolumeId'  => volume_id,
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::DetachVolume.new
+            :parser     => Fog::Parsers::AWS::Compute::DetachVolume.new
           }.merge!(options))
         end
       end
@@ -49,10 +49,10 @@ def detach_volume(volume_id, options = {})
               response
             else
               # real response has spacing issue below
-              raise Fog::Compute::AWS::Error.new("IncorrectState => Volume '#{volume_id}'is in the 'available' state.")
+              raise Fog::AWS::Compute::Error.new("IncorrectState => Volume '#{volume_id}'is in the 'available' state.")
             end
           else
-            raise Fog::Compute::AWS::NotFound.new("The volume '#{volume_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The volume '#{volume_id}' does not exist.")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/disable_vpc_classic_link.rb b/lib/fog/aws/requests/compute/disable_vpc_classic_link.rb
index 231ba1bec8..78dc247f22 100644
--- a/lib/fog/aws/requests/compute/disable_vpc_classic_link.rb
+++ b/lib/fog/aws/requests/compute/disable_vpc_classic_link.rb
@@ -21,7 +21,7 @@ def disable_vpc_classic_link(vpc_id, dry_run=false)
             'Action'    => 'DisableVpcClassicLink',
             'VpcId'     => vpc_id,
             'DryRun'    => dry_run,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -38,7 +38,7 @@ def disable_vpc_classic_link(vpc_id, dry_run=false)
             vpc['classicLinkEnabled'] = false unless dry_run
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/disable_vpc_classic_link_dns_support.rb b/lib/fog/aws/requests/compute/disable_vpc_classic_link_dns_support.rb
index 110226fa26..4a3dd6370d 100644
--- a/lib/fog/aws/requests/compute/disable_vpc_classic_link_dns_support.rb
+++ b/lib/fog/aws/requests/compute/disable_vpc_classic_link_dns_support.rb
@@ -21,7 +21,7 @@ def disable_vpc_classic_link_dns_support(vpc_id)
           request(
             'Action' => 'DisableVpcClassicLinkDnsSupport',
             'VpcId'  => vpc_id,
-            :parser  => Fog::Parsers::Compute::AWS::Basic.new
+            :parser  => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -30,7 +30,7 @@ class Mock
         def disable_vpc_classic_link_dns_support(vpc_id)
           response = Excon::Response.new
           unless vpc = self.data[:vpcs].find { |v| v['vpcId'] == vpc_id }
-            raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist")
           end
           vpc['classicLinkDnsSupport'] = false
           response.body = {
diff --git a/lib/fog/aws/requests/compute/disassociate_address.rb b/lib/fog/aws/requests/compute/disassociate_address.rb
index 1b6c861886..1ada95bebe 100644
--- a/lib/fog/aws/requests/compute/disassociate_address.rb
+++ b/lib/fog/aws/requests/compute/disassociate_address.rb
@@ -23,7 +23,7 @@ def disassociate_address(public_ip=nil, association_id=nil)
             'PublicIp'      => public_ip,
             'AssociationId' => association_id,
             :idempotent     => true,
-            :parser         => Fog::Parsers::Compute::AWS::Basic.new
+            :parser         => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -34,7 +34,7 @@ def disassociate_address(public_ip, association_id=nil)
           response.status = 200
           if address = self.data[:addresses][public_ip]
             if address['allocationId'] && association_id.nil?
-              raise Fog::Compute::AWS::Error.new("InvalidParameterValue => You must specify an association id when unmapping an address from a VPC instance")
+              raise Fog::AWS::Compute::Error.new("InvalidParameterValue => You must specify an association id when unmapping an address from a VPC instance")
             end
             instance_id = address['instanceId']
             if instance = self.data[:instances][instance_id]
@@ -49,7 +49,7 @@ def disassociate_address(public_ip, association_id=nil)
             }
             response
           else
-            raise Fog::Compute::AWS::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
+            raise Fog::AWS::Compute::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/disassociate_route_table.rb b/lib/fog/aws/requests/compute/disassociate_route_table.rb
index 47f67c4681..15f8c0ab9e 100644
--- a/lib/fog/aws/requests/compute/disassociate_route_table.rb
+++ b/lib/fog/aws/requests/compute/disassociate_route_table.rb
@@ -20,7 +20,7 @@ def disassociate_route_table(association_id)
           request(
             'Action'        => 'DisassociateRouteTable',
             'AssociationId' => association_id,
-            :parser         => Fog::Parsers::Compute::AWS::Basic.new
+            :parser         => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -43,9 +43,9 @@ def disassociate_route_table(association_id)
             }
             response
           elsif assoc_array.nil?
-            raise Fog::Compute::AWS::NotFound.new("The association ID '#{association_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The association ID '#{association_id}' does not exist")
           elsif assoc_array['main'] == true
-            raise Fog::Compute::AWS::Error, "InvalidParameterValue => cannot disassociate the main route table association #{association_id}"
+            raise Fog::AWS::Compute::Error, "InvalidParameterValue => cannot disassociate the main route table association #{association_id}"
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/enable_vpc_classic_link.rb b/lib/fog/aws/requests/compute/enable_vpc_classic_link.rb
index f768942178..09b48c257e 100644
--- a/lib/fog/aws/requests/compute/enable_vpc_classic_link.rb
+++ b/lib/fog/aws/requests/compute/enable_vpc_classic_link.rb
@@ -21,7 +21,7 @@ def enable_vpc_classic_link(vpc_id, dry_run=false)
             'Action'    => 'EnableVpcClassicLink',
             'VpcId'     => vpc_id,
             'DryRun'    => dry_run,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -38,7 +38,7 @@ def enable_vpc_classic_link(vpc_id, dry_run=false)
             vpc['classicLinkEnabled'] = true unless dry_run
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/enable_vpc_classic_link_dns_support.rb b/lib/fog/aws/requests/compute/enable_vpc_classic_link_dns_support.rb
index dab557461f..78b5e038aa 100644
--- a/lib/fog/aws/requests/compute/enable_vpc_classic_link_dns_support.rb
+++ b/lib/fog/aws/requests/compute/enable_vpc_classic_link_dns_support.rb
@@ -21,7 +21,7 @@ def enable_vpc_classic_link_dns_support(vpc_id)
           request(
             'Action' => 'EnableVpcClassicLinkDnsSupport',
             'VpcId'  => vpc_id,
-            :parser  => Fog::Parsers::Compute::AWS::Basic.new
+            :parser  => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -30,7 +30,7 @@ class Mock
         def enable_vpc_classic_link_dns_support(vpc_id)
           response = Excon::Response.new
           unless vpc = self.data[:vpcs].find { |v| v['vpcId'] == vpc_id }
-            raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist")
           end
           vpc['classicLinkDnsSupport'] = true
           response.body = {
diff --git a/lib/fog/aws/requests/compute/get_console_output.rb b/lib/fog/aws/requests/compute/get_console_output.rb
index 0c63960732..eb1ed873b5 100644
--- a/lib/fog/aws/requests/compute/get_console_output.rb
+++ b/lib/fog/aws/requests/compute/get_console_output.rb
@@ -23,7 +23,7 @@ def get_console_output(instance_id)
             'Action'      => 'GetConsoleOutput',
             'InstanceId'  => instance_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::Compute::AWS::GetConsoleOutput.new
+            :parser       => Fog::Parsers::AWS::Compute::GetConsoleOutput.new
           )
         end
       end
@@ -41,7 +41,7 @@ def get_console_output(instance_id)
             }
             response
           else;
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/get_password_data.rb b/lib/fog/aws/requests/compute/get_password_data.rb
index 8db8a777cb..3ff001ca34 100644
--- a/lib/fog/aws/requests/compute/get_password_data.rb
+++ b/lib/fog/aws/requests/compute/get_password_data.rb
@@ -25,7 +25,7 @@ def get_password_data(instance_id)
             'Action'      => 'GetPasswordData',
             'InstanceId'  => instance_id,
             :idempotent   => true,
-            :parser       => Fog::Parsers::Compute::AWS::GetPasswordData.new
+            :parser       => Fog::Parsers::AWS::Compute::GetPasswordData.new
           )
         end
       end
@@ -43,7 +43,7 @@ def get_password_data(instance_id)
             }
             response
           else;
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/import_key_pair.rb b/lib/fog/aws/requests/compute/import_key_pair.rb
index ac8dbe1e55..6c8e093f72 100644
--- a/lib/fog/aws/requests/compute/import_key_pair.rb
+++ b/lib/fog/aws/requests/compute/import_key_pair.rb
@@ -23,7 +23,7 @@ def import_key_pair(key_name, public_key_material)
             'Action'  => 'ImportKeyPair',
             'KeyName' => key_name,
             'PublicKeyMaterial' => Base64::encode64(public_key_material),
-            :parser   => Fog::Parsers::Compute::AWS::ImportKeyPair.new
+            :parser   => Fog::Parsers::AWS::Compute::ImportKeyPair.new
           )
         end
       end
@@ -43,7 +43,7 @@ def import_key_pair(key_name, public_key_material)
             }.merge!(data)
             response
           else
-            raise Fog::Compute::AWS::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
+            raise Fog::AWS::Compute::Error.new("InvalidKeyPair.Duplicate => The keypair '#{key_name}' already exists.")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/modify_image_attribute.rb b/lib/fog/aws/requests/compute/modify_image_attribute.rb
index 1eca49b55f..841a454f46 100644
--- a/lib/fog/aws/requests/compute/modify_image_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_image_attribute.rb
@@ -31,7 +31,7 @@ def modify_image_attribute(image_id, attributes)
             'Action'        => 'ModifyImageAttribute',
             'ImageId'       => image_id,
             :idempotent     => true,
-            :parser         => Fog::Parsers::Compute::AWS::Basic.new
+            :parser         => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(params))
         end
       end
@@ -41,7 +41,7 @@ def modify_image_attribute(image_id, attributes)
           raise ArgumentError.new("image_id is required") unless image_id
 
           unless self.data[:images][image_id]
-            raise Fog::Compute::AWS::NotFound.new("The AMI ID '#{image_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The AMI ID '#{image_id}' does not exist")
           end
 
           (attributes['Add.UserId'] || []).each do |user_id|
diff --git a/lib/fog/aws/requests/compute/modify_instance_attribute.rb b/lib/fog/aws/requests/compute/modify_instance_attribute.rb
index de18e0b948..082b27d9fd 100644
--- a/lib/fog/aws/requests/compute/modify_instance_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_instance_attribute.rb
@@ -28,7 +28,7 @@ def modify_instance_attribute(instance_id, attributes)
             'Action'        => 'ModifyInstanceAttribute',
             'InstanceId'    => instance_id,
             :idempotent     => true,
-            :parser         => Fog::Parsers::Compute::AWS::Basic.new
+            :parser         => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(params))
         end
 
diff --git a/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb b/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb
index 8d6840eb43..5368d30bcb 100644
--- a/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb
@@ -31,13 +31,13 @@ def modify_network_interface_attribute(network_interface_id, attribute, value)
             params['Attachment.AttachmentId']        = value['attachmentId']
             params['Attachment.DeleteOnTermination'] = value['deleteOnTermination']
           else
-            raise Fog::Compute::AWS::Error.new("Illegal attribute '#{attribute}' specified")
+            raise Fog::AWS::Compute::Error.new("Illegal attribute '#{attribute}' specified")
           end
 
           request({
             'Action'             => 'ModifyNetworkInterfaceAttribute',
             'NetworkInterfaceId' => network_interface_id,
-            :parser              => Fog::Parsers::Compute::AWS::Basic.new
+            :parser              => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(params))
         end
       end
@@ -56,7 +56,7 @@ def modify_network_interface_attribute(network_interface_id, attribute, value)
               value.each do |group_id|
                 security_group = self.data[:security_groups][group_id]
                 if security_group.nil?
-                  raise Fog::Compute::AWS::Error.new("Unknown security group '#{group_id}' specified")
+                  raise Fog::AWS::Compute::Error.new("Unknown security group '#{group_id}' specified")
                 end
                 groups[group_id] = security_group['groupName']
               end
@@ -65,11 +65,11 @@ def modify_network_interface_attribute(network_interface_id, attribute, value)
               nic['sourceDestCheck'] = value
             when 'attachment'
               if nic['attachment'].nil? || value['attachmentId'] != nic['attachment']['attachmentId']
-                raise Fog::Compute::AWS::Error.new("Illegal attachment '#{value['attachmentId']}' specified")
+                raise Fog::AWS::Compute::Error.new("Illegal attachment '#{value['attachmentId']}' specified")
               end
               nic['attachment']['deleteOnTermination'] = value['deleteOnTermination']
             else
-              raise Fog::Compute::AWS::Error.new("Illegal attribute '#{attribute}' specified")
+              raise Fog::AWS::Compute::Error.new("Illegal attribute '#{attribute}' specified")
             end
 
             response.status = 200
@@ -80,7 +80,7 @@ def modify_network_interface_attribute(network_interface_id, attribute, value)
 
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The network interface '#{network_interface_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network interface '#{network_interface_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb b/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb
index da6923c6df..639167beb0 100644
--- a/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb
@@ -26,7 +26,7 @@ def modify_snapshot_attribute(snapshot_id, attributes)
             'Action'        => 'ModifySnapshotAttribute',
             'SnapshotId'    => snapshot_id,
             :idempotent     => true,
-            :parser         => Fog::Parsers::Compute::AWS::Basic.new
+            :parser         => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/modify_subnet_attribute.rb b/lib/fog/aws/requests/compute/modify_subnet_attribute.rb
index 9499f73faa..bf3f2c8487 100644
--- a/lib/fog/aws/requests/compute/modify_subnet_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_subnet_attribute.rb
@@ -26,7 +26,7 @@ def modify_subnet_attribute(subnet_id, options = {})
           request({
             'Action' => 'ModifySubnetAttribute',
             'SubnetId' => subnet_id,
-            :parser => Fog::Parsers::Compute::AWS::ModifySubnetAttribute.new
+            :parser => Fog::Parsers::AWS::Compute::ModifySubnetAttribute.new
           }.merge(params))
         end
       end
diff --git a/lib/fog/aws/requests/compute/modify_volume.rb b/lib/fog/aws/requests/compute/modify_volume.rb
index 72f211aced..552839f31f 100644
--- a/lib/fog/aws/requests/compute/modify_volume.rb
+++ b/lib/fog/aws/requests/compute/modify_volume.rb
@@ -32,7 +32,7 @@ def modify_volume(volume_id, options={})
           request({
             'Action'   => "ModifyVolume",
             'VolumeId' => volume_id,
-            :parser    => Fog::Parsers::Compute::AWS::ModifyVolume.new
+            :parser    => Fog::Parsers::AWS::Compute::ModifyVolume.new
           }.merge(options))
         end
       end
@@ -43,7 +43,7 @@ def modify_volume(volume_id, options={})
           volume   = self.data[:volumes][volume_id]
 
           if volume["volumeType"] == 'standard' && options['VolumeType']
-            raise Fog::Compute::AWS::Error.new("InvalidParameterValue => Volume type EBS Magnetic is not supported.")
+            raise Fog::AWS::Compute::Error.new("InvalidParameterValue => Volume type EBS Magnetic is not supported.")
           end
 
           volume_modification = {
@@ -69,7 +69,7 @@ def modify_volume(volume_id, options={})
 
           if options['VolumeType']
             if options["VolumeType"] == 'standard'
-              raise Fog::Compute::AWS::Error.new("InvalidParameterValue => Volume type EBS Magnetic is not supported.")
+              raise Fog::AWS::Compute::Error.new("InvalidParameterValue => Volume type EBS Magnetic is not supported.")
             end
             volume_modification.merge!(
               'originalVolumeType' => volume['volumeType'],
diff --git a/lib/fog/aws/requests/compute/modify_volume_attribute.rb b/lib/fog/aws/requests/compute/modify_volume_attribute.rb
index 95047c0716..0d3eb7f2f7 100644
--- a/lib/fog/aws/requests/compute/modify_volume_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_volume_attribute.rb
@@ -23,7 +23,7 @@ def modify_volume_attribute(volume_id=nil, auto_enable_io_value=false)
             'VolumeId'           => volume_id,
             'AutoEnableIO.Value' => auto_enable_io_value,
             :idempotent          => true,
-            :parser              => Fog::Parsers::Compute::AWS::Basic.new
+            :parser              => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -39,7 +39,7 @@ def modify_volume_attribute(volume_id=nil, auto_enable_io_value=false)
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The volume '#{volume_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The volume '#{volume_id}' does not exist.")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/modify_vpc_attribute.rb b/lib/fog/aws/requests/compute/modify_vpc_attribute.rb
index 85626210a5..a1799c6a76 100644
--- a/lib/fog/aws/requests/compute/modify_vpc_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_vpc_attribute.rb
@@ -27,7 +27,7 @@ def modify_vpc_attribute(vpc_id, options = {})
             'Action'             => 'ModifyVpcAttribute',
             'VpcId'              => vpc_id,
             :idempotent          => true,
-            :parser              => Fog::Parsers::Compute::AWS::Basic.new
+            :parser              => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(options))
         end
       end
@@ -36,9 +36,9 @@ class Mock
         def modify_vpc_attribute(vpc_id, options = {})
           response = Excon::Response.new
           if options.size == 0
-            raise Fog::Compute::AWS::Error.new("InvalidParameterCombination => No attributes specified.")
+            raise Fog::AWS::Compute::Error.new("InvalidParameterCombination => No attributes specified.")
           elsif options.size > 1
-            raise Fog::Compute::AWS::Error.new("InvalidParameterCombination =>  InvalidParameterCombination => Fields for multiple attribute types specified: #{options.keys.join(', ')}")
+            raise Fog::AWS::Compute::Error.new("InvalidParameterCombination =>  InvalidParameterCombination => Fields for multiple attribute types specified: #{options.keys.join(', ')}")
           elsif vpc = self.data[:vpcs].find{ |v| v['vpcId'] == vpc_id }
             response.status = 200
             response.body = {
@@ -53,11 +53,11 @@ def modify_vpc_attribute(vpc_id, options = {})
             when 'EnableDnsHostnames.Value'
               vpc['enableDnsHostnames'] = options[attribute]
             else
-              raise Fog::Compute::AWS::Error.new("Illegal attribute '#{attribute}' specified")
+              raise Fog::AWS::Compute::Error.new("Illegal attribute '#{attribute}' specified")
             end
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist.")
+            raise Fog::AWS::Compute::NotFound.new("The VPC '#{vpc_id}' does not exist.")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/monitor_instances.rb b/lib/fog/aws/requests/compute/monitor_instances.rb
index 8ff778144a..a8ae27545a 100644
--- a/lib/fog/aws/requests/compute/monitor_instances.rb
+++ b/lib/fog/aws/requests/compute/monitor_instances.rb
@@ -22,7 +22,7 @@ def monitor_instances(instance_ids)
           request({
                           'Action' => 'MonitorInstances',
                           :idempotent => true,
-                          :parser => Fog::Parsers::Compute::AWS::MonitorUnmonitorInstances.new
+                          :parser => Fog::Parsers::AWS::Compute::MonitorUnmonitorInstances.new
                   }.merge!(params))
         end
       end
@@ -35,7 +35,7 @@ def monitor_instances(instance_ids)
             if instance = self.data[:instances][instance_id]
               instance['monitoring']['state'] = 'enabled'
             else
-              raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_ids}' does not exist")
+              raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_ids}' does not exist")
             end
           end
           instances_set = [*instance_ids].reduce([]) { |memo, id| memo << {'instanceId' => id, 'monitoring' => 'enabled'} }
diff --git a/lib/fog/aws/requests/compute/move_address_to_vpc.rb b/lib/fog/aws/requests/compute/move_address_to_vpc.rb
index 80f9a34508..f23e656670 100644
--- a/lib/fog/aws/requests/compute/move_address_to_vpc.rb
+++ b/lib/fog/aws/requests/compute/move_address_to_vpc.rb
@@ -18,7 +18,7 @@ def move_address_to_vpc(public_ip)
             'Action' => 'MoveAddressToVpc',
             'PublicIp' => public_ip,
             :idempotent => true,
-            :parser => Fog::Parsers::Compute::AWS::MoveAddressToVpc.new
+            :parser => Fog::Parsers::AWS::Compute::MoveAddressToVpc.new
           )
         end
       end
@@ -43,7 +43,7 @@ def move_address_to_vpc(public_ip)
 
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("Address does not exist")
+            raise Fog::AWS::Compute::NotFound.new("Address does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb b/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb
index e5cad5c344..8f2cf3ae50 100644
--- a/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb
+++ b/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb
@@ -23,7 +23,7 @@ def purchase_reserved_instances_offering(reserved_instances_offering_id, instanc
             'ReservedInstancesOfferingId' => reserved_instances_offering_id,
             'InstanceCount'               => instance_count,
             :idempotent                   => true,
-            :parser                       => Fog::Parsers::Compute::AWS::PurchaseReservedInstancesOffering.new
+            :parser                       => Fog::Parsers::AWS::Compute::PurchaseReservedInstancesOffering.new
           })
         end
       end
diff --git a/lib/fog/aws/requests/compute/reboot_instances.rb b/lib/fog/aws/requests/compute/reboot_instances.rb
index b68b626819..5214337316 100644
--- a/lib/fog/aws/requests/compute/reboot_instances.rb
+++ b/lib/fog/aws/requests/compute/reboot_instances.rb
@@ -21,7 +21,7 @@ def reboot_instances(instance_id = [])
           request({
             'Action'    => 'RebootInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(params))
         end
       end
@@ -41,7 +41,7 @@ def reboot_instances(instance_id = [])
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The instance ID #{instance_id.inspect} does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID #{instance_id.inspect} does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/register_image.rb b/lib/fog/aws/requests/compute/register_image.rb
index 032653f108..5db3433c2d 100644
--- a/lib/fog/aws/requests/compute/register_image.rb
+++ b/lib/fog/aws/requests/compute/register_image.rb
@@ -39,7 +39,7 @@ def register_image(name, description, location, block_devices=[], options={})
             'Action'      => 'RegisterImage',
             'Name'        => name,
             'Description' => description,
-            :parser       => Fog::Parsers::Compute::AWS::RegisterImage.new
+            :parser       => Fog::Parsers::AWS::Compute::RegisterImage.new
           }
 
           # This determines if we are doing a snapshot or a S3 backed AMI.
@@ -124,7 +124,7 @@ def register_image(name, description, location, block_devices=[], options={})
             if name.empty?
               message << 'The request must contain the parameter name'
             end
-            raise Fog::Compute::AWS::Error.new(message)
+            raise Fog::AWS::Compute::Error.new(message)
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/release_address.rb b/lib/fog/aws/requests/compute/release_address.rb
index 2219b98952..0909bb3443 100644
--- a/lib/fog/aws/requests/compute/release_address.rb
+++ b/lib/fog/aws/requests/compute/release_address.rb
@@ -26,7 +26,7 @@ def release_address(ip_or_allocation)
             'Action'    => 'ReleaseAddress',
             field       => ip_or_allocation,
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -39,7 +39,7 @@ def release_address(public_ip_or_allocation_id)
 
           if address
             if address['allocationId'] && public_ip_or_allocation_id == address['publicIp']
-              raise Fog::Compute::AWS::Error, "InvalidParameterValue => You must specify an allocation id when releasing a VPC elastic IP address"
+              raise Fog::AWS::Compute::Error, "InvalidParameterValue => You must specify an allocation id when releasing a VPC elastic IP address"
             end
 
             self.data[:addresses].delete(address['publicIp'])
@@ -50,7 +50,7 @@ def release_address(public_ip_or_allocation_id)
             }
             response
           else
-            raise Fog::Compute::AWS::Error.new("AuthFailure => The address '#{public_ip_or_allocation_id}' does not belong to you.")
+            raise Fog::AWS::Compute::Error.new("AuthFailure => The address '#{public_ip_or_allocation_id}' does not belong to you.")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/replace_network_acl_association.rb b/lib/fog/aws/requests/compute/replace_network_acl_association.rb
index 9be55a5fe8..e73a6ec560 100644
--- a/lib/fog/aws/requests/compute/replace_network_acl_association.rb
+++ b/lib/fog/aws/requests/compute/replace_network_acl_association.rb
@@ -22,7 +22,7 @@ def replace_network_acl_association(association_id, network_acl_id)
             'Action'        => 'ReplaceNetworkAclAssociation',
             'AssociationId' => association_id,
             'NetworkAclId'  => network_acl_id,
-            :parser         => Fog::Parsers::Compute::AWS::ReplaceNetworkAclAssociation.new
+            :parser         => Fog::Parsers::AWS::Compute::ReplaceNetworkAclAssociation.new
           })
         end
       end
@@ -37,7 +37,7 @@ def replace_network_acl_association(association_id, network_acl_id)
             end
 
             unless old_nacl
-              raise Fog::Compute::AWS::Error.new("Invalid association_id #{association_id}")
+              raise Fog::AWS::Compute::Error.new("Invalid association_id #{association_id}")
             end
 
             subnet_id = old_nacl['associationSet'].find { |assoc| assoc['networkAclAssociationId'] == association_id }['subnetId']
@@ -57,7 +57,7 @@ def replace_network_acl_association(association_id, network_acl_id)
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/replace_network_acl_entry.rb b/lib/fog/aws/requests/compute/replace_network_acl_entry.rb
index e434c6f601..66b18c0d28 100644
--- a/lib/fog/aws/requests/compute/replace_network_acl_entry.rb
+++ b/lib/fog/aws/requests/compute/replace_network_acl_entry.rb
@@ -35,7 +35,7 @@ def replace_network_acl_entry(network_acl_id, rule_number, protocol, rule_action
             'RuleAction'   => rule_action,
             'Egress'       => egress,
             'CidrBlock'    => cidr_block,
-            :parser        => Fog::Parsers::Compute::AWS::Basic.new
+            :parser        => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(options))
         end
       end
@@ -46,7 +46,7 @@ def replace_network_acl_entry(network_acl_id, rule_number, protocol, rule_action
           if self.data[:network_acls][network_acl_id]
 
             unless self.data[:network_acls][network_acl_id]['entrySet'].find { |r| r['ruleNumber'] == rule_number && r['egress'] == egress }
-              raise Fog::Compute::AWS::Error.new("No rule with that number")
+              raise Fog::AWS::Compute::Error.new("No rule with that number")
             end
             self.data[:network_acls][network_acl_id]['entrySet'].delete_if { |r| r['ruleNumber'] == rule_number && r['egress'] == egress }
 
@@ -72,7 +72,7 @@ def replace_network_acl_entry(network_acl_id, rule_number, protocol, rule_action
             }
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/replace_route.rb b/lib/fog/aws/requests/compute/replace_route.rb
index d40144cac3..52c1b49592 100644
--- a/lib/fog/aws/requests/compute/replace_route.rb
+++ b/lib/fog/aws/requests/compute/replace_route.rb
@@ -28,7 +28,7 @@ def replace_route(route_table_id, destination_cidr_block, options = {})
             'Action' => 'ReplaceRoute',
             'RouteTableId' => route_table_id,
             :idempotent => true,
-            :parser => Fog::Parsers::Compute::AWS::Basic.new
+            :parser => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(options))
         end
       end
@@ -42,13 +42,13 @@ def replace_route(route_table_id, destination_cidr_block, options = {})
           if !route_table.nil? && destination_cidr_block
             if !options['gatewayId'].nil? || !options['instanceId'].nil? || !options['networkInterfaceId'].nil?
               if !options['gatewayId'].nil? && self.internet_gateways.all('internet-gateway-id'=>options['gatewayId']).first.nil?
-                raise Fog::Compute::AWS::NotFound.new("The gateway ID '#{options['gatewayId']}' does not exist")
+                raise Fog::AWS::Compute::NotFound.new("The gateway ID '#{options['gatewayId']}' does not exist")
               elsif !options['instanceId'].nil? && self.servers.all('instance-id'=>options['instanceId']).first.nil?
-                raise Fog::Compute::AWS::NotFound.new("The instance ID '#{options['instanceId']}' does not exist")
+                raise Fog::AWS::Compute::NotFound.new("The instance ID '#{options['instanceId']}' does not exist")
               elsif !options['networkInterfaceId'].nil? && self.network_interfaces.all('networkInterfaceId'=>options['networkInterfaceId']).first.nil?
-                raise Fog::Compute::AWS::NotFound.new("The networkInterface ID '#{options['networkInterfaceId']}' does not exist")
+                raise Fog::AWS::Compute::NotFound.new("The networkInterface ID '#{options['networkInterfaceId']}' does not exist")
               elsif route_table['routeSet'].find { |route| route['destinationCidrBlock'].eql? destination_cidr_block }.nil?
-                raise Fog::Compute::AWS::Error, "RouteAlreadyExists => The route identified by #{destination_cidr_block} doesn't exist."
+                raise Fog::AWS::Compute::Error, "RouteAlreadyExists => The route identified by #{destination_cidr_block} doesn't exist."
               else
                 response = Excon::Response.new
                 route_set = route_table['routeSet'].find { |routeset| routeset['destinationCidrBlock'].eql? destination_cidr_block }
@@ -66,12 +66,12 @@ def replace_route(route_table_id, destination_cidr_block, options = {})
             else
               message = 'MissingParameter => '
               message << 'The request must contain either a gateway id, a network interface id, or an instance id'
-              raise Fog::Compute::AWS::Error.new(message)
+              raise Fog::AWS::Compute::Error.new(message)
             end
           elsif route_table.nil?
-            raise Fog::Compute::AWS::NotFound.new("The routeTable ID '#{route_table_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The routeTable ID '#{route_table_id}' does not exist")
           elsif destination_cidr_block.empty?
-            raise Fog::Compute::AWS::InvalidParameterValue.new("Value () for parameter destinationCidrBlock is invalid. This is not a valid CIDR block.")
+            raise Fog::AWS::Compute::InvalidParameterValue.new("Value () for parameter destinationCidrBlock is invalid. This is not a valid CIDR block.")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/request_spot_instances.rb b/lib/fog/aws/requests/compute/request_spot_instances.rb
index 56a7016488..e0c36dc598 100644
--- a/lib/fog/aws/requests/compute/request_spot_instances.rb
+++ b/lib/fog/aws/requests/compute/request_spot_instances.rb
@@ -87,7 +87,7 @@ def request_spot_instances(image_id, instance_type, spot_price, options = {})
             'LaunchSpecification.ImageId'       => image_id,
             'LaunchSpecification.InstanceType'  => instance_type,
             'SpotPrice'                         => spot_price,
-            :parser                             => Fog::Parsers::Compute::AWS::SpotInstanceRequests.new
+            :parser                             => Fog::Parsers::AWS::Compute::SpotInstanceRequests.new
           }.merge!(options))
         end
       end
@@ -103,19 +103,19 @@ def request_spot_instances(image_id, instance_type, spot_price, options = {})
             all_instance_types = flavors.map { |f| f.id }
             if !all_instance_types.include?(instance_type)
               message = "InvalidParameterValue => Invalid value '#{instance_type}' for InstanceType."
-              raise Fog::Compute::AWS::Error.new(message)
+              raise Fog::AWS::Compute::Error.new(message)
             end
 
             spot_price = spot_price.to_f
             if !(spot_price > 0)
               message = "InvalidParameterValue => Value (#{spot_price}) for parameter price is invalid."
               message << " \"#{spot_price}\" is an invalid spot instance price"
-              raise Fog::Compute::AWS::Error.new(message)
+              raise Fog::AWS::Compute::Error.new(message)
             end
 
             if !image_id.match(/^ami-[a-f0-9]{8}$/)
               message = "The image id '[#{image_id}]' does not exist"
-              raise Fog::Compute::AWS::NotFound.new(message)
+              raise Fog::AWS::Compute::NotFound.new(message)
             end
 
           else
@@ -128,7 +128,7 @@ def request_spot_instances(image_id, instance_type, spot_price, options = {})
             else
               message << 'spot_price'
             end
-            raise Fog::Compute::AWS::Error.new(message)
+            raise Fog::AWS::Compute::Error.new(message)
           end
 
           for key in %w(AvailabilityZoneGroup LaunchGroup)
diff --git a/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb b/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb
index a4790bcedb..cb64f71090 100644
--- a/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb
+++ b/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb
@@ -19,13 +19,13 @@ class Real
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2012-03-01/APIReference/ApiReference-query-DescribeNetworkInterfaceAttribute.html]
         def reset_network_interface_attribute(network_interface_id, attribute)
           if attribute != 'sourceDestCheck'
-            raise Fog::Compute::AWS::Error.new("Illegal attribute '#{attribute}' specified")
+            raise Fog::AWS::Compute::Error.new("Illegal attribute '#{attribute}' specified")
           end
           request(
             'Action'             => 'ResetNetworkInterfaceAttribute',
             'NetworkInterfaceId' => network_interface_id,
             'Attribute'          => attribute,
-            :parser              => Fog::Parsers::Compute::AWS::Basic.new
+            :parser              => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
       end
@@ -43,11 +43,11 @@ def reset_network_interface_attribute(network_interface_id, attribute)
             if attribute == 'sourceDestCheck'
               self.data[:network_interfaces][network_interface_id]['sourceDestCheck'] = true
             else
-              raise Fog::Compute::AWS::Error.new("Illegal attribute '#{attribute}' specified")
+              raise Fog::AWS::Compute::Error.new("Illegal attribute '#{attribute}' specified")
             end
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The network interface '#{network_interface_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The network interface '#{network_interface_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/restore_address_to_classic.rb b/lib/fog/aws/requests/compute/restore_address_to_classic.rb
index 345e5ca494..0696c0fcc9 100644
--- a/lib/fog/aws/requests/compute/restore_address_to_classic.rb
+++ b/lib/fog/aws/requests/compute/restore_address_to_classic.rb
@@ -18,7 +18,7 @@ def restore_address_to_classic(public_ip)
             'Action' => 'RestoreAddressToClassic',
             'PublicIp' => public_ip,
             :idempotent => true,
-            :parser => Fog::Parsers::Compute::AWS::RestoreAddressToClassic.new
+            :parser => Fog::Parsers::AWS::Compute::RestoreAddressToClassic.new
           )
         end
       end
@@ -31,7 +31,7 @@ def restore_address_to_classic(public_ip)
 
           if address
             if address[:origin] == 'vpc'
-              raise Fog::Compute::AWS::Error.new("InvalidState => You cannot migrate an Elastic IP address that was originally allocated for use in EC2-VPC to EC2-Classic.")
+              raise Fog::AWS::Compute::Error.new("InvalidState => You cannot migrate an Elastic IP address that was originally allocated for use in EC2-VPC to EC2-Classic.")
             end
 
             address['domain']       = 'standard'
@@ -46,7 +46,7 @@ def restore_address_to_classic(public_ip)
 
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("Address does not exist")
+            raise Fog::AWS::Compute::NotFound.new("Address does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/revoke_security_group_egress.rb b/lib/fog/aws/requests/compute/revoke_security_group_egress.rb
index 94ed7a684f..b62f42998f 100644
--- a/lib/fog/aws/requests/compute/revoke_security_group_egress.rb
+++ b/lib/fog/aws/requests/compute/revoke_security_group_egress.rb
@@ -49,7 +49,7 @@ def revoke_security_group_egress(group_name, options = {})
           request({
             'Action'    => 'RevokeSecurityGroupEgress',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(options))
         end
       end
@@ -61,7 +61,7 @@ def revoke_security_group_egress(group_name, options = {})
           group = self.data[:security_groups].values.find { |v| v['groupName'] == group_name }
 
           group ||
-            raise(Fog::Compute::AWS::NotFound.new("The security group '#{group_name}' does not exist"))
+            raise(Fog::AWS::Compute::NotFound.new("The security group '#{group_name}' does not exist"))
           response = Excon::Response.new
 
           verify_permission_options(options, group['vpcId'] != nil)
diff --git a/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb b/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb
index 4c403c57d5..a0fd784db7 100644
--- a/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb
+++ b/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb
@@ -49,7 +49,7 @@ def revoke_security_group_ingress(group_name, options = {})
           request({
             'Action'    => 'RevokeSecurityGroupIngress',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            :parser     => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(options))
         end
       end
@@ -60,7 +60,7 @@ def revoke_security_group_ingress(group_name, options = {})
           group = self.data[:security_groups].values.find { |v| v['groupName'] == group_name }
 
           group ||
-            raise(Fog::Compute::AWS::NotFound.new("The security group '#{group_name}' does not exist"))
+            raise(Fog::AWS::Compute::NotFound.new("The security group '#{group_name}' does not exist"))
           response = Excon::Response.new
 
           verify_permission_options(options, group['vpcId'] != nil)
diff --git a/lib/fog/aws/requests/compute/run_instances.rb b/lib/fog/aws/requests/compute/run_instances.rb
index c92f9dc4ce..701d063d9d 100644
--- a/lib/fog/aws/requests/compute/run_instances.rb
+++ b/lib/fog/aws/requests/compute/run_instances.rb
@@ -142,7 +142,7 @@ def run_instances(image_id, min_count, max_count, options = {})
             'MinCount'  => min_count,
             'MaxCount'  => max_count,
             :idempotent => idempotent,
-            :parser     => Fog::Parsers::Compute::AWS::RunInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::RunInstances.new
           }.merge!(options))
         end
       end
@@ -157,7 +157,7 @@ def run_instances(image_id, min_count, max_count, options = {})
           reservation_id = Fog::AWS::Mock.reservation_id
 
           if options['KeyName'] && describe_key_pairs('key-name' => options['KeyName']).body['keySet'].empty?
-            raise Fog::Compute::AWS::NotFound.new("The key pair '#{options['KeyName']}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The key pair '#{options['KeyName']}' does not exist")
           end
 
           min_count.times do |i|
diff --git a/lib/fog/aws/requests/compute/start_instances.rb b/lib/fog/aws/requests/compute/start_instances.rb
index d764e22627..9c0d0c4286 100644
--- a/lib/fog/aws/requests/compute/start_instances.rb
+++ b/lib/fog/aws/requests/compute/start_instances.rb
@@ -21,7 +21,7 @@ def start_instances(instance_id)
           request({
             'Action'    => 'StartInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::StartStopInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::StartStopInstances.new
           }.merge!(params))
         end
       end
@@ -35,7 +35,7 @@ def start_instances(instance_id)
           instance_set = instance_set.select {|x| instance_ids.include?(x["instanceId"]) }
 
           if instance_set.empty?
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_ids.first}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_ids.first}' does not exist")
           else
             response = Excon::Response.new
             response.status = 200
diff --git a/lib/fog/aws/requests/compute/stop_instances.rb b/lib/fog/aws/requests/compute/stop_instances.rb
index 5b3ce2235e..9d3145b66c 100644
--- a/lib/fog/aws/requests/compute/stop_instances.rb
+++ b/lib/fog/aws/requests/compute/stop_instances.rb
@@ -22,7 +22,7 @@ def stop_instances(instance_id, force = false)
           request({
             'Action'    => 'StopInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::StartStopInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::StartStopInstances.new
           }.merge!(params))
         end
       end
@@ -36,7 +36,7 @@ def stop_instances(instance_id, force = false)
           instance_set = instance_set.select {|x| instance_ids.include?(x["instanceId"]) }
 
           if instance_set.empty?
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_ids.first}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_ids.first}' does not exist")
           else
             response = Excon::Response.new
             response.status = 200
diff --git a/lib/fog/aws/requests/compute/terminate_instances.rb b/lib/fog/aws/requests/compute/terminate_instances.rb
index 45de70cc22..dd81596012 100644
--- a/lib/fog/aws/requests/compute/terminate_instances.rb
+++ b/lib/fog/aws/requests/compute/terminate_instances.rb
@@ -28,7 +28,7 @@ def terminate_instances(instance_id)
           request({
             'Action'    => 'TerminateInstances',
             :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::TerminateInstances.new
+            :parser     => Fog::Parsers::AWS::Compute::TerminateInstances.new
           }.merge!(params))
         end
       end
@@ -85,7 +85,7 @@ def terminate_instances(instance_id)
 
             response
           else
-            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist")
           end
         end
       end
diff --git a/lib/fog/aws/requests/compute/unmonitor_instances.rb b/lib/fog/aws/requests/compute/unmonitor_instances.rb
index 9b02308f58..907eb965a6 100644
--- a/lib/fog/aws/requests/compute/unmonitor_instances.rb
+++ b/lib/fog/aws/requests/compute/unmonitor_instances.rb
@@ -22,7 +22,7 @@ def unmonitor_instances(instance_ids)
           request({
                           'Action' => 'UnmonitorInstances',
                           :idempotent => true,
-                          :parser => Fog::Parsers::Compute::AWS::MonitorUnmonitorInstances.new
+                          :parser => Fog::Parsers::AWS::Compute::MonitorUnmonitorInstances.new
                   }.merge!(params))
         end
       end
@@ -35,7 +35,7 @@ def unmonitor_instances(instance_ids)
             if instance = self.data[:instances][instance_id]
               instance['monitoring']['state'] = 'enabled'
             else
-              raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_ids}' does not exist")
+              raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_ids}' does not exist")
             end
           end
           instances_set = [*instance_ids].reduce([]) { |memo, id| memo << {'instanceId' => id, 'monitoring' => 'disabled'} }
diff --git a/lib/fog/aws/requests/elb/create_load_balancer.rb b/lib/fog/aws/requests/elb/create_load_balancer.rb
index 2df33a9f84..8dd3578f15 100644
--- a/lib/fog/aws/requests/elb/create_load_balancer.rb
+++ b/lib/fog/aws/requests/elb/create_load_balancer.rb
@@ -80,7 +80,7 @@ def create_load_balancer(availability_zones, lb_name, listeners = [], options =
                    elsif subnet_ids.any?
                      # using Hash here for Rubt 1.8.7 support.
                      Hash[
-                       Fog::Compute::AWS::Mock.data.select do |_, region_data|
+                       Fog::AWS::Compute::Mock.data.select do |_, region_data|
                          region_data[@aws_access_key_id][:subnets].any? do |region_subnets|
                            subnet_ids.include? region_subnets['subnetId']
                          end
@@ -89,8 +89,8 @@ def create_load_balancer(availability_zones, lb_name, listeners = [], options =
                    else
                      'us-east-1'
                    end
-          supported_platforms = Fog::Compute::AWS::Mock.data[region][@aws_access_key_id][:account_attributes].find { |h| h["attributeName"] == "supported-platforms" }["values"]
-          subnets = Fog::Compute::AWS::Mock.data[region][@aws_access_key_id][:subnets].select {|e| subnet_ids.include?(e["subnetId"]) }
+          supported_platforms = Fog::AWS::Compute::Mock.data[region][@aws_access_key_id][:account_attributes].find { |h| h["attributeName"] == "supported-platforms" }["values"]
+          subnets = Fog::AWS::Compute::Mock.data[region][@aws_access_key_id][:subnets].select {|e| subnet_ids.include?(e["subnetId"]) }
 
           # http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/default-vpc.html
           elb_location = if supported_platforms.include?("EC2")
@@ -109,21 +109,21 @@ def create_load_balancer(availability_zones, lb_name, listeners = [], options =
 
           security_group = case elb_location
                            when 'EC2-Classic'
-                             Fog::Compute::AWS::Mock.data[region][@aws_access_key_id][:security_groups]['amazon-elb-sg']
+                             Fog::AWS::Compute::Mock.data[region][@aws_access_key_id][:security_groups]['amazon-elb-sg']
                            when 'EC2-VPC-Default'
-                             compute = Fog::Compute::AWS::new(:aws_access_key_id => @aws_access_key_id, :aws_secret_access_key => @aws_secret_access_key)
+                             compute = Fog::AWS::Compute::new(:aws_access_key_id => @aws_access_key_id, :aws_secret_access_key => @aws_secret_access_key)
 
                              vpc = compute.vpcs.all.first ||
                                compute.vpcs.create('cidr_block' => '10.0.0.0/24')
 
-                             Fog::Compute::AWS::Mock.data[region][@aws_access_key_id][:security_groups].values.find { |sg|
+                             Fog::AWS::Compute::Mock.data[region][@aws_access_key_id][:security_groups].values.find { |sg|
                                sg['groupName'] =~ /^default_elb/ &&
                                  sg["vpcId"] == vpc.id
                              }
                            when 'EC2-VPC'
                              vpc_id = subnets.first["vpcId"]
 
-                             Fog::Compute::AWS::Mock.data[region][@aws_access_key_id][:security_groups].values.find { |sg|
+                             Fog::AWS::Compute::Mock.data[region][@aws_access_key_id][:security_groups].values.find { |sg|
                                sg['groupName'] == 'default' &&
                                  sg["vpcId"] == vpc_id
                              }
diff --git a/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb b/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb
index b59ac48e57..3afd34b652 100644
--- a/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb
+++ b/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb
@@ -35,7 +35,7 @@ def deregister_instances_from_load_balancer(instance_ids, lb_name)
           raise Fog::AWS::ELB::NotFound unless load_balancer = self.data[:load_balancers][lb_name]
           instance_ids = [*instance_ids]
           instance_ids.each do |instance|
-            raise Fog::AWS::ELB::InvalidInstance unless Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id][:instances][instance]
+            raise Fog::AWS::ELB::InvalidInstance unless Fog::AWS::Compute::Mock.data[@region][@aws_access_key_id][:instances][instance]
           end
 
           response = Excon::Response.new
diff --git a/lib/fog/aws/requests/elb/describe_instance_health.rb b/lib/fog/aws/requests/elb/describe_instance_health.rb
index 1dd6312763..33090478dc 100644
--- a/lib/fog/aws/requests/elb/describe_instance_health.rb
+++ b/lib/fog/aws/requests/elb/describe_instance_health.rb
@@ -38,7 +38,7 @@ def describe_instance_health(lb_name, instance_ids = [])
           instance_ids = [*instance_ids]
           instance_ids = load_balancer['Instances'].map { |i| i['InstanceId'] } unless instance_ids.any?
           data = instance_ids.map do |id|
-            unless Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id][:instances][id]
+            unless Fog::AWS::Compute::Mock.data[@region][@aws_access_key_id][:instances][id]
               raise Fog::AWS::ELB::InvalidInstance
             end
 
diff --git a/lib/fog/aws/requests/elb/describe_tags.rb b/lib/fog/aws/requests/elb/describe_tags.rb
index 870e134c3f..d7a87e6d61 100644
--- a/lib/fog/aws/requests/elb/describe_tags.rb
+++ b/lib/fog/aws/requests/elb/describe_tags.rb
@@ -24,7 +24,7 @@ def describe_tags(elb_ids)
         #   request({
         #     'Action'    => 'DescribeTags',
         #     :idempotent => true,
-        #     :parser     => Fog::Parsers::Compute::AWS::DescribeTags.new
+        #     :parser     => Fog::Parsers::AWS::Compute::DescribeTags.new
         #   }.merge!(params))
         # end
 
diff --git a/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb b/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb
index f78aea260d..9be9d57e37 100644
--- a/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb
+++ b/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb
@@ -35,7 +35,7 @@ def register_instances_with_load_balancer(instance_ids, lb_name)
           raise Fog::AWS::ELB::NotFound unless load_balancer = self.data[:load_balancers][lb_name]
           instance_ids = [*instance_ids]
           instances = instance_ids.map do |instance|
-            raise Fog::AWS::ELB::InvalidInstance unless Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id][:instances][instance]
+            raise Fog::AWS::ELB::InvalidInstance unless Fog::AWS::Compute::Mock.data[@region][@aws_access_key_id][:instances][instance]
             {'InstanceId' => instance}
           end
 
diff --git a/lib/fog/aws/requests/rds/authorize_db_security_group_ingress.rb b/lib/fog/aws/requests/rds/authorize_db_security_group_ingress.rb
index a721555c69..42ed8d2aed 100644
--- a/lib/fog/aws/requests/rds/authorize_db_security_group_ingress.rb
+++ b/lib/fog/aws/requests/rds/authorize_db_security_group_ingress.rb
@@ -34,7 +34,7 @@ def authorize_db_security_group_ingress(name, opts = {})
           end
 
           if ec2_security_group_id = opts.delete("EC2SecurityGroupId")
-            ec2_security_group = (Fog::Compute::AWS::Mock.data[self.region][self.aws_access_key_id][:security_groups] || {}).values.detect { |sg| sg['groupId'] == ec2_security_group_id }
+            ec2_security_group = (Fog::AWS::Compute::Mock.data[self.region][self.aws_access_key_id][:security_groups] || {}).values.detect { |sg| sg['groupId'] == ec2_security_group_id }
             opts['EC2SecurityGroupName'] = ec2_security_group['groupName']
           end
 
diff --git a/lib/fog/aws/requests/rds/create_db_instance.rb b/lib/fog/aws/requests/rds/create_db_instance.rb
index d42af5272d..9519a9d362 100644
--- a/lib/fog/aws/requests/rds/create_db_instance.rb
+++ b/lib/fog/aws/requests/rds/create_db_instance.rb
@@ -83,7 +83,7 @@ def create_db_instance(db_name, options={})
             raise Fog::AWS::RDS::InvalidParameterCombination.new('Requesting a specific availability zone is not valid for Multi-AZ instances.')
           end
 
-          ec2 = Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id]
+          ec2 = Fog::AWS::Compute::Mock.data[@region][@aws_access_key_id]
 
           db_parameter_groups     = if pg_name = options.delete("DBParameterGroupName")
                                       group = self.data[:parameter_groups][pg_name]
diff --git a/lib/fog/aws/requests/rds/create_db_subnet_group.rb b/lib/fog/aws/requests/rds/create_db_subnet_group.rb
index 46c189cc55..0f2f206355 100644
--- a/lib/fog/aws/requests/rds/create_db_subnet_group.rb
+++ b/lib/fog/aws/requests/rds/create_db_subnet_group.rb
@@ -30,8 +30,8 @@ def create_db_subnet_group(name, subnet_ids, description = name)
             raise Fog::AWS::RDS::IdentifierTaken.new("DBSubnetGroupAlreadyExists => The subnet group '#{name}' already exists")
           end
 
-          # collection = Fog::Compute::AWS.new(:aws_access_key_id => 'mock key', :aws_secret_access_key => 'mock secret')
-          compute_data = Fog::Compute::AWS::Mock.data[self.region][self.aws_access_key_id]
+          # collection = Fog::AWS::Compute.new(:aws_access_key_id => 'mock key', :aws_secret_access_key => 'mock secret')
+          compute_data = Fog::AWS::Compute::Mock.data[self.region][self.aws_access_key_id]
 
           subnets = subnet_ids.map do |snid|
             subnet = compute_data[:subnets].detect { |s| s['subnetId'] == snid }
diff --git a/lib/fog/aws/requests/rds/modify_db_instance.rb b/lib/fog/aws/requests/rds/modify_db_instance.rb
index 9c92803f18..e4197e6467 100644
--- a/lib/fog/aws/requests/rds/modify_db_instance.rb
+++ b/lib/fog/aws/requests/rds/modify_db_instance.rb
@@ -68,7 +68,7 @@ def modify_db_instance(db_name, apply_immediately, _options={})
               end
 
               rds_security_groups = self.data[:security_groups].values
-              ec2_security_groups = Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id][:security_groups].values
+              ec2_security_groups = Fog::AWS::Compute::Mock.data[@region][@aws_access_key_id][:security_groups].values
 
               db_security_group_names = Array(options.delete("DBSecurityGroups"))
               db_security_groups = db_security_group_names.inject([]) do |r, group_name|
diff --git a/lib/fog/aws/requests/rds/revoke_db_security_group_ingress.rb b/lib/fog/aws/requests/rds/revoke_db_security_group_ingress.rb
index 8be4bb6579..b44e1bc343 100644
--- a/lib/fog/aws/requests/rds/revoke_db_security_group_ingress.rb
+++ b/lib/fog/aws/requests/rds/revoke_db_security_group_ingress.rb
@@ -34,7 +34,7 @@ def revoke_db_security_group_ingress(name, opts = {})
           end
 
           if ec2_security_group_id = opts.delete("EC2SecurityGroupId")
-            ec2_security_group = (Fog::Compute::AWS::Mock.data[self.region][self.aws_access_key_id][:security_groups] || {}).values.detect { |sg| sg['groupId'] == ec2_security_group_id }
+            ec2_security_group = (Fog::AWS::Compute::Mock.data[self.region][self.aws_access_key_id][:security_groups] || {}).values.detect { |sg| sg['groupId'] == ec2_security_group_id }
             opts['EC2SecurityGroupName'] = ec2_security_group['groupName']
           end
 
diff --git a/lib/fog/aws/service_mapper.rb b/lib/fog/aws/service_mapper.rb
index fa532b0076..e568b73669 100644
--- a/lib/fog/aws/service_mapper.rb
+++ b/lib/fog/aws/service_mapper.rb
@@ -20,7 +20,7 @@ def self.class_for(key)
           when :cloud_watch
             Fog::AWS::CloudWatch
           when :compute
-            Fog::Compute::AWS
+            Fog::AWS::Compute
           when :data_pipeline
             Fog::AWS::DataPipeline
           when :ddb, :dynamodb

From d9d9d2f97f6ae170e33220436be674239b9d9b5a Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Wed, 12 Sep 2018 18:35:01 +0900
Subject: [PATCH 07/39] git grep -l "Compute::AWS" -- tests/ | xargs sed -i ""
 "s/Compute::AWS/AWS::Compute/g"

---
 tests/credentials_tests.rb                    | 14 +++---
 tests/models/compute/address_tests.rb         |  2 +-
 tests/models/compute/network_acl_tests.rb     |  8 ++--
 tests/models/compute/security_group_tests.rb  |  2 +-
 tests/models/compute/volume_tests.rb          |  2 +-
 tests/models/elb/model_tests.rb               |  2 +-
 .../parsers/compute/describe_images_tests.rb  |  4 +-
 tests/requests/compute/address_tests.rb       | 18 +++----
 .../compute/assign_private_ip_tests.rb        |  6 +--
 tests/requests/compute/image_tests.rb         |  4 +-
 .../requests/compute/instance_attrib_tests.rb |  2 +-
 tests/requests/compute/instance_tests.rb      | 10 ++--
 .../compute/internet_gateway_tests.rb         |  2 +-
 tests/requests/compute/key_pair_tests.rb      |  2 +-
 tests/requests/compute/network_acl_tests.rb   |  4 +-
 .../compute/network_interface_tests.rb        | 12 ++---
 .../requests/compute/placement_group_tests.rb |  4 +-
 tests/requests/compute/region_tests.rb        |  8 ++--
 tests/requests/compute/route_tests.rb         | 48 +++++++++----------
 .../requests/compute/security_group_tests.rb  | 28 +++++------
 tests/requests/compute/snapshot_tests.rb      |  2 +-
 .../spot_datafeed_subscription_tests.rb       |  2 +-
 tests/requests/compute/subnet_tests.rb        |  6 +--
 tests/requests/compute/tag_tests.rb           |  6 +--
 tests/requests/compute/volume_tests.rb        | 22 ++++-----
 tests/requests/compute/vpc_tests.rb           |  6 +--
 26 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/tests/credentials_tests.rb b/tests/credentials_tests.rb
index f0eb1b242b..1ca9fa161a 100644
--- a/tests/credentials_tests.rb
+++ b/tests/credentials_tests.rb
@@ -23,7 +23,7 @@
                 :aws_secret_access_key => 'dummysecret',
                 :aws_session_token => 'dummytoken',
                 :region => "us-west-1",
-                :aws_credentials_expire_at => expires_at}) { Fog::Compute::AWS.fetch_credentials(:use_iam_profile => true) }
+                :aws_credentials_expire_at => expires_at}) { Fog::AWS::Compute.fetch_credentials(:use_iam_profile => true) }
     end
 
     ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"] = '/v1/credentials?id=task_id'
@@ -34,12 +34,12 @@
                 :aws_secret_access_key => 'dummysecret',
                 :aws_session_token => 'dummytoken',
                 :region => "us-west-1",
-                :aws_credentials_expire_at => expires_at}) { Fog::Compute::AWS.fetch_credentials(:use_iam_profile => true) }
+                :aws_credentials_expire_at => expires_at}) { Fog::AWS::Compute.fetch_credentials(:use_iam_profile => true) }
     end
 
     ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"] = nil
 
-    compute = Fog::Compute::AWS.new(:use_iam_profile => true)
+    compute = Fog::AWS::Compute.new(:use_iam_profile => true)
 
     tests("#refresh_credentials_if_expired") do
       returns(nil){compute.refresh_credentials_if_expired}
@@ -58,11 +58,11 @@
     end
     Fog::Time.now = Time.now
 
-    default_credentials = Fog::Compute::AWS.fetch_credentials({})
+    default_credentials = Fog::AWS::Compute.fetch_credentials({})
     tests("#fetch_credentials when the url 404s") do
       Excon.stub({:method => :get, :path => "/latest/meta-data/iam/security-credentials/"}, {:status => 404, :body => 'not bound'})
       Excon.stub({:method => :get, :path => "/latest/meta-data/placement/availability-zone/"}, {:status => 400, :body => 'not found'})
-      returns(default_credentials) {Fog::Compute::AWS.fetch_credentials(:use_iam_profile => true)}
+      returns(default_credentials) {Fog::AWS::Compute.fetch_credentials(:use_iam_profile => true)}
     end
 
     mocked_credentials = {
@@ -73,8 +73,8 @@
     }
     tests("#fetch_credentials when mocking") do
       Fog.mock!
-      Fog::Compute::AWS::Mock.data[:iam_role_based_creds] = mocked_credentials
-      returns(mocked_credentials) {Fog::Compute::AWS.fetch_credentials(:use_iam_profile => true)}
+      Fog::AWS::Compute::Mock.data[:iam_role_based_creds] = mocked_credentials
+      returns(mocked_credentials) {Fog::AWS::Compute.fetch_credentials(:use_iam_profile => true)}
     end
 
   ensure
diff --git a/tests/models/compute/address_tests.rb b/tests/models/compute/address_tests.rb
index 997854c729..940013639a 100644
--- a/tests/models/compute/address_tests.rb
+++ b/tests/models/compute/address_tests.rb
@@ -36,7 +36,7 @@
   end
 
   model_tests(Fog::Compute[:aws].addresses, { :domain => "vpc" }, true) do
-    tests("#change_scope").raises(Fog::Compute::AWS::Error) do
+    tests("#change_scope").raises(Fog::AWS::Compute::Error) do
       @instance.change_scope
     end
   end
diff --git a/tests/models/compute/network_acl_tests.rb b/tests/models/compute/network_acl_tests.rb
index 05d16b8937..ccd5856f77 100644
--- a/tests/models/compute/network_acl_tests.rb
+++ b/tests/models/compute/network_acl_tests.rb
@@ -38,7 +38,7 @@
     default_rules = @new_nacl.entries.dup
 
     test("add a new inbound rule") do
-      @new_nacl.add_inbound_rule(100, Fog::Compute::AWS::NetworkAcl::TCP, 'allow', '0.0.0.0/0', 'PortRange.From' => 22, 'PortRange.To' => 22)
+      @new_nacl.add_inbound_rule(100, Fog::AWS::Compute::NetworkAcl::TCP, 'allow', '0.0.0.0/0', 'PortRange.From' => 22, 'PortRange.To' => 22)
       @new_nacl.reload
       (@new_nacl.entries - default_rules) == [{
         "icmpTypeCode" => {},
@@ -61,7 +61,7 @@
     end
 
     test("add a new outbound rule") do
-      @new_nacl.add_outbound_rule(100, Fog::Compute::AWS::NetworkAcl::TCP, 'allow', '0.0.0.0/0', 'PortRange.From' => 22, 'PortRange.To' => 22)
+      @new_nacl.add_outbound_rule(100, Fog::AWS::Compute::NetworkAcl::TCP, 'allow', '0.0.0.0/0', 'PortRange.From' => 22, 'PortRange.To' => 22)
       @new_nacl.reload
       (@new_nacl.entries - default_rules) == [{
         "icmpTypeCode" => {},
@@ -84,8 +84,8 @@
     end
 
     test("update rule") do
-      @new_nacl.add_inbound_rule(100, Fog::Compute::AWS::NetworkAcl::TCP, 'allow', '0.0.0.0/0', 'PortRange.From' => 22, 'PortRange.To' => 22)
-      @new_nacl.update_inbound_rule(100, Fog::Compute::AWS::NetworkAcl::TCP, 'allow', '10.0.0.0/8', 'PortRange.From' => 22, 'PortRange.To' => 22)
+      @new_nacl.add_inbound_rule(100, Fog::AWS::Compute::NetworkAcl::TCP, 'allow', '0.0.0.0/0', 'PortRange.From' => 22, 'PortRange.To' => 22)
+      @new_nacl.update_inbound_rule(100, Fog::AWS::Compute::NetworkAcl::TCP, 'allow', '10.0.0.0/8', 'PortRange.From' => 22, 'PortRange.To' => 22)
       @new_nacl.reload
       (@new_nacl.entries - default_rules) == [{
         "icmpTypeCode" => {},
diff --git a/tests/models/compute/security_group_tests.rb b/tests/models/compute/security_group_tests.rb
index 8d31dfc758..5a3b5003a9 100644
--- a/tests/models/compute/security_group_tests.rb
+++ b/tests/models/compute/security_group_tests.rb
@@ -85,7 +85,7 @@
       { @other_user_id => @other_users_group_id }
     ].each do |group_arg|
       test("does not authorize port range access by an invalid security group #{group_arg.inspect}") do
-        raises(Fog::Compute::AWS::NotFound, "The security group '#{@other_users_group_id}' does not exist") {
+        raises(Fog::AWS::Compute::NotFound, "The security group '#{@other_users_group_id}' does not exist") {
           @other_group.reload
           @group.authorize_port_range(5000..6000, {:group => group_arg})
         }
diff --git a/tests/models/compute/volume_tests.rb b/tests/models/compute/volume_tests.rb
index 37b30cfbff..26496547dd 100644
--- a/tests/models/compute/volume_tests.rb
+++ b/tests/models/compute/volume_tests.rb
@@ -25,7 +25,7 @@
       @instance.server.nil?
     end
 
-    tests('#server=').raises(NoMethodError, 'use Fog::Compute::AWS::Volume#attach(server, device)') do
+    tests('#server=').raises(NoMethodError, 'use Fog::AWS::Compute::Volume#attach(server, device)') do
       @instance.server = @server
     end
 
diff --git a/tests/models/elb/model_tests.rb b/tests/models/elb/model_tests.rb
index db7910906f..a037a2694b 100644
--- a/tests/models/elb/model_tests.rb
+++ b/tests/models/elb/model_tests.rb
@@ -1,5 +1,5 @@
 Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
-  Fog::Compute::AWS::Mock.reset if Fog.mocking?
+  Fog::AWS::Compute::Mock.reset if Fog.mocking?
   @availability_zones = Fog::Compute[:aws].describe_availability_zones('state' => 'available').body['availabilityZoneInfo'].map{ |az| az['zoneName'] }
   @key_name = 'fog-test-model'
   @vpc = Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
diff --git a/tests/parsers/compute/describe_images_tests.rb b/tests/parsers/compute/describe_images_tests.rb
index 8748a0c3f8..12843955cf 100644
--- a/tests/parsers/compute/describe_images_tests.rb
+++ b/tests/parsers/compute/describe_images_tests.rb
@@ -24,9 +24,9 @@
 </DescribeImagesResponse>
 EOF
 
-Shindo.tests('Compute::AWS | parsers | describe_images', ['compute', 'aws', 'parser']) do
+Shindo.tests('AWS::Compute | parsers | describe_images', ['compute', 'aws', 'parser']) do
   tests('parses the xml').formats(AWS::Compute::Formats::DESCRIBE_IMAGES) do
-    parser = Nokogiri::XML::SAX::Parser.new(Fog::Parsers::Compute::AWS::DescribeImages.new)
+    parser = Nokogiri::XML::SAX::Parser.new(Fog::Parsers::AWS::Compute::DescribeImages.new)
     parser.parse(DESCRIBE_IMAGES_RESULT)
     parser.document.response
   end
diff --git a/tests/requests/compute/address_tests.rb b/tests/requests/compute/address_tests.rb
index e83b2f12ec..bc54be9b4c 100644
--- a/tests/requests/compute/address_tests.rb
+++ b/tests/requests/compute/address_tests.rb
@@ -72,7 +72,7 @@
       compute.associate_address({:instance_id=>@server.id, :allocation_id=>@vpc_allocation_id}).body
     end
 
-    tests("#disassociate_address('#{@vpc_public_ip}')").raises(Fog::Compute::AWS::Error) do
+    tests("#disassociate_address('#{@vpc_public_ip}')").raises(Fog::AWS::Compute::Error) do
       compute.disassociate_address(@vpc_public_ip)
     end
 
@@ -95,38 +95,38 @@
     @address     = compute.addresses.create
     @vpc_address = compute.addresses.create(:domain => 'vpc')
 
-    tests("#associate_addresses({:instance_id =>'i-00000000', :public_ip => '#{@address.identity}')}").raises(Fog::Compute::AWS::NotFound) do
+    tests("#associate_addresses({:instance_id =>'i-00000000', :public_ip => '#{@address.identity}')}").raises(Fog::AWS::Compute::NotFound) do
       compute.associate_address({:instance_id => 'i-00000000', :public_ip => @address.identity})
     end
 
-    tests("#associate_addresses({:instance_id =>'#{@server.identity}', :public_ip => '127.0.0.1'})").raises(Fog::Compute::AWS::Error) do
+    tests("#associate_addresses({:instance_id =>'#{@server.identity}', :public_ip => '127.0.0.1'})").raises(Fog::AWS::Compute::Error) do
       compute.associate_address({:instance_id => @server.identity, :public_ip => '127.0.0.1'})
     end
 
-    tests("#associate_addresses({:instance_id =>'i-00000000', :public_ip => '127.0.0.1'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#associate_addresses({:instance_id =>'i-00000000', :public_ip => '127.0.0.1'})").raises(Fog::AWS::Compute::NotFound) do
       compute.associate_address({:instance_id =>'i-00000000', :public_ip =>'127.0.0.1'})
     end
 
-    tests("#restore_address_to_classic('#{@vpc_address.identity}')").raises(Fog::Compute::AWS::Error) do
+    tests("#restore_address_to_classic('#{@vpc_address.identity}')").raises(Fog::AWS::Compute::Error) do
       compute.restore_address_to_classic(@vpc_address.identity)
     end
 
-    tests("#disassociate_addresses('127.0.0.1') raises BadRequest error").raises(Fog::Compute::AWS::Error) do
+    tests("#disassociate_addresses('127.0.0.1') raises BadRequest error").raises(Fog::AWS::Compute::Error) do
       compute.disassociate_address('127.0.0.1')
     end
 
-    tests("#release_address('127.0.0.1')").raises(Fog::Compute::AWS::Error) do
+    tests("#release_address('127.0.0.1')").raises(Fog::AWS::Compute::Error) do
       compute.release_address('127.0.0.1')
     end
 
-    tests("#release_address('#{@vpc_address.identity}')").raises(Fog::Compute::AWS::Error) do
+    tests("#release_address('#{@vpc_address.identity}')").raises(Fog::AWS::Compute::Error) do
       compute.release_address(@vpc_address.identity)
     end
 
     if Fog.mocking?
       old_limit = compute.data[:limits][:addresses]
 
-      tests("#allocate_address", "limit exceeded").raises(Fog::Compute::AWS::Error) do
+      tests("#allocate_address", "limit exceeded").raises(Fog::AWS::Compute::Error) do
         compute.data[:limits][:addresses] = 0
         compute.allocate_address
       end
diff --git a/tests/requests/compute/assign_private_ip_tests.rb b/tests/requests/compute/assign_private_ip_tests.rb
index 0ad005edea..4626f58259 100644
--- a/tests/requests/compute/assign_private_ip_tests.rb
+++ b/tests/requests/compute/assign_private_ip_tests.rb
@@ -1,7 +1,7 @@
 Shindo.tests('Fog::Compute[:aws] | internet_gateway requests', ['aws']) do
 
   tests('success') do
-    Fog::Compute::AWS::Mock.reset if Fog.mocking?
+    Fog::AWS::Compute::Mock.reset if Fog.mocking?
 
     @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
     @vpc_id = @vpc.id
@@ -30,7 +30,7 @@
   end
 
   tests('failure') do
-    Fog::Compute::AWS::Mock.reset if Fog.mocking?
+    Fog::AWS::Compute::Mock.reset if Fog.mocking?
 
     @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
     @vpc_id = @vpc.id
@@ -44,7 +44,7 @@
 
     @ip_address = Fog::AWS::Mock.ip_address
 
-    tests("#assign_private_ip_addresses('#{@network_interface_id}', {'PrivateIpAddresses'=>['#{@ip_address}','#{@second_ip_address}'], 'SecondaryPrivateIpAddressCount'=>4 })").raises(Fog::Compute::AWS::Error) do
+    tests("#assign_private_ip_addresses('#{@network_interface_id}', {'PrivateIpAddresses'=>['#{@ip_address}','#{@second_ip_address}'], 'SecondaryPrivateIpAddressCount'=>4 })").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].assign_private_ip_addresses(@network_interface_id, { 'PrivateIpAddresses' =>[@ip_address, @second_ip_address], 'SecondaryPrivateIpAddressCount'=>4 }).body
     end
 
diff --git a/tests/requests/compute/image_tests.rb b/tests/requests/compute/image_tests.rb
index 5e54258879..2bf8a7a3c1 100644
--- a/tests/requests/compute/image_tests.rb
+++ b/tests/requests/compute/image_tests.rb
@@ -55,7 +55,7 @@
     @image_id = 'ami-1aad5273'
 
     if Fog.mocking?
-      @other_account = Fog::Compute::AWS.new(:aws_access_key_id => 'other', :aws_secret_access_key => 'account')
+      @other_account = Fog::AWS::Compute.new(:aws_access_key_id => 'other', :aws_secret_access_key => 'account')
 
       @server = Fog::Compute[:aws].servers.create
       @server.wait_for{state == 'running'}
@@ -151,7 +151,7 @@
       Fog::Compute[:aws].modify_image_attribute(nil, { 'Add.Group' => ['all'] }).body
     end
 
-    tests("#modify_image_attribute('ami-00000000', { 'Add.UserId' => ['123456789012'] })").raises(Fog::Compute::AWS::NotFound) do
+    tests("#modify_image_attribute('ami-00000000', { 'Add.UserId' => ['123456789012'] })").raises(Fog::AWS::Compute::NotFound) do
       pending unless Fog.mocking?
 
       Fog::Compute[:aws].modify_image_attribute('ami-00000000', { 'Add.UserId' => ['123456789012'] }).body
diff --git a/tests/requests/compute/instance_attrib_tests.rb b/tests/requests/compute/instance_attrib_tests.rb
index e67a9b148c..a017a535b4 100644
--- a/tests/requests/compute/instance_attrib_tests.rb
+++ b/tests/requests/compute/instance_attrib_tests.rb
@@ -159,7 +159,7 @@
 
   tests('failure') do
     @instance_attributes.each do |attrib|
-      tests("#describe_instance_attribute('i-00000000', #{attrib})").raises(Fog::Compute::AWS::NotFound) do
+      tests("#describe_instance_attribute('i-00000000', #{attrib})").raises(Fog::AWS::Compute::NotFound) do
         Fog::Compute[:aws].describe_instance_attribute('i-00000000', attrib)
       end
     end
diff --git a/tests/requests/compute/instance_tests.rb b/tests/requests/compute/instance_tests.rb
index a6f811dbb0..cdcf60ca03 100644
--- a/tests/requests/compute/instance_tests.rb
+++ b/tests/requests/compute/instance_tests.rb
@@ -314,22 +314,22 @@
 
   tests('failure') do
 
-    tests("#run_instances(nil, 1, 1, {'SubnetId'=>'subnet-00000000'}").raises(::Fog::Compute::AWS::Error) do
+    tests("#run_instances(nil, 1, 1, {'SubnetId'=>'subnet-00000000'}").raises(::Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].run_instances(nil, 1, 1, {'SubnetId' => 'subnet-000000'})
     end
-    tests("#get_console_output('i-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#get_console_output('i-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].get_console_output('i-00000000')
     end
 
-    tests("#get_password_data('i-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#get_password_data('i-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].get_password_data('i-00000000')
     end
 
-    tests("#reboot_instances('i-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#reboot_instances('i-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].reboot_instances('i-00000000')
     end
 
-    tests("#terminate_instances('i-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#terminate_instances('i-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].terminate_instances('i-00000000')
     end
 
diff --git a/tests/requests/compute/internet_gateway_tests.rb b/tests/requests/compute/internet_gateway_tests.rb
index be1c93e026..4bbb675ce6 100644
--- a/tests/requests/compute/internet_gateway_tests.rb
+++ b/tests/requests/compute/internet_gateway_tests.rb
@@ -10,7 +10,7 @@
   }
 
   tests('success') do
-    Fog::Compute::AWS::Mock.reset if Fog.mocking?
+    Fog::AWS::Compute::Mock.reset if Fog.mocking?
     @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
     @vpc_id = @vpc.id
     @subnet=Fog::Compute[:aws].subnets.create('vpc_id' => @vpc_id, 'cidr_block' => '10.0.10.0/24')
diff --git a/tests/requests/compute/key_pair_tests.rb b/tests/requests/compute/key_pair_tests.rb
index 2deed34f81..d65fb3da85 100644
--- a/tests/requests/compute/key_pair_tests.rb
+++ b/tests/requests/compute/key_pair_tests.rb
@@ -56,7 +56,7 @@
 
     @key_pair = Fog::Compute[:aws].key_pairs.create(:name => 'fog_key_pair')
 
-    tests("duplicate #create_key_pair('#{@key_pair.name}')").raises(Fog::Compute::AWS::Error) do
+    tests("duplicate #create_key_pair('#{@key_pair.name}')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_key_pair(@key_pair.name)
     end
 
diff --git a/tests/requests/compute/network_acl_tests.rb b/tests/requests/compute/network_acl_tests.rb
index 3004cf887b..3a21f5af4b 100644
--- a/tests/requests/compute/network_acl_tests.rb
+++ b/tests/requests/compute/network_acl_tests.rb
@@ -34,7 +34,7 @@
   }
 
   tests('success') do
-    Fog::Compute::AWS::Mock.reset if Fog.mocking?
+    Fog::AWS::Compute::Mock.reset if Fog.mocking?
 
     @vpc         = Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
     @subnet      = Fog::Compute[:aws].subnets.create('vpc_id' => @vpc.id, 'cidr_block' => '10.0.10.16/28')
@@ -107,6 +107,6 @@
     @another_acl.destroy
     @subnet.destroy
     @vpc.destroy
-    Fog::Compute::AWS::Mock.reset if Fog.mocking?
+    Fog::AWS::Compute::Mock.reset if Fog.mocking?
   end
 end
diff --git a/tests/requests/compute/network_interface_tests.rb b/tests/requests/compute/network_interface_tests.rb
index 80ab801348..3d12f2e12e 100644
--- a/tests/requests/compute/network_interface_tests.rb
+++ b/tests/requests/compute/network_interface_tests.rb
@@ -36,7 +36,7 @@
   }
 
   tests('success') do
-    Fog::Compute::AWS::Mock.reset if Fog.mocking?
+    Fog::AWS::Compute::Mock.reset if Fog.mocking?
 
     # Create environment
     @vpc            = Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
@@ -197,7 +197,7 @@
   tests('failure') do
 
     # Attempt to attach a nonexistent interface
-    tests("#attach_network_interface('eni-00000000', 'i-00000000', '1')").raises(::Fog::Compute::AWS::NotFound) do
+    tests("#attach_network_interface('eni-00000000', 'i-00000000', '1')").raises(::Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].attach_network_interface('eni-00000000', 'i-00000000', '1')
     end
 
@@ -213,12 +213,12 @@
     # Attempt to re-use an existing IP for another ENI
     tests("#create_network_interface('#{@subnet_id}', " \
       "{'PrivateIpAddress' => " \
-      "'#{data['networkInterface']['privateIpAddress']}'}").raises(::Fog::Compute::AWS::Error) do
+      "'#{data['networkInterface']['privateIpAddress']}'}").raises(::Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_network_interface(@subnet_id, {'PrivateIpAddress' => data['networkInterface']['privateIpAddress']})
     end
 
     # Attempt to attach a valid ENI to a nonexistent instance.
-    tests("#attach_network_interface('#{@nic_id}', 'i-00000000', '0')").raises(::Fog::Compute::AWS::NotFound) do
+    tests("#attach_network_interface('#{@nic_id}', 'i-00000000', '0')").raises(::Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].attach_network_interface(@nic_id, 'i-00000000', '0')
     end
 
@@ -230,10 +230,10 @@
 
     # Attempt to attach two ENIs to the same instance with the same device
     # index.
-    tests("#attach_network_interface('#{@nic_id}', '#{@instance_id}', '#{@device_index}')").raises(::Fog::Compute::AWS::Error) do
+    tests("#attach_network_interface('#{@nic_id}', '#{@instance_id}', '#{@device_index}')").raises(::Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].attach_network_interface(@nic_id, @instance_id, @device_index)
     end
 
-    Fog::Compute::AWS::Mock.reset if Fog.mocking?
+    Fog::AWS::Compute::Mock.reset if Fog.mocking?
   end
 end
diff --git a/tests/requests/compute/placement_group_tests.rb b/tests/requests/compute/placement_group_tests.rb
index 0d949f3eec..e6a67176d7 100644
--- a/tests/requests/compute/placement_group_tests.rb
+++ b/tests/requests/compute/placement_group_tests.rb
@@ -35,11 +35,11 @@
 
     Fog::Compute[:aws].create_placement_group('fog_placement_group', 'cluster')
 
-    tests("duplicate #create_placement_group('fog_placement_group', 'cluster')").raises(Fog::Compute::AWS::Error) do
+    tests("duplicate #create_placement_group('fog_placement_group', 'cluster')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_placement_group('fog_placement_group', 'cluster')
     end
 
-    tests("#delete_placement_group('not_a_group_name')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#delete_placement_group('not_a_group_name')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].delete_placement_group('not_a_group_name')
     end
 
diff --git a/tests/requests/compute/region_tests.rb b/tests/requests/compute/region_tests.rb
index 4a89ca239e..6758f2fe33 100644
--- a/tests/requests/compute/region_tests.rb
+++ b/tests/requests/compute/region_tests.rb
@@ -21,7 +21,7 @@
     tests("#incorrect_region") do
 
       raises(ArgumentError, "Unknown region: world-antarctica-1") do
-        Fog::Compute::AWS.new({:aws_access_key_id => 'dummykey',
+        Fog::AWS::Compute.new({:aws_access_key_id => 'dummykey',
                 :aws_secret_access_key => 'dummysecret',
                 :aws_session_token => 'dummytoken',
                 :region => 'world-antarctica-1'})
@@ -30,7 +30,7 @@
     end
 
     tests("#unknown_endpoint").formats(@regions_format) do
-      Fog::Compute::AWS.new({:aws_access_key_id => 'dummykey',
+      Fog::AWS::Compute.new({:aws_access_key_id => 'dummykey',
                              :aws_secret_access_key => 'dummysecret',
                              :aws_session_token => 'dummytoken',
                              :region => 'world-antarctica-1',
@@ -38,8 +38,8 @@
     end
 
     tests("#invalid_endpoint") do
-      raises(Fog::Compute::AWS::InvalidURIError) do
-        Fog::Compute::AWS.new({:aws_access_key_id => 'dummykey',
+      raises(Fog::AWS::Compute::InvalidURIError) do
+        Fog::AWS::Compute.new({:aws_access_key_id => 'dummykey',
                              :aws_secret_access_key => 'dummysecret',
                              :aws_session_token => 'dummytoken',
                              :region => 'world-antarctica-1',
diff --git a/tests/requests/compute/route_tests.rb b/tests/requests/compute/route_tests.rb
index f87a338253..450315d04d 100644
--- a/tests/requests/compute/route_tests.rb
+++ b/tests/requests/compute/route_tests.rb
@@ -41,7 +41,7 @@
     'requestId'    => String
   }
 
-  Fog::Compute::AWS::Mock.reset if Fog.mocking?
+  Fog::AWS::Compute::Mock.reset if Fog.mocking?
   vpc = Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
   if !Fog.mocking?
     vpc.wait_for { state.eql? "available" }
@@ -174,7 +174,7 @@
     tests('#create_route_table').raises(ArgumentError) do
       Fog::Compute[:aws].create_route_table
     end
-    tests("#create_route_table('vpc-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_route_table('vpc-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_route_table('vpc-00000000')
     end
 
@@ -186,10 +186,10 @@
     tests('#associate_route_table').raises(ArgumentError) do
       Fog::Compute[:aws].associate_route_table
     end
-    tests("#associate_route_table('rtb-00000000', '#{@subnet_id}')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#associate_route_table('rtb-00000000', '#{@subnet_id}')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].associate_route_table('rtb-00000000', @subnet_id)
     end
-    tests("#associate_route_table('#{@route_table_id}', 'subnet-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#associate_route_table('#{@route_table_id}', 'subnet-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].associate_route_table(@route_table_id, 'subnet-00000000')
     end
 
@@ -207,30 +207,30 @@
     tests('#create_route').raises(ArgumentError) do
       Fog::Compute[:aws].create_route
     end
-    tests("#create_route('rtb-00000000', '#{@destination_cidr_block}', '#{@internet_gateway_id}')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_route('rtb-00000000', '#{@destination_cidr_block}', '#{@internet_gateway_id}')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_route('rtb-00000000', @destination_cidr_block, @internet_gateway_id)
     end
-    tests("#create_route('#{@route_table_id}', '#{@destination_cidr_block}', 'igw-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_route('#{@route_table_id}', '#{@destination_cidr_block}', 'igw-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_route(@route_table_id, @destination_cidr_block, 'igw-00000000')
     end
-    tests("#create_route('rtb-00000000', '#{@destination_cidr_block}', 'nil', '#{instance.id}')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_route('rtb-00000000', '#{@destination_cidr_block}', 'nil', '#{instance.id}')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_route('rtb-00000000', @destination_cidr_block, instance.id)
     end
-    tests("#create_route('#{@route_table_id}', '#{@destination_cidr_block}', 'nil', 'i-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_route('#{@route_table_id}', '#{@destination_cidr_block}', 'nil', 'i-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_route(@route_table_id, @destination_cidr_block, nil, 'i-00000000')
     end
-    tests("#create_route('#{@route_table_id}', '#{@destinationCidrBlock}', 'nil', 'nil', 'eni-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_route('#{@route_table_id}', '#{@destinationCidrBlock}', 'nil', 'nil', 'eni-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_route(@route_table_id, @destination_cidr_block, nil, nil, 'eni-00000000')
     end
-    tests("#create_route('#rtb-00000000', '#{@destination_cidr_block}', 'nil, 'nil', '#{@network_interface_id}')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_route('#rtb-00000000', '#{@destination_cidr_block}', 'nil, 'nil', '#{@network_interface_id}')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_route('rtb-00000000', @destination_cidr_block, nil, nil, @network_interface_id)
     end
-    tests("#create_route same destination_cidr_block").raises(Fog::Compute::AWS::Error) do
+    tests("#create_route same destination_cidr_block").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_route(@route_table_id, @destination_cidr_block, @internet_gateway_id)
       Fog::Compute[:aws].create_route(@route_table_id, @destination_cidr_block, nil, nil, @network_interface_id).body
     end
     if !Fog.mocking?
-      tests("#create_route less specific destination_cidr_block").raises(Fog::Compute::AWS::Error) do
+      tests("#create_route less specific destination_cidr_block").raises(Fog::AWS::Compute::Error) do
         Fog::Compute[:aws].create_route(@route_table_id, '10.0.10.0/25', @internet_gateway_id)
        Fog::Compute[:aws].delete_route(@route_table_id, @destination_cidr_block).body
       end
@@ -249,29 +249,29 @@
     tests('#replace_route').raises(ArgumentError) do
       Fog::Compute[:aws].replace_route
     end
-    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}', {'internetGatewayId' => '#{@internet_gateway_id}'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}', {'internetGatewayId' => '#{@internet_gateway_id}'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].replace_route('rtb-00000000', @destination_cidr_block, {'internetGatewayId' => @internet_gateway_id})
     end
-    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].replace_route('rtb-00000000', @destination_cidr_block)
     end
-    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'gatewayId' => 'igw-00000000'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'gatewayId' => 'igw-00000000'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].replace_route(@route_table_id, @destination_cidr_block, {'gatewayId' => 'igw-00000000'})
     end
-    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}', {'instanceId' => '#{instance.id}'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}', {'instanceId' => '#{instance.id}'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].replace_route('rtb-00000000', @destination_cidr_block, {'instanceId' => instance.id})
     end
-    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'instanceId' => 'i-00000000'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'instanceId' => 'i-00000000'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].replace_route(@route_table_id, @destination_cidr_block, {'instanceId' => 'i-00000000'})
     end
-    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'networkInterfaceId' => 'eni-00000000'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'networkInterfaceId' => 'eni-00000000'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].replace_route(@route_table_id, @destination_cidr_block, {'networkInterfaceId' => 'eni-00000000'})
     end
-    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}', {'networkInterfaceId' => '#{@network_interface_id}'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}', {'networkInterfaceId' => '#{@network_interface_id}'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].replace_route('rtb-00000000', @destination_cidr_block, {'networkInterfaceId' => @network_interface_id})
     end
     if !Fog.mocking?
-      tests("#replace_route less specific destination_cidr_block").raises(Fog::Compute::AWS::Error) do
+      tests("#replace_route less specific destination_cidr_block").raises(Fog::AWS::Compute::Error) do
         Fog::Compute[:aws].replace_route(@route_table_id, '10.0.10.0/25', {'gatewayId' => @internet_gateway_id})
       end
     end
@@ -290,7 +290,7 @@
     tests('#delete_route').raises(ArgumentError) do
       Fog::Compute[:aws].delete_route
     end
-    tests("#delete_route('rtb-00000000', '#{@destination_cidr_block}')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#delete_route('rtb-00000000', '#{@destination_cidr_block}')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].delete_route('rtb-00000000', @destination_cidr_block)
     end
 
@@ -301,7 +301,7 @@
     tests('#disassociate_route_table').raises(ArgumentError) do
       Fog::Compute[:aws].disassociate_route_table
     end
-    tests("#disassociate_route_table('rtbassoc-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#disassociate_route_table('rtbassoc-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].disassociate_route_table('rtbassoc-00000000')
     end
 
@@ -312,14 +312,14 @@
     tests('#delete_route_table').raises(ArgumentError) do
       Fog::Compute[:aws].delete_route_table
     end
-    tests("#delete_route_table('rtb-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#delete_route_table('rtb-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].delete_route_table('rtb-00000000')
     end
 
     # Dependency Tests
     #   - route is depending on route_table, so route_table cannot be deleted
     #
-    tests("#delete_route_table('#{@route_table_id}')").raises(Fog::Compute::AWS::Error) do
+    tests("#delete_route_table('#{@route_table_id}')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].delete_route_table(@route_table_id)
     end
 
diff --git a/tests/requests/compute/security_group_tests.rb b/tests/requests/compute/security_group_tests.rb
index 4fe30089b7..aad6e1f339 100644
--- a/tests/requests/compute/security_group_tests.rb
+++ b/tests/requests/compute/security_group_tests.rb
@@ -318,11 +318,11 @@
     @security_group = Fog::Compute[:aws].security_groups.create(:description => 'tests group', :name => 'fog_security_group')
     @other_security_group = Fog::Compute[:aws].security_groups.create(:description => 'tests group', :name => 'fog_other_security_group')
 
-    tests("duplicate #create_security_group(#{@security_group.name}, #{@security_group.description})").raises(Fog::Compute::AWS::Error) do
+    tests("duplicate #create_security_group(#{@security_group.name}, #{@security_group.description})").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_security_group(@security_group.name, @security_group.description)
     end
 
-    tests("#authorize_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#authorize_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].authorize_security_group_ingress(
         'not_a_group_name',
         {
@@ -333,7 +333,7 @@
       )
     end
 
-    tests("#authorize_security_group_ingress('not_a_group_name', {'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#authorize_security_group_ingress('not_a_group_name', {'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].authorize_security_group_ingress(
         'not_a_group_name',
         {
@@ -347,7 +347,7 @@
       Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]}).body
     end
 
-    tests("#authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]})").raises(Fog::Compute::AWS::Error) do
+    tests("#authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]})").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]})
     end
 
@@ -355,7 +355,7 @@
       Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'Groups' => [{'GroupName' => @other_security_group.name}], 'FromPort' => 80, 'ToPort' => 80, 'IpProtocol' => 'tcp'}]}).body
     end
 
-    tests("#delete_security_group('#{@other_security_group.name}')").raises(Fog::Compute::AWS::Error) do
+    tests("#delete_security_group('#{@other_security_group.name}')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].delete_security_group(@other_security_group.name)
     end
 
@@ -374,16 +374,16 @@
     ]
 
     broken_params.each do |broken_params_item|
-      tests("#authorize_security_group_ingress('fog_security_group', #{broken_params_item.inspect})").raises(Fog::Compute::AWS::Error) do
+      tests("#authorize_security_group_ingress('fog_security_group', #{broken_params_item.inspect})").raises(Fog::AWS::Compute::Error) do
         Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', broken_params_item)
       end
 
-      tests("#revoke_security_group_ingress('fog_security_group', #{broken_params_item.inspect})").raises(Fog::Compute::AWS::Error) do
+      tests("#revoke_security_group_ingress('fog_security_group', #{broken_params_item.inspect})").raises(Fog::AWS::Compute::Error) do
         Fog::Compute[:aws].revoke_security_group_ingress('fog_security_group', broken_params_item)
       end
     end
 
-    tests("#revoke_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#revoke_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].revoke_security_group_ingress(
         'not_a_group_name',
         {
@@ -394,7 +394,7 @@
       )
     end
 
-    tests("#revoke_security_group_ingress('not_a_group_name', {'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#revoke_security_group_ingress('not_a_group_name', {'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].revoke_security_group_ingress(
         'not_a_group_name',
         {
@@ -404,13 +404,13 @@
       )
     end
 
-    tests("#delete_security_group('not_a_group_name')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#delete_security_group('not_a_group_name')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].delete_security_group('not_a_group_name')
     end
 
     @rds_security_group = Fog::AWS[:rds].security_groups.create(:id => "rdsgroup", :description => 'fog rds test')
 
-    tests("#delete_security_group('when authorized to an rds firewall')").raises(Fog::Compute::AWS::Error) do
+    tests("#delete_security_group('when authorized to an rds firewall')").raises(Fog::AWS::Compute::Error) do
       @rds_security_group.authorize_ec2_security_group(@security_group.name)
       Fog::Compute[:aws].delete_security_group(@security_group.name)
     end
@@ -420,7 +420,7 @@
     @security_group.destroy
     @other_security_group.destroy
 
-    tests("#delete_security_group('default')").raises(Fog::Compute::AWS::Error) do
+    tests("#delete_security_group('default')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].delete_security_group('default')
     end
 
@@ -432,11 +432,11 @@
                     ]
 
     broken_params.each do |list_elem|
-      tests("#authorize_security_group_ingress(#{list_elem[0].inspect}, #{list_elem[1].inspect})").raises(Fog::Compute::AWS::Error) do
+      tests("#authorize_security_group_ingress(#{list_elem[0].inspect}, #{list_elem[1].inspect})").raises(Fog::AWS::Compute::Error) do
         Fog::Compute[:aws].authorize_security_group_ingress(list_elem[0], list_elem[1])
       end
 
-      tests("#revoke_security_group_ingress(#{list_elem[0].inspect}, #{list_elem[1].inspect})").raises(Fog::Compute::AWS::Error) do
+      tests("#revoke_security_group_ingress(#{list_elem[0].inspect}, #{list_elem[1].inspect})").raises(Fog::AWS::Compute::Error) do
         Fog::Compute[:aws].revoke_security_group_ingress(list_elem[0], list_elem[1])
       end
     end
diff --git a/tests/requests/compute/snapshot_tests.rb b/tests/requests/compute/snapshot_tests.rb
index 0a904e1e47..4d0324cdbb 100644
--- a/tests/requests/compute/snapshot_tests.rb
+++ b/tests/requests/compute/snapshot_tests.rb
@@ -66,7 +66,7 @@
   end
   tests('failure') do
 
-    tests("#delete_snapshot('snap-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#delete_snapshot('snap-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].delete_snapshot('snap-00000000')
     end
 
diff --git a/tests/requests/compute/spot_datafeed_subscription_tests.rb b/tests/requests/compute/spot_datafeed_subscription_tests.rb
index b4c4ff9a68..546e6aa9c5 100644
--- a/tests/requests/compute/spot_datafeed_subscription_tests.rb
+++ b/tests/requests/compute/spot_datafeed_subscription_tests.rb
@@ -38,7 +38,7 @@
   tests('failure') do
     pending if Fog.mocking?
 
-    tests("#describe_spot_datafeed_subscription").raises(Fog::Compute::AWS::NotFound) do
+    tests("#describe_spot_datafeed_subscription").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].describe_spot_datafeed_subscription
     end
   end
diff --git a/tests/requests/compute/subnet_tests.rb b/tests/requests/compute/subnet_tests.rb
index 1b7d59c6dc..92d5954589 100644
--- a/tests/requests/compute/subnet_tests.rb
+++ b/tests/requests/compute/subnet_tests.rb
@@ -67,17 +67,17 @@
   end
 
   tests('failure') do
-    tests("#create_subnet('vpc-00000000', '10.0.10.0/16')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_subnet('vpc-00000000', '10.0.10.0/16')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_subnet('vpc-00000000', '10.0.10.0/16')
     end
 
-    tests("#create_subnet('#{@vpc_id}', '10.0.9.16/28')").raises(Fog::Compute::AWS::Error) do
+    tests("#create_subnet('#{@vpc_id}', '10.0.9.16/28')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_subnet(@vpc_id, '10.0.9.16/28')
     end
 
     # Attempt to create two subnets with conflicting CIDRs in the same VPC
     tests("#create_subnet('#{@vpc_id}', '10.0.10.0/24'); " \
-      "#create_subnet('#{@vpc_id}', '10.0.10.64/26'); ").raises(::Fog::Compute::AWS::Error) do
+      "#create_subnet('#{@vpc_id}', '10.0.10.64/26'); ").raises(::Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_subnet(@vpc_id, '10.0.10.0/24')
       Fog::Compute[:aws].create_subnet(@vpc_id, '10.0.10.64/26')
     end
diff --git a/tests/requests/compute/tag_tests.rb b/tests/requests/compute/tag_tests.rb
index d01cc60c24..81217fcb60 100644
--- a/tests/requests/compute/tag_tests.rb
+++ b/tests/requests/compute/tag_tests.rb
@@ -1,5 +1,5 @@
 Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
-  Fog::Compute::AWS::Mock.reset if Fog.mocking?
+  Fog::AWS::Compute::Mock.reset if Fog.mocking?
 
   @tags_format = {
     'tagSet'    => [{
@@ -18,7 +18,7 @@
 
   tests('success') do
     if Fog.mocking?
-      @other_account = Fog::Compute::AWS.new(:aws_access_key_id => 'other', :aws_secret_access_key => 'account')
+      @other_account = Fog::AWS::Compute.new(:aws_access_key_id => 'other', :aws_secret_access_key => 'account')
       @image_id = Fog::Compute[:aws].register_image('image', 'image', '/dev/sda1').body['imageId']
     end
 
@@ -97,5 +97,5 @@
       Fog::Compute[:aws].create_tags('vpc-123', 'type' => 'bad_resource_id')
     end
   end
-  Fog::Compute::AWS::Mock.reset if Fog.mocking?
+  Fog::AWS::Compute::Mock.reset if Fog.mocking?
 end
diff --git a/tests/requests/compute/volume_tests.rb b/tests/requests/compute/volume_tests.rb
index 73d0f67577..b90ed78d88 100644
--- a/tests/requests/compute/volume_tests.rb
+++ b/tests/requests/compute/volume_tests.rb
@@ -207,52 +207,52 @@
   tests('failure') do
     @volume = Fog::Compute[:aws].volumes.create(:availability_zone => @server.availability_zone, :size => 1)
 
-    tests("#attach_volume('i-00000000', '#{@volume.identity}', '/dev/sdh')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#attach_volume('i-00000000', '#{@volume.identity}', '/dev/sdh')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].attach_volume('i-00000000', @volume.identity, '/dev/sdh')
     end
 
-    tests("#attach_volume('#{@server.identity}', 'vol-00000000', '/dev/sdh')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#attach_volume('#{@server.identity}', 'vol-00000000', '/dev/sdh')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].attach_volume(@server.identity, 'vol-00000000', '/dev/sdh')
     end
 
-    tests("#detach_volume('vol-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#detach_volume('vol-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].detach_volume('vol-00000000')
     end
 
-    tests("#modify_volume_attribute('vol-00000000', true)").raises(Fog::Compute::AWS::NotFound) do
+    tests("#modify_volume_attribute('vol-00000000', true)").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].modify_volume_attribute('vol-00000000', true)
     end
 
-    tests("#detach_volume('#{@volume.identity}')").raises(Fog::Compute::AWS::Error) do
+    tests("#detach_volume('#{@volume.identity}')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].detach_volume(@volume.identity)
     end
 
-    tests("#delete_volume('vol-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#delete_volume('vol-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].delete_volume('vol-00000000')
     end
 
     # Iops required
-    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1')").raises(Fog::Compute::AWS::Error) do
+    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1')
     end
 
     # size too small for iops
-    tests("#create_volume('#{@server.availability_zone}', 9, 'VolumeType' => 'io1', 'Iops' => 100)").raises(Fog::Compute::AWS::Error) do
+    tests("#create_volume('#{@server.availability_zone}', 9, 'VolumeType' => 'io1', 'Iops' => 100)").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 9, 'VolumeType' => 'io1', 'Iops' => 100)
     end
 
     # iops:size ratio too big
-    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 301)").raises(Fog::Compute::AWS::Error) do
+    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 301)").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1', 'Iops' => 301)
     end
 
     # iops invalid value (lower than 100)
-    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 99)").raises(Fog::Compute::AWS::Error) do
+    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 99)").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1', 'Iops' => 99)
     end
 
     # iops invalid value (greater than 4000)
-    tests("#create_volume('#{@server.availability_zone}', 1024, 'VolumeType' => 'io1', 'Iops' => 4001)").raises(Fog::Compute::AWS::Error) do
+    tests("#create_volume('#{@server.availability_zone}', 1024, 'VolumeType' => 'io1', 'Iops' => 4001)").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 1024, 'VolumeType' => 'io1', 'Iops' => 4001)
     end
 
diff --git a/tests/requests/compute/vpc_tests.rb b/tests/requests/compute/vpc_tests.rb
index e74fc914ec..3042a0c974 100644
--- a/tests/requests/compute/vpc_tests.rb
+++ b/tests/requests/compute/vpc_tests.rb
@@ -104,11 +104,11 @@
       Fog::Compute[:aws].describe_vpc_attribute(@vpc_id, 'enableDnsHostnames').body["enableDnsHostnames"]
     end
 
-    tests("#modify_vpc_attribute('#{@vpc_id}')").raises(Fog::Compute::AWS::Error) do
+    tests("#modify_vpc_attribute('#{@vpc_id}')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].modify_vpc_attribute(@vpc_id).body
     end
 
-    tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsSupport.Value' => true, 'EnableDnsHostnames.Value' => true})").raises(Fog::Compute::AWS::Error) do
+    tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsSupport.Value' => true, 'EnableDnsHostnames.Value' => true})").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].modify_vpc_attribute(@vpc_id, {'EnableDnsSupport.Value' => true, 'EnableDnsHostnames.Value' => true}).body
     end
 
@@ -211,6 +211,6 @@
     # Clean up
     Fog::Compute[:aws].delete_tags(@another_vpc.id, test_tags)
     @another_vpc.destroy
-    Fog::Compute::AWS::Mock.reset if Fog.mocking?
+    Fog::AWS::Compute::Mock.reset if Fog.mocking?
   end
 end

From 13b703c8afc4d85a2ad6298b14a66e526690b6d5 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Wed, 12 Sep 2018 18:45:21 +0900
Subject: [PATCH 08/39] git grep -l "module Compute" -- lib/fog/aws/compute.rb
 | xargs sed -i "" "s/module Compute/module AWS/g"

---
 lib/fog/aws/compute.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fog/aws/compute.rb b/lib/fog/aws/compute.rb
index f70172c5e8..4817a52c98 100644
--- a/lib/fog/aws/compute.rb
+++ b/lib/fog/aws/compute.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS < Fog::Service
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 

From b31b49a15e703567eab04c93d47484af47289441 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Wed, 12 Sep 2018 18:45:29 +0900
Subject: [PATCH 09/39] git grep -l "class AWS" -- lib/fog/aws/compute.rb |
 xargs sed -i "" "s/class AWS/class Compute/g"

---
 lib/fog/aws/compute.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fog/aws/compute.rb b/lib/fog/aws/compute.rb
index 4817a52c98..5516b23f91 100644
--- a/lib/fog/aws/compute.rb
+++ b/lib/fog/aws/compute.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS < Fog::Service
+    class Compute < Fog::Service
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       class RequestLimitExceeded < Fog::Errors::Error; end

From 0e44fd9cd6094c11a01dabf3a0ba360c6311d79a Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Sun, 16 Sep 2018 17:28:50 +0900
Subject: [PATCH 10/39] git grep -l "module Compute" --
 lib/fog/aws/requests/compute/ | xargs sed -i "" "s/module Compute/module
 AWS/g"

---
 lib/fog/aws/requests/compute/allocate_address.rb                | 2 +-
 lib/fog/aws/requests/compute/assign_private_ip_addresses.rb     | 2 +-
 lib/fog/aws/requests/compute/associate_address.rb               | 2 +-
 lib/fog/aws/requests/compute/associate_dhcp_options.rb          | 2 +-
 lib/fog/aws/requests/compute/associate_route_table.rb           | 2 +-
 lib/fog/aws/requests/compute/attach_classic_link_vpc.rb         | 2 +-
 lib/fog/aws/requests/compute/attach_internet_gateway.rb         | 2 +-
 lib/fog/aws/requests/compute/attach_network_interface.rb        | 2 +-
 lib/fog/aws/requests/compute/attach_volume.rb                   | 2 +-
 lib/fog/aws/requests/compute/authorize_security_group_egress.rb | 2 +-
 .../aws/requests/compute/authorize_security_group_ingress.rb    | 2 +-
 lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb   | 2 +-
 lib/fog/aws/requests/compute/copy_image.rb                      | 2 +-
 lib/fog/aws/requests/compute/copy_snapshot.rb                   | 2 +-
 lib/fog/aws/requests/compute/create_dhcp_options.rb             | 2 +-
 lib/fog/aws/requests/compute/create_image.rb                    | 2 +-
 lib/fog/aws/requests/compute/create_internet_gateway.rb         | 2 +-
 lib/fog/aws/requests/compute/create_key_pair.rb                 | 2 +-
 lib/fog/aws/requests/compute/create_network_acl.rb              | 2 +-
 lib/fog/aws/requests/compute/create_network_acl_entry.rb        | 2 +-
 lib/fog/aws/requests/compute/create_network_interface.rb        | 2 +-
 lib/fog/aws/requests/compute/create_placement_group.rb          | 2 +-
 lib/fog/aws/requests/compute/create_route.rb                    | 2 +-
 lib/fog/aws/requests/compute/create_route_table.rb              | 2 +-
 lib/fog/aws/requests/compute/create_security_group.rb           | 2 +-
 lib/fog/aws/requests/compute/create_snapshot.rb                 | 2 +-
 .../aws/requests/compute/create_spot_datafeed_subscription.rb   | 2 +-
 lib/fog/aws/requests/compute/create_subnet.rb                   | 2 +-
 lib/fog/aws/requests/compute/create_tags.rb                     | 2 +-
 lib/fog/aws/requests/compute/create_volume.rb                   | 2 +-
 lib/fog/aws/requests/compute/create_vpc.rb                      | 2 +-
 lib/fog/aws/requests/compute/delete_dhcp_options.rb             | 2 +-
 lib/fog/aws/requests/compute/delete_internet_gateway.rb         | 2 +-
 lib/fog/aws/requests/compute/delete_key_pair.rb                 | 2 +-
 lib/fog/aws/requests/compute/delete_network_acl.rb              | 2 +-
 lib/fog/aws/requests/compute/delete_network_acl_entry.rb        | 2 +-
 lib/fog/aws/requests/compute/delete_network_interface.rb        | 2 +-
 lib/fog/aws/requests/compute/delete_placement_group.rb          | 2 +-
 lib/fog/aws/requests/compute/delete_route.rb                    | 2 +-
 lib/fog/aws/requests/compute/delete_route_table.rb              | 2 +-
 lib/fog/aws/requests/compute/delete_security_group.rb           | 2 +-
 lib/fog/aws/requests/compute/delete_snapshot.rb                 | 2 +-
 .../aws/requests/compute/delete_spot_datafeed_subscription.rb   | 2 +-
 lib/fog/aws/requests/compute/delete_subnet.rb                   | 2 +-
 lib/fog/aws/requests/compute/delete_tags.rb                     | 2 +-
 lib/fog/aws/requests/compute/delete_volume.rb                   | 2 +-
 lib/fog/aws/requests/compute/delete_vpc.rb                      | 2 +-
 lib/fog/aws/requests/compute/deregister_image.rb                | 2 +-
 lib/fog/aws/requests/compute/describe_account_attributes.rb     | 2 +-
 lib/fog/aws/requests/compute/describe_addresses.rb              | 2 +-
 lib/fog/aws/requests/compute/describe_availability_zones.rb     | 2 +-
 lib/fog/aws/requests/compute/describe_classic_link_instances.rb | 2 +-
 lib/fog/aws/requests/compute/describe_dhcp_options.rb           | 2 +-
 lib/fog/aws/requests/compute/describe_images.rb                 | 2 +-
 lib/fog/aws/requests/compute/describe_instance_attribute.rb     | 2 +-
 lib/fog/aws/requests/compute/describe_instance_status.rb        | 2 +-
 lib/fog/aws/requests/compute/describe_instances.rb              | 2 +-
 lib/fog/aws/requests/compute/describe_internet_gateways.rb      | 2 +-
 lib/fog/aws/requests/compute/describe_key_pairs.rb              | 2 +-
 lib/fog/aws/requests/compute/describe_network_acls.rb           | 2 +-
 .../requests/compute/describe_network_interface_attribute.rb    | 2 +-
 lib/fog/aws/requests/compute/describe_network_interfaces.rb     | 2 +-
 lib/fog/aws/requests/compute/describe_placement_groups.rb       | 2 +-
 lib/fog/aws/requests/compute/describe_regions.rb                | 2 +-
 lib/fog/aws/requests/compute/describe_reserved_instances.rb     | 2 +-
 .../requests/compute/describe_reserved_instances_offerings.rb   | 2 +-
 lib/fog/aws/requests/compute/describe_route_tables.rb           | 2 +-
 lib/fog/aws/requests/compute/describe_security_groups.rb        | 2 +-
 lib/fog/aws/requests/compute/describe_snapshots.rb              | 2 +-
 .../aws/requests/compute/describe_spot_datafeed_subscription.rb | 2 +-
 lib/fog/aws/requests/compute/describe_spot_instance_requests.rb | 2 +-
 lib/fog/aws/requests/compute/describe_spot_price_history.rb     | 2 +-
 lib/fog/aws/requests/compute/describe_subnets.rb                | 2 +-
 lib/fog/aws/requests/compute/describe_tags.rb                   | 2 +-
 lib/fog/aws/requests/compute/describe_volume_status.rb          | 2 +-
 lib/fog/aws/requests/compute/describe_volumes.rb                | 2 +-
 lib/fog/aws/requests/compute/describe_volumes_modifications.rb  | 2 +-
 lib/fog/aws/requests/compute/describe_vpc_attribute.rb          | 2 +-
 lib/fog/aws/requests/compute/describe_vpc_classic_link.rb       | 2 +-
 .../requests/compute/describe_vpc_classic_link_dns_support.rb   | 2 +-
 lib/fog/aws/requests/compute/describe_vpcs.rb                   | 2 +-
 lib/fog/aws/requests/compute/detach_classic_link_vpc.rb         | 2 +-
 lib/fog/aws/requests/compute/detach_internet_gateway.rb         | 2 +-
 lib/fog/aws/requests/compute/detach_network_interface.rb        | 2 +-
 lib/fog/aws/requests/compute/detach_volume.rb                   | 2 +-
 lib/fog/aws/requests/compute/disable_vpc_classic_link.rb        | 2 +-
 .../requests/compute/disable_vpc_classic_link_dns_support.rb    | 2 +-
 lib/fog/aws/requests/compute/disassociate_address.rb            | 2 +-
 lib/fog/aws/requests/compute/disassociate_route_table.rb        | 2 +-
 lib/fog/aws/requests/compute/enable_vpc_classic_link.rb         | 2 +-
 .../aws/requests/compute/enable_vpc_classic_link_dns_support.rb | 2 +-
 lib/fog/aws/requests/compute/get_console_output.rb              | 2 +-
 lib/fog/aws/requests/compute/get_password_data.rb               | 2 +-
 lib/fog/aws/requests/compute/import_key_pair.rb                 | 2 +-
 lib/fog/aws/requests/compute/modify_image_attribute.rb          | 2 +-
 lib/fog/aws/requests/compute/modify_instance_attribute.rb       | 2 +-
 .../aws/requests/compute/modify_network_interface_attribute.rb  | 2 +-
 lib/fog/aws/requests/compute/modify_snapshot_attribute.rb       | 2 +-
 lib/fog/aws/requests/compute/modify_subnet_attribute.rb         | 2 +-
 lib/fog/aws/requests/compute/modify_volume.rb                   | 2 +-
 lib/fog/aws/requests/compute/modify_volume_attribute.rb         | 2 +-
 lib/fog/aws/requests/compute/modify_vpc_attribute.rb            | 2 +-
 lib/fog/aws/requests/compute/monitor_instances.rb               | 2 +-
 lib/fog/aws/requests/compute/move_address_to_vpc.rb             | 2 +-
 .../requests/compute/purchase_reserved_instances_offering.rb    | 2 +-
 lib/fog/aws/requests/compute/reboot_instances.rb                | 2 +-
 lib/fog/aws/requests/compute/register_image.rb                  | 2 +-
 lib/fog/aws/requests/compute/release_address.rb                 | 2 +-
 lib/fog/aws/requests/compute/replace_network_acl_association.rb | 2 +-
 lib/fog/aws/requests/compute/replace_network_acl_entry.rb       | 2 +-
 lib/fog/aws/requests/compute/replace_route.rb                   | 2 +-
 lib/fog/aws/requests/compute/request_spot_instances.rb          | 2 +-
 .../aws/requests/compute/reset_network_interface_attribute.rb   | 2 +-
 lib/fog/aws/requests/compute/restore_address_to_classic.rb      | 2 +-
 lib/fog/aws/requests/compute/revoke_security_group_egress.rb    | 2 +-
 lib/fog/aws/requests/compute/revoke_security_group_ingress.rb   | 2 +-
 lib/fog/aws/requests/compute/run_instances.rb                   | 2 +-
 lib/fog/aws/requests/compute/start_instances.rb                 | 2 +-
 lib/fog/aws/requests/compute/stop_instances.rb                  | 2 +-
 lib/fog/aws/requests/compute/terminate_instances.rb             | 2 +-
 lib/fog/aws/requests/compute/unmonitor_instances.rb             | 2 +-
 121 files changed, 121 insertions(+), 121 deletions(-)

diff --git a/lib/fog/aws/requests/compute/allocate_address.rb b/lib/fog/aws/requests/compute/allocate_address.rb
index 6a5c5f6f91..9990bcaeea 100644
--- a/lib/fog/aws/requests/compute/allocate_address.rb
+++ b/lib/fog/aws/requests/compute/allocate_address.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/allocate_address'
diff --git a/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb b/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb
index f440c93f0b..09184331c9 100644
--- a/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb
+++ b/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/assign_private_ip_addresses'
diff --git a/lib/fog/aws/requests/compute/associate_address.rb b/lib/fog/aws/requests/compute/associate_address.rb
index e5abe7fbd2..bc854c715a 100644
--- a/lib/fog/aws/requests/compute/associate_address.rb
+++ b/lib/fog/aws/requests/compute/associate_address.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/associate_address'
diff --git a/lib/fog/aws/requests/compute/associate_dhcp_options.rb b/lib/fog/aws/requests/compute/associate_dhcp_options.rb
index f29d3e634c..9bd4afd874 100644
--- a/lib/fog/aws/requests/compute/associate_dhcp_options.rb
+++ b/lib/fog/aws/requests/compute/associate_dhcp_options.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/associate_route_table.rb b/lib/fog/aws/requests/compute/associate_route_table.rb
index 3aca001bf6..27cf2bcc3e 100644
--- a/lib/fog/aws/requests/compute/associate_route_table.rb
+++ b/lib/fog/aws/requests/compute/associate_route_table.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/associate_route_table'
diff --git a/lib/fog/aws/requests/compute/attach_classic_link_vpc.rb b/lib/fog/aws/requests/compute/attach_classic_link_vpc.rb
index 106c32024a..9d8141d648 100644
--- a/lib/fog/aws/requests/compute/attach_classic_link_vpc.rb
+++ b/lib/fog/aws/requests/compute/attach_classic_link_vpc.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/attach_internet_gateway.rb b/lib/fog/aws/requests/compute/attach_internet_gateway.rb
index e1829cf2a4..a17498f481 100644
--- a/lib/fog/aws/requests/compute/attach_internet_gateway.rb
+++ b/lib/fog/aws/requests/compute/attach_internet_gateway.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/attach_network_interface.rb b/lib/fog/aws/requests/compute/attach_network_interface.rb
index 48a35fd2bf..78bfffaead 100644
--- a/lib/fog/aws/requests/compute/attach_network_interface.rb
+++ b/lib/fog/aws/requests/compute/attach_network_interface.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/attach_network_interface'
diff --git a/lib/fog/aws/requests/compute/attach_volume.rb b/lib/fog/aws/requests/compute/attach_volume.rb
index 3d83ccb58d..b6304c6624 100644
--- a/lib/fog/aws/requests/compute/attach_volume.rb
+++ b/lib/fog/aws/requests/compute/attach_volume.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/attach_volume'
diff --git a/lib/fog/aws/requests/compute/authorize_security_group_egress.rb b/lib/fog/aws/requests/compute/authorize_security_group_egress.rb
index 3e97926a93..cd19244a7a 100644
--- a/lib/fog/aws/requests/compute/authorize_security_group_egress.rb
+++ b/lib/fog/aws/requests/compute/authorize_security_group_egress.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb b/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb
index fc171359f1..1d6ec9ef2b 100644
--- a/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb
+++ b/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb b/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb
index aafac1bbb3..b7acb2080b 100644
--- a/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb
+++ b/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/cancel_spot_instance_requests'
diff --git a/lib/fog/aws/requests/compute/copy_image.rb b/lib/fog/aws/requests/compute/copy_image.rb
index 8eeebf1d1a..aa78988651 100644
--- a/lib/fog/aws/requests/compute/copy_image.rb
+++ b/lib/fog/aws/requests/compute/copy_image.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/copy_image'
diff --git a/lib/fog/aws/requests/compute/copy_snapshot.rb b/lib/fog/aws/requests/compute/copy_snapshot.rb
index f66e88b8c7..0c230609c2 100644
--- a/lib/fog/aws/requests/compute/copy_snapshot.rb
+++ b/lib/fog/aws/requests/compute/copy_snapshot.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/copy_snapshot'
diff --git a/lib/fog/aws/requests/compute/create_dhcp_options.rb b/lib/fog/aws/requests/compute/create_dhcp_options.rb
index 8b4047b4ae..c1a8b26243 100644
--- a/lib/fog/aws/requests/compute/create_dhcp_options.rb
+++ b/lib/fog/aws/requests/compute/create_dhcp_options.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/create_dhcp_options'
diff --git a/lib/fog/aws/requests/compute/create_image.rb b/lib/fog/aws/requests/compute/create_image.rb
index f690fbdb13..13c30ef8a6 100644
--- a/lib/fog/aws/requests/compute/create_image.rb
+++ b/lib/fog/aws/requests/compute/create_image.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/create_image'
diff --git a/lib/fog/aws/requests/compute/create_internet_gateway.rb b/lib/fog/aws/requests/compute/create_internet_gateway.rb
index da915d1f86..8ee4807170 100644
--- a/lib/fog/aws/requests/compute/create_internet_gateway.rb
+++ b/lib/fog/aws/requests/compute/create_internet_gateway.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/create_internet_gateway'
diff --git a/lib/fog/aws/requests/compute/create_key_pair.rb b/lib/fog/aws/requests/compute/create_key_pair.rb
index f1a8b441e5..920876cb28 100644
--- a/lib/fog/aws/requests/compute/create_key_pair.rb
+++ b/lib/fog/aws/requests/compute/create_key_pair.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/create_key_pair'
diff --git a/lib/fog/aws/requests/compute/create_network_acl.rb b/lib/fog/aws/requests/compute/create_network_acl.rb
index 9bb069a512..4e9f9f853c 100644
--- a/lib/fog/aws/requests/compute/create_network_acl.rb
+++ b/lib/fog/aws/requests/compute/create_network_acl.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/create_network_acl'
diff --git a/lib/fog/aws/requests/compute/create_network_acl_entry.rb b/lib/fog/aws/requests/compute/create_network_acl_entry.rb
index 2f43e03e09..d58fc4e11c 100644
--- a/lib/fog/aws/requests/compute/create_network_acl_entry.rb
+++ b/lib/fog/aws/requests/compute/create_network_acl_entry.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/create_network_interface.rb b/lib/fog/aws/requests/compute/create_network_interface.rb
index bd1f69f9ae..e99e7cd568 100644
--- a/lib/fog/aws/requests/compute/create_network_interface.rb
+++ b/lib/fog/aws/requests/compute/create_network_interface.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/create_network_interface'
diff --git a/lib/fog/aws/requests/compute/create_placement_group.rb b/lib/fog/aws/requests/compute/create_placement_group.rb
index 153260654a..77b59f77ec 100644
--- a/lib/fog/aws/requests/compute/create_placement_group.rb
+++ b/lib/fog/aws/requests/compute/create_placement_group.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/create_route.rb b/lib/fog/aws/requests/compute/create_route.rb
index 80d57ee71d..fd706dc9d6 100644
--- a/lib/fog/aws/requests/compute/create_route.rb
+++ b/lib/fog/aws/requests/compute/create_route.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/create_route_table.rb b/lib/fog/aws/requests/compute/create_route_table.rb
index faee524ce9..d351b2d576 100644
--- a/lib/fog/aws/requests/compute/create_route_table.rb
+++ b/lib/fog/aws/requests/compute/create_route_table.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/create_route_table'
diff --git a/lib/fog/aws/requests/compute/create_security_group.rb b/lib/fog/aws/requests/compute/create_security_group.rb
index c68e986c8a..cfb1d62921 100644
--- a/lib/fog/aws/requests/compute/create_security_group.rb
+++ b/lib/fog/aws/requests/compute/create_security_group.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/create_security_group'
diff --git a/lib/fog/aws/requests/compute/create_snapshot.rb b/lib/fog/aws/requests/compute/create_snapshot.rb
index 4fbccef5b1..b3f51a7521 100644
--- a/lib/fog/aws/requests/compute/create_snapshot.rb
+++ b/lib/fog/aws/requests/compute/create_snapshot.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/create_snapshot'
diff --git a/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb b/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb
index 9cc5cde938..990598a120 100644
--- a/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb
+++ b/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/spot_datafeed_subscription'
diff --git a/lib/fog/aws/requests/compute/create_subnet.rb b/lib/fog/aws/requests/compute/create_subnet.rb
index ac07eed65c..6c3521e389 100644
--- a/lib/fog/aws/requests/compute/create_subnet.rb
+++ b/lib/fog/aws/requests/compute/create_subnet.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'ipaddress'
diff --git a/lib/fog/aws/requests/compute/create_tags.rb b/lib/fog/aws/requests/compute/create_tags.rb
index 0fb36f551a..4fc127002a 100644
--- a/lib/fog/aws/requests/compute/create_tags.rb
+++ b/lib/fog/aws/requests/compute/create_tags.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/create_volume.rb b/lib/fog/aws/requests/compute/create_volume.rb
index 9a6049a4f2..3026f49da3 100644
--- a/lib/fog/aws/requests/compute/create_volume.rb
+++ b/lib/fog/aws/requests/compute/create_volume.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/create_volume'
diff --git a/lib/fog/aws/requests/compute/create_vpc.rb b/lib/fog/aws/requests/compute/create_vpc.rb
index 139f37a666..6d016debc0 100644
--- a/lib/fog/aws/requests/compute/create_vpc.rb
+++ b/lib/fog/aws/requests/compute/create_vpc.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/create_vpc'
diff --git a/lib/fog/aws/requests/compute/delete_dhcp_options.rb b/lib/fog/aws/requests/compute/delete_dhcp_options.rb
index 70c46c3003..cda1f0bab6 100644
--- a/lib/fog/aws/requests/compute/delete_dhcp_options.rb
+++ b/lib/fog/aws/requests/compute/delete_dhcp_options.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/delete_internet_gateway.rb b/lib/fog/aws/requests/compute/delete_internet_gateway.rb
index c957e11393..4e8a6c715f 100644
--- a/lib/fog/aws/requests/compute/delete_internet_gateway.rb
+++ b/lib/fog/aws/requests/compute/delete_internet_gateway.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/delete_key_pair.rb b/lib/fog/aws/requests/compute/delete_key_pair.rb
index d359f3d7ca..d00c2177ac 100644
--- a/lib/fog/aws/requests/compute/delete_key_pair.rb
+++ b/lib/fog/aws/requests/compute/delete_key_pair.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/delete_network_acl.rb b/lib/fog/aws/requests/compute/delete_network_acl.rb
index 4919a2a9a8..b0d0af9d37 100644
--- a/lib/fog/aws/requests/compute/delete_network_acl.rb
+++ b/lib/fog/aws/requests/compute/delete_network_acl.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/delete_network_acl_entry.rb b/lib/fog/aws/requests/compute/delete_network_acl_entry.rb
index 263478280e..13fb8263d9 100644
--- a/lib/fog/aws/requests/compute/delete_network_acl_entry.rb
+++ b/lib/fog/aws/requests/compute/delete_network_acl_entry.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/delete_network_interface.rb b/lib/fog/aws/requests/compute/delete_network_interface.rb
index a86cc7eceb..286fd27d9e 100644
--- a/lib/fog/aws/requests/compute/delete_network_interface.rb
+++ b/lib/fog/aws/requests/compute/delete_network_interface.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/delete_placement_group.rb b/lib/fog/aws/requests/compute/delete_placement_group.rb
index 2b42359d04..dfc152c65c 100644
--- a/lib/fog/aws/requests/compute/delete_placement_group.rb
+++ b/lib/fog/aws/requests/compute/delete_placement_group.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/delete_route.rb b/lib/fog/aws/requests/compute/delete_route.rb
index 0b1992b0e8..b337aa1ce4 100644
--- a/lib/fog/aws/requests/compute/delete_route.rb
+++ b/lib/fog/aws/requests/compute/delete_route.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/delete_route_table.rb b/lib/fog/aws/requests/compute/delete_route_table.rb
index 0bc86d6f39..25dde57ada 100644
--- a/lib/fog/aws/requests/compute/delete_route_table.rb
+++ b/lib/fog/aws/requests/compute/delete_route_table.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/delete_security_group.rb b/lib/fog/aws/requests/compute/delete_security_group.rb
index dde0c52fc7..80207bd282 100644
--- a/lib/fog/aws/requests/compute/delete_security_group.rb
+++ b/lib/fog/aws/requests/compute/delete_security_group.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/delete_snapshot.rb b/lib/fog/aws/requests/compute/delete_snapshot.rb
index 3e3ad73d67..459c77f4a6 100644
--- a/lib/fog/aws/requests/compute/delete_snapshot.rb
+++ b/lib/fog/aws/requests/compute/delete_snapshot.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb b/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb
index 51ad2707e7..eec5a7c896 100644
--- a/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb
+++ b/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/delete_subnet.rb b/lib/fog/aws/requests/compute/delete_subnet.rb
index 86034bfe9d..2db9f7b45e 100644
--- a/lib/fog/aws/requests/compute/delete_subnet.rb
+++ b/lib/fog/aws/requests/compute/delete_subnet.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/delete_tags.rb b/lib/fog/aws/requests/compute/delete_tags.rb
index 3efb2d70fa..170c7d02b3 100644
--- a/lib/fog/aws/requests/compute/delete_tags.rb
+++ b/lib/fog/aws/requests/compute/delete_tags.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/delete_volume.rb b/lib/fog/aws/requests/compute/delete_volume.rb
index 32c115df8d..64c00161ab 100644
--- a/lib/fog/aws/requests/compute/delete_volume.rb
+++ b/lib/fog/aws/requests/compute/delete_volume.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/delete_vpc.rb b/lib/fog/aws/requests/compute/delete_vpc.rb
index d8e29ece2c..9bd66d6152 100644
--- a/lib/fog/aws/requests/compute/delete_vpc.rb
+++ b/lib/fog/aws/requests/compute/delete_vpc.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/deregister_image.rb b/lib/fog/aws/requests/compute/deregister_image.rb
index f85817fda6..6fc6719884 100644
--- a/lib/fog/aws/requests/compute/deregister_image.rb
+++ b/lib/fog/aws/requests/compute/deregister_image.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/deregister_image'
diff --git a/lib/fog/aws/requests/compute/describe_account_attributes.rb b/lib/fog/aws/requests/compute/describe_account_attributes.rb
index 27c462cc76..f1d5b7dbfc 100644
--- a/lib/fog/aws/requests/compute/describe_account_attributes.rb
+++ b/lib/fog/aws/requests/compute/describe_account_attributes.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_account_attributes'
diff --git a/lib/fog/aws/requests/compute/describe_addresses.rb b/lib/fog/aws/requests/compute/describe_addresses.rb
index 89b291c983..aeca1219f7 100644
--- a/lib/fog/aws/requests/compute/describe_addresses.rb
+++ b/lib/fog/aws/requests/compute/describe_addresses.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_addresses'
diff --git a/lib/fog/aws/requests/compute/describe_availability_zones.rb b/lib/fog/aws/requests/compute/describe_availability_zones.rb
index 861bc264eb..bcbefa2c7a 100644
--- a/lib/fog/aws/requests/compute/describe_availability_zones.rb
+++ b/lib/fog/aws/requests/compute/describe_availability_zones.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_availability_zones'
diff --git a/lib/fog/aws/requests/compute/describe_classic_link_instances.rb b/lib/fog/aws/requests/compute/describe_classic_link_instances.rb
index 3982ab3b4a..9acbaed819 100644
--- a/lib/fog/aws/requests/compute/describe_classic_link_instances.rb
+++ b/lib/fog/aws/requests/compute/describe_classic_link_instances.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_classic_link_instances'
diff --git a/lib/fog/aws/requests/compute/describe_dhcp_options.rb b/lib/fog/aws/requests/compute/describe_dhcp_options.rb
index c37e675d1c..64c93cc49f 100644
--- a/lib/fog/aws/requests/compute/describe_dhcp_options.rb
+++ b/lib/fog/aws/requests/compute/describe_dhcp_options.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_dhcp_options'
diff --git a/lib/fog/aws/requests/compute/describe_images.rb b/lib/fog/aws/requests/compute/describe_images.rb
index 1af5a81950..681f0c47c7 100644
--- a/lib/fog/aws/requests/compute/describe_images.rb
+++ b/lib/fog/aws/requests/compute/describe_images.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_images'
diff --git a/lib/fog/aws/requests/compute/describe_instance_attribute.rb b/lib/fog/aws/requests/compute/describe_instance_attribute.rb
index eba75264cf..d906ef9a00 100644
--- a/lib/fog/aws/requests/compute/describe_instance_attribute.rb
+++ b/lib/fog/aws/requests/compute/describe_instance_attribute.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_instance_attribute'
diff --git a/lib/fog/aws/requests/compute/describe_instance_status.rb b/lib/fog/aws/requests/compute/describe_instance_status.rb
index 706dc94581..fb070cbbb1 100644
--- a/lib/fog/aws/requests/compute/describe_instance_status.rb
+++ b/lib/fog/aws/requests/compute/describe_instance_status.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_instance_status'
diff --git a/lib/fog/aws/requests/compute/describe_instances.rb b/lib/fog/aws/requests/compute/describe_instances.rb
index 8960855018..c9a085adcd 100644
--- a/lib/fog/aws/requests/compute/describe_instances.rb
+++ b/lib/fog/aws/requests/compute/describe_instances.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_instances'
diff --git a/lib/fog/aws/requests/compute/describe_internet_gateways.rb b/lib/fog/aws/requests/compute/describe_internet_gateways.rb
index 295ca8e603..f665991b3d 100644
--- a/lib/fog/aws/requests/compute/describe_internet_gateways.rb
+++ b/lib/fog/aws/requests/compute/describe_internet_gateways.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_internet_gateways'
diff --git a/lib/fog/aws/requests/compute/describe_key_pairs.rb b/lib/fog/aws/requests/compute/describe_key_pairs.rb
index 079c0e50e1..f5f603da1d 100644
--- a/lib/fog/aws/requests/compute/describe_key_pairs.rb
+++ b/lib/fog/aws/requests/compute/describe_key_pairs.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_key_pairs'
diff --git a/lib/fog/aws/requests/compute/describe_network_acls.rb b/lib/fog/aws/requests/compute/describe_network_acls.rb
index 62b42f4af9..33f11c8bf6 100644
--- a/lib/fog/aws/requests/compute/describe_network_acls.rb
+++ b/lib/fog/aws/requests/compute/describe_network_acls.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_network_acls'
diff --git a/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb b/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb
index 7abed093a9..8fa74dd80f 100644
--- a/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb
+++ b/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_network_interface_attribute'
diff --git a/lib/fog/aws/requests/compute/describe_network_interfaces.rb b/lib/fog/aws/requests/compute/describe_network_interfaces.rb
index 53191bfb39..c712ae22f9 100644
--- a/lib/fog/aws/requests/compute/describe_network_interfaces.rb
+++ b/lib/fog/aws/requests/compute/describe_network_interfaces.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_network_interfaces'
diff --git a/lib/fog/aws/requests/compute/describe_placement_groups.rb b/lib/fog/aws/requests/compute/describe_placement_groups.rb
index 495eb8c733..fe09c733be 100644
--- a/lib/fog/aws/requests/compute/describe_placement_groups.rb
+++ b/lib/fog/aws/requests/compute/describe_placement_groups.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_placement_groups'
diff --git a/lib/fog/aws/requests/compute/describe_regions.rb b/lib/fog/aws/requests/compute/describe_regions.rb
index c622f2e796..1b2c0fcacf 100644
--- a/lib/fog/aws/requests/compute/describe_regions.rb
+++ b/lib/fog/aws/requests/compute/describe_regions.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_regions'
diff --git a/lib/fog/aws/requests/compute/describe_reserved_instances.rb b/lib/fog/aws/requests/compute/describe_reserved_instances.rb
index 254870a2e7..204ecdca0a 100644
--- a/lib/fog/aws/requests/compute/describe_reserved_instances.rb
+++ b/lib/fog/aws/requests/compute/describe_reserved_instances.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_reserved_instances'
diff --git a/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb b/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb
index 05a2a8653c..6662c20194 100644
--- a/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb
+++ b/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_reserved_instances_offerings'
diff --git a/lib/fog/aws/requests/compute/describe_route_tables.rb b/lib/fog/aws/requests/compute/describe_route_tables.rb
index 7fad1c3e75..c50d2952b9 100644
--- a/lib/fog/aws/requests/compute/describe_route_tables.rb
+++ b/lib/fog/aws/requests/compute/describe_route_tables.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_route_tables'
diff --git a/lib/fog/aws/requests/compute/describe_security_groups.rb b/lib/fog/aws/requests/compute/describe_security_groups.rb
index 42db2424db..c72a614677 100644
--- a/lib/fog/aws/requests/compute/describe_security_groups.rb
+++ b/lib/fog/aws/requests/compute/describe_security_groups.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_security_groups'
diff --git a/lib/fog/aws/requests/compute/describe_snapshots.rb b/lib/fog/aws/requests/compute/describe_snapshots.rb
index 94405cd9ef..5b1db74ffe 100644
--- a/lib/fog/aws/requests/compute/describe_snapshots.rb
+++ b/lib/fog/aws/requests/compute/describe_snapshots.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_snapshots'
diff --git a/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb b/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb
index 2253603168..ffc44c4860 100644
--- a/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb
+++ b/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/spot_datafeed_subscription'
diff --git a/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb b/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb
index 297c1d9dc4..97c7de5783 100644
--- a/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb
+++ b/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/spot_instance_requests'
diff --git a/lib/fog/aws/requests/compute/describe_spot_price_history.rb b/lib/fog/aws/requests/compute/describe_spot_price_history.rb
index ac7455455e..acfbfc2ca6 100644
--- a/lib/fog/aws/requests/compute/describe_spot_price_history.rb
+++ b/lib/fog/aws/requests/compute/describe_spot_price_history.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_spot_price_history'
diff --git a/lib/fog/aws/requests/compute/describe_subnets.rb b/lib/fog/aws/requests/compute/describe_subnets.rb
index 3f99aee04d..29c655054d 100644
--- a/lib/fog/aws/requests/compute/describe_subnets.rb
+++ b/lib/fog/aws/requests/compute/describe_subnets.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_subnets'
diff --git a/lib/fog/aws/requests/compute/describe_tags.rb b/lib/fog/aws/requests/compute/describe_tags.rb
index f4ccb806f3..208df4af0a 100644
--- a/lib/fog/aws/requests/compute/describe_tags.rb
+++ b/lib/fog/aws/requests/compute/describe_tags.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_tags'
diff --git a/lib/fog/aws/requests/compute/describe_volume_status.rb b/lib/fog/aws/requests/compute/describe_volume_status.rb
index 454d317bd1..0bd9a710c7 100644
--- a/lib/fog/aws/requests/compute/describe_volume_status.rb
+++ b/lib/fog/aws/requests/compute/describe_volume_status.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_volume_status'
diff --git a/lib/fog/aws/requests/compute/describe_volumes.rb b/lib/fog/aws/requests/compute/describe_volumes.rb
index 0f9f098f3a..384999a04a 100644
--- a/lib/fog/aws/requests/compute/describe_volumes.rb
+++ b/lib/fog/aws/requests/compute/describe_volumes.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_volumes'
diff --git a/lib/fog/aws/requests/compute/describe_volumes_modifications.rb b/lib/fog/aws/requests/compute/describe_volumes_modifications.rb
index 1fdeca996d..fffdc37418 100644
--- a/lib/fog/aws/requests/compute/describe_volumes_modifications.rb
+++ b/lib/fog/aws/requests/compute/describe_volumes_modifications.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_volumes_modifications'
diff --git a/lib/fog/aws/requests/compute/describe_vpc_attribute.rb b/lib/fog/aws/requests/compute/describe_vpc_attribute.rb
index 76aaa307b9..80b0df618f 100644
--- a/lib/fog/aws/requests/compute/describe_vpc_attribute.rb
+++ b/lib/fog/aws/requests/compute/describe_vpc_attribute.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_vpc_attribute'
diff --git a/lib/fog/aws/requests/compute/describe_vpc_classic_link.rb b/lib/fog/aws/requests/compute/describe_vpc_classic_link.rb
index a612c58a20..5356a774a5 100644
--- a/lib/fog/aws/requests/compute/describe_vpc_classic_link.rb
+++ b/lib/fog/aws/requests/compute/describe_vpc_classic_link.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_vpc_classic_link'
diff --git a/lib/fog/aws/requests/compute/describe_vpc_classic_link_dns_support.rb b/lib/fog/aws/requests/compute/describe_vpc_classic_link_dns_support.rb
index 8010e84a54..d2ae493c3c 100644
--- a/lib/fog/aws/requests/compute/describe_vpc_classic_link_dns_support.rb
+++ b/lib/fog/aws/requests/compute/describe_vpc_classic_link_dns_support.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_vpc_classic_link_dns_support'
diff --git a/lib/fog/aws/requests/compute/describe_vpcs.rb b/lib/fog/aws/requests/compute/describe_vpcs.rb
index 65c0a1eda7..08ea466873 100644
--- a/lib/fog/aws/requests/compute/describe_vpcs.rb
+++ b/lib/fog/aws/requests/compute/describe_vpcs.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/describe_vpcs'
diff --git a/lib/fog/aws/requests/compute/detach_classic_link_vpc.rb b/lib/fog/aws/requests/compute/detach_classic_link_vpc.rb
index a00e96df2f..a4d594ba30 100644
--- a/lib/fog/aws/requests/compute/detach_classic_link_vpc.rb
+++ b/lib/fog/aws/requests/compute/detach_classic_link_vpc.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/detach_internet_gateway.rb b/lib/fog/aws/requests/compute/detach_internet_gateway.rb
index 26d8219fbb..f7e4ac1d65 100644
--- a/lib/fog/aws/requests/compute/detach_internet_gateway.rb
+++ b/lib/fog/aws/requests/compute/detach_internet_gateway.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/detach_network_interface.rb b/lib/fog/aws/requests/compute/detach_network_interface.rb
index f1a585763d..fe1f5507f2 100644
--- a/lib/fog/aws/requests/compute/detach_network_interface.rb
+++ b/lib/fog/aws/requests/compute/detach_network_interface.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/detach_volume.rb b/lib/fog/aws/requests/compute/detach_volume.rb
index 350e684f24..515b0a981f 100644
--- a/lib/fog/aws/requests/compute/detach_volume.rb
+++ b/lib/fog/aws/requests/compute/detach_volume.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/detach_volume'
diff --git a/lib/fog/aws/requests/compute/disable_vpc_classic_link.rb b/lib/fog/aws/requests/compute/disable_vpc_classic_link.rb
index 78dc247f22..eb16412f72 100644
--- a/lib/fog/aws/requests/compute/disable_vpc_classic_link.rb
+++ b/lib/fog/aws/requests/compute/disable_vpc_classic_link.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/disable_vpc_classic_link_dns_support.rb b/lib/fog/aws/requests/compute/disable_vpc_classic_link_dns_support.rb
index 4a3dd6370d..7179ab3e54 100644
--- a/lib/fog/aws/requests/compute/disable_vpc_classic_link_dns_support.rb
+++ b/lib/fog/aws/requests/compute/disable_vpc_classic_link_dns_support.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/disassociate_address.rb b/lib/fog/aws/requests/compute/disassociate_address.rb
index 1ada95bebe..14910e3b9d 100644
--- a/lib/fog/aws/requests/compute/disassociate_address.rb
+++ b/lib/fog/aws/requests/compute/disassociate_address.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/disassociate_route_table.rb b/lib/fog/aws/requests/compute/disassociate_route_table.rb
index 15f8c0ab9e..0512f7e42e 100644
--- a/lib/fog/aws/requests/compute/disassociate_route_table.rb
+++ b/lib/fog/aws/requests/compute/disassociate_route_table.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/enable_vpc_classic_link.rb b/lib/fog/aws/requests/compute/enable_vpc_classic_link.rb
index 09b48c257e..8a1fb915cf 100644
--- a/lib/fog/aws/requests/compute/enable_vpc_classic_link.rb
+++ b/lib/fog/aws/requests/compute/enable_vpc_classic_link.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/enable_vpc_classic_link_dns_support.rb b/lib/fog/aws/requests/compute/enable_vpc_classic_link_dns_support.rb
index 78b5e038aa..bb47461480 100644
--- a/lib/fog/aws/requests/compute/enable_vpc_classic_link_dns_support.rb
+++ b/lib/fog/aws/requests/compute/enable_vpc_classic_link_dns_support.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/get_console_output.rb b/lib/fog/aws/requests/compute/get_console_output.rb
index eb1ed873b5..089e96119a 100644
--- a/lib/fog/aws/requests/compute/get_console_output.rb
+++ b/lib/fog/aws/requests/compute/get_console_output.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/get_console_output'
diff --git a/lib/fog/aws/requests/compute/get_password_data.rb b/lib/fog/aws/requests/compute/get_password_data.rb
index 3ff001ca34..58eb94e993 100644
--- a/lib/fog/aws/requests/compute/get_password_data.rb
+++ b/lib/fog/aws/requests/compute/get_password_data.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/get_password_data'
diff --git a/lib/fog/aws/requests/compute/import_key_pair.rb b/lib/fog/aws/requests/compute/import_key_pair.rb
index 6c8e093f72..56f0be04a6 100644
--- a/lib/fog/aws/requests/compute/import_key_pair.rb
+++ b/lib/fog/aws/requests/compute/import_key_pair.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/import_key_pair'
diff --git a/lib/fog/aws/requests/compute/modify_image_attribute.rb b/lib/fog/aws/requests/compute/modify_image_attribute.rb
index 841a454f46..551a0c8a3b 100644
--- a/lib/fog/aws/requests/compute/modify_image_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_image_attribute.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/modify_instance_attribute.rb b/lib/fog/aws/requests/compute/modify_instance_attribute.rb
index 082b27d9fd..4523a8ea69 100644
--- a/lib/fog/aws/requests/compute/modify_instance_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_instance_attribute.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb b/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb
index 5368d30bcb..c69dc13ea1 100644
--- a/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb b/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb
index 639167beb0..1b8de54d95 100644
--- a/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/modify_subnet_attribute.rb b/lib/fog/aws/requests/compute/modify_subnet_attribute.rb
index bf3f2c8487..94f47d10c8 100644
--- a/lib/fog/aws/requests/compute/modify_subnet_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_subnet_attribute.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/modify_subnet_attribute'
diff --git a/lib/fog/aws/requests/compute/modify_volume.rb b/lib/fog/aws/requests/compute/modify_volume.rb
index 552839f31f..76130a8437 100644
--- a/lib/fog/aws/requests/compute/modify_volume.rb
+++ b/lib/fog/aws/requests/compute/modify_volume.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/modify_volume'
diff --git a/lib/fog/aws/requests/compute/modify_volume_attribute.rb b/lib/fog/aws/requests/compute/modify_volume_attribute.rb
index 0d3eb7f2f7..831137f9fc 100644
--- a/lib/fog/aws/requests/compute/modify_volume_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_volume_attribute.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/modify_vpc_attribute.rb b/lib/fog/aws/requests/compute/modify_vpc_attribute.rb
index a1799c6a76..4e87e78af9 100644
--- a/lib/fog/aws/requests/compute/modify_vpc_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_vpc_attribute.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/monitor_instances.rb b/lib/fog/aws/requests/compute/monitor_instances.rb
index a8ae27545a..3815886acd 100644
--- a/lib/fog/aws/requests/compute/monitor_instances.rb
+++ b/lib/fog/aws/requests/compute/monitor_instances.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/monitor_unmonitor_instances'
diff --git a/lib/fog/aws/requests/compute/move_address_to_vpc.rb b/lib/fog/aws/requests/compute/move_address_to_vpc.rb
index f23e656670..5f2a325925 100644
--- a/lib/fog/aws/requests/compute/move_address_to_vpc.rb
+++ b/lib/fog/aws/requests/compute/move_address_to_vpc.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/move_address_to_vpc'
diff --git a/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb b/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb
index 8f2cf3ae50..05a43532d3 100644
--- a/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb
+++ b/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/purchase_reserved_instances_offering'
diff --git a/lib/fog/aws/requests/compute/reboot_instances.rb b/lib/fog/aws/requests/compute/reboot_instances.rb
index 5214337316..9b4bb6050a 100644
--- a/lib/fog/aws/requests/compute/reboot_instances.rb
+++ b/lib/fog/aws/requests/compute/reboot_instances.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/register_image.rb b/lib/fog/aws/requests/compute/register_image.rb
index 5db3433c2d..ad392984de 100644
--- a/lib/fog/aws/requests/compute/register_image.rb
+++ b/lib/fog/aws/requests/compute/register_image.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/register_image'
diff --git a/lib/fog/aws/requests/compute/release_address.rb b/lib/fog/aws/requests/compute/release_address.rb
index 0909bb3443..ec7ad8e59e 100644
--- a/lib/fog/aws/requests/compute/release_address.rb
+++ b/lib/fog/aws/requests/compute/release_address.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/replace_network_acl_association.rb b/lib/fog/aws/requests/compute/replace_network_acl_association.rb
index e73a6ec560..3aec54d26c 100644
--- a/lib/fog/aws/requests/compute/replace_network_acl_association.rb
+++ b/lib/fog/aws/requests/compute/replace_network_acl_association.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/replace_network_acl_association'
diff --git a/lib/fog/aws/requests/compute/replace_network_acl_entry.rb b/lib/fog/aws/requests/compute/replace_network_acl_entry.rb
index 66b18c0d28..22f2c75589 100644
--- a/lib/fog/aws/requests/compute/replace_network_acl_entry.rb
+++ b/lib/fog/aws/requests/compute/replace_network_acl_entry.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/replace_route.rb b/lib/fog/aws/requests/compute/replace_route.rb
index 52c1b49592..1be85f2d89 100644
--- a/lib/fog/aws/requests/compute/replace_route.rb
+++ b/lib/fog/aws/requests/compute/replace_route.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/request_spot_instances.rb b/lib/fog/aws/requests/compute/request_spot_instances.rb
index e0c36dc598..466638434d 100644
--- a/lib/fog/aws/requests/compute/request_spot_instances.rb
+++ b/lib/fog/aws/requests/compute/request_spot_instances.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/spot_instance_requests'
diff --git a/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb b/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb
index cb64f71090..3af1ba0a31 100644
--- a/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb
+++ b/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/restore_address_to_classic.rb b/lib/fog/aws/requests/compute/restore_address_to_classic.rb
index 0696c0fcc9..24fafe8aaa 100644
--- a/lib/fog/aws/requests/compute/restore_address_to_classic.rb
+++ b/lib/fog/aws/requests/compute/restore_address_to_classic.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/restore_address_to_classic'
diff --git a/lib/fog/aws/requests/compute/revoke_security_group_egress.rb b/lib/fog/aws/requests/compute/revoke_security_group_egress.rb
index b62f42998f..92b8537b57 100644
--- a/lib/fog/aws/requests/compute/revoke_security_group_egress.rb
+++ b/lib/fog/aws/requests/compute/revoke_security_group_egress.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb b/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb
index a0fd784db7..2626c43a60 100644
--- a/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb
+++ b/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/basic'
diff --git a/lib/fog/aws/requests/compute/run_instances.rb b/lib/fog/aws/requests/compute/run_instances.rb
index 701d063d9d..66b39b9665 100644
--- a/lib/fog/aws/requests/compute/run_instances.rb
+++ b/lib/fog/aws/requests/compute/run_instances.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/run_instances'
diff --git a/lib/fog/aws/requests/compute/start_instances.rb b/lib/fog/aws/requests/compute/start_instances.rb
index 9c0d0c4286..7e0956e4aa 100644
--- a/lib/fog/aws/requests/compute/start_instances.rb
+++ b/lib/fog/aws/requests/compute/start_instances.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/start_stop_instances'
diff --git a/lib/fog/aws/requests/compute/stop_instances.rb b/lib/fog/aws/requests/compute/stop_instances.rb
index 9d3145b66c..b0c4d36026 100644
--- a/lib/fog/aws/requests/compute/stop_instances.rb
+++ b/lib/fog/aws/requests/compute/stop_instances.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/start_stop_instances'
diff --git a/lib/fog/aws/requests/compute/terminate_instances.rb b/lib/fog/aws/requests/compute/terminate_instances.rb
index dd81596012..47bd30deba 100644
--- a/lib/fog/aws/requests/compute/terminate_instances.rb
+++ b/lib/fog/aws/requests/compute/terminate_instances.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/terminate_instances'
diff --git a/lib/fog/aws/requests/compute/unmonitor_instances.rb b/lib/fog/aws/requests/compute/unmonitor_instances.rb
index 907eb965a6..4daef82369 100644
--- a/lib/fog/aws/requests/compute/unmonitor_instances.rb
+++ b/lib/fog/aws/requests/compute/unmonitor_instances.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Compute
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/compute/monitor_unmonitor_instances'

From 0080b9813796b69a5ffeb242973c0431117334d4 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Sun, 16 Sep 2018 17:29:04 +0900
Subject: [PATCH 11/39] git grep -l "class AWS" --
 lib/fog/aws/requests/compute/ | xargs sed -i "" "s/class AWS/class Compute/g"

---
 lib/fog/aws/requests/compute/allocate_address.rb                | 2 +-
 lib/fog/aws/requests/compute/assign_private_ip_addresses.rb     | 2 +-
 lib/fog/aws/requests/compute/associate_address.rb               | 2 +-
 lib/fog/aws/requests/compute/associate_dhcp_options.rb          | 2 +-
 lib/fog/aws/requests/compute/associate_route_table.rb           | 2 +-
 lib/fog/aws/requests/compute/attach_classic_link_vpc.rb         | 2 +-
 lib/fog/aws/requests/compute/attach_internet_gateway.rb         | 2 +-
 lib/fog/aws/requests/compute/attach_network_interface.rb        | 2 +-
 lib/fog/aws/requests/compute/attach_volume.rb                   | 2 +-
 lib/fog/aws/requests/compute/authorize_security_group_egress.rb | 2 +-
 .../aws/requests/compute/authorize_security_group_ingress.rb    | 2 +-
 lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb   | 2 +-
 lib/fog/aws/requests/compute/copy_image.rb                      | 2 +-
 lib/fog/aws/requests/compute/copy_snapshot.rb                   | 2 +-
 lib/fog/aws/requests/compute/create_dhcp_options.rb             | 2 +-
 lib/fog/aws/requests/compute/create_image.rb                    | 2 +-
 lib/fog/aws/requests/compute/create_internet_gateway.rb         | 2 +-
 lib/fog/aws/requests/compute/create_key_pair.rb                 | 2 +-
 lib/fog/aws/requests/compute/create_network_acl.rb              | 2 +-
 lib/fog/aws/requests/compute/create_network_acl_entry.rb        | 2 +-
 lib/fog/aws/requests/compute/create_network_interface.rb        | 2 +-
 lib/fog/aws/requests/compute/create_placement_group.rb          | 2 +-
 lib/fog/aws/requests/compute/create_route.rb                    | 2 +-
 lib/fog/aws/requests/compute/create_route_table.rb              | 2 +-
 lib/fog/aws/requests/compute/create_security_group.rb           | 2 +-
 lib/fog/aws/requests/compute/create_snapshot.rb                 | 2 +-
 .../aws/requests/compute/create_spot_datafeed_subscription.rb   | 2 +-
 lib/fog/aws/requests/compute/create_subnet.rb                   | 2 +-
 lib/fog/aws/requests/compute/create_tags.rb                     | 2 +-
 lib/fog/aws/requests/compute/create_volume.rb                   | 2 +-
 lib/fog/aws/requests/compute/create_vpc.rb                      | 2 +-
 lib/fog/aws/requests/compute/delete_dhcp_options.rb             | 2 +-
 lib/fog/aws/requests/compute/delete_internet_gateway.rb         | 2 +-
 lib/fog/aws/requests/compute/delete_key_pair.rb                 | 2 +-
 lib/fog/aws/requests/compute/delete_network_acl.rb              | 2 +-
 lib/fog/aws/requests/compute/delete_network_acl_entry.rb        | 2 +-
 lib/fog/aws/requests/compute/delete_network_interface.rb        | 2 +-
 lib/fog/aws/requests/compute/delete_placement_group.rb          | 2 +-
 lib/fog/aws/requests/compute/delete_route.rb                    | 2 +-
 lib/fog/aws/requests/compute/delete_route_table.rb              | 2 +-
 lib/fog/aws/requests/compute/delete_security_group.rb           | 2 +-
 lib/fog/aws/requests/compute/delete_snapshot.rb                 | 2 +-
 .../aws/requests/compute/delete_spot_datafeed_subscription.rb   | 2 +-
 lib/fog/aws/requests/compute/delete_subnet.rb                   | 2 +-
 lib/fog/aws/requests/compute/delete_tags.rb                     | 2 +-
 lib/fog/aws/requests/compute/delete_volume.rb                   | 2 +-
 lib/fog/aws/requests/compute/delete_vpc.rb                      | 2 +-
 lib/fog/aws/requests/compute/deregister_image.rb                | 2 +-
 lib/fog/aws/requests/compute/describe_account_attributes.rb     | 2 +-
 lib/fog/aws/requests/compute/describe_addresses.rb              | 2 +-
 lib/fog/aws/requests/compute/describe_availability_zones.rb     | 2 +-
 lib/fog/aws/requests/compute/describe_classic_link_instances.rb | 2 +-
 lib/fog/aws/requests/compute/describe_dhcp_options.rb           | 2 +-
 lib/fog/aws/requests/compute/describe_images.rb                 | 2 +-
 lib/fog/aws/requests/compute/describe_instance_attribute.rb     | 2 +-
 lib/fog/aws/requests/compute/describe_instance_status.rb        | 2 +-
 lib/fog/aws/requests/compute/describe_instances.rb              | 2 +-
 lib/fog/aws/requests/compute/describe_internet_gateways.rb      | 2 +-
 lib/fog/aws/requests/compute/describe_key_pairs.rb              | 2 +-
 lib/fog/aws/requests/compute/describe_network_acls.rb           | 2 +-
 .../requests/compute/describe_network_interface_attribute.rb    | 2 +-
 lib/fog/aws/requests/compute/describe_network_interfaces.rb     | 2 +-
 lib/fog/aws/requests/compute/describe_placement_groups.rb       | 2 +-
 lib/fog/aws/requests/compute/describe_regions.rb                | 2 +-
 lib/fog/aws/requests/compute/describe_reserved_instances.rb     | 2 +-
 .../requests/compute/describe_reserved_instances_offerings.rb   | 2 +-
 lib/fog/aws/requests/compute/describe_route_tables.rb           | 2 +-
 lib/fog/aws/requests/compute/describe_security_groups.rb        | 2 +-
 lib/fog/aws/requests/compute/describe_snapshots.rb              | 2 +-
 .../aws/requests/compute/describe_spot_datafeed_subscription.rb | 2 +-
 lib/fog/aws/requests/compute/describe_spot_instance_requests.rb | 2 +-
 lib/fog/aws/requests/compute/describe_spot_price_history.rb     | 2 +-
 lib/fog/aws/requests/compute/describe_subnets.rb                | 2 +-
 lib/fog/aws/requests/compute/describe_tags.rb                   | 2 +-
 lib/fog/aws/requests/compute/describe_volume_status.rb          | 2 +-
 lib/fog/aws/requests/compute/describe_volumes.rb                | 2 +-
 lib/fog/aws/requests/compute/describe_volumes_modifications.rb  | 2 +-
 lib/fog/aws/requests/compute/describe_vpc_attribute.rb          | 2 +-
 lib/fog/aws/requests/compute/describe_vpc_classic_link.rb       | 2 +-
 .../requests/compute/describe_vpc_classic_link_dns_support.rb   | 2 +-
 lib/fog/aws/requests/compute/describe_vpcs.rb                   | 2 +-
 lib/fog/aws/requests/compute/detach_classic_link_vpc.rb         | 2 +-
 lib/fog/aws/requests/compute/detach_internet_gateway.rb         | 2 +-
 lib/fog/aws/requests/compute/detach_network_interface.rb        | 2 +-
 lib/fog/aws/requests/compute/detach_volume.rb                   | 2 +-
 lib/fog/aws/requests/compute/disable_vpc_classic_link.rb        | 2 +-
 .../requests/compute/disable_vpc_classic_link_dns_support.rb    | 2 +-
 lib/fog/aws/requests/compute/disassociate_address.rb            | 2 +-
 lib/fog/aws/requests/compute/disassociate_route_table.rb        | 2 +-
 lib/fog/aws/requests/compute/enable_vpc_classic_link.rb         | 2 +-
 .../aws/requests/compute/enable_vpc_classic_link_dns_support.rb | 2 +-
 lib/fog/aws/requests/compute/get_console_output.rb              | 2 +-
 lib/fog/aws/requests/compute/get_password_data.rb               | 2 +-
 lib/fog/aws/requests/compute/import_key_pair.rb                 | 2 +-
 lib/fog/aws/requests/compute/modify_image_attribute.rb          | 2 +-
 lib/fog/aws/requests/compute/modify_instance_attribute.rb       | 2 +-
 .../aws/requests/compute/modify_network_interface_attribute.rb  | 2 +-
 lib/fog/aws/requests/compute/modify_snapshot_attribute.rb       | 2 +-
 lib/fog/aws/requests/compute/modify_subnet_attribute.rb         | 2 +-
 lib/fog/aws/requests/compute/modify_volume.rb                   | 2 +-
 lib/fog/aws/requests/compute/modify_volume_attribute.rb         | 2 +-
 lib/fog/aws/requests/compute/modify_vpc_attribute.rb            | 2 +-
 lib/fog/aws/requests/compute/monitor_instances.rb               | 2 +-
 lib/fog/aws/requests/compute/move_address_to_vpc.rb             | 2 +-
 .../requests/compute/purchase_reserved_instances_offering.rb    | 2 +-
 lib/fog/aws/requests/compute/reboot_instances.rb                | 2 +-
 lib/fog/aws/requests/compute/register_image.rb                  | 2 +-
 lib/fog/aws/requests/compute/release_address.rb                 | 2 +-
 lib/fog/aws/requests/compute/replace_network_acl_association.rb | 2 +-
 lib/fog/aws/requests/compute/replace_network_acl_entry.rb       | 2 +-
 lib/fog/aws/requests/compute/replace_route.rb                   | 2 +-
 lib/fog/aws/requests/compute/request_spot_instances.rb          | 2 +-
 .../aws/requests/compute/reset_network_interface_attribute.rb   | 2 +-
 lib/fog/aws/requests/compute/restore_address_to_classic.rb      | 2 +-
 lib/fog/aws/requests/compute/revoke_security_group_egress.rb    | 2 +-
 lib/fog/aws/requests/compute/revoke_security_group_ingress.rb   | 2 +-
 lib/fog/aws/requests/compute/run_instances.rb                   | 2 +-
 lib/fog/aws/requests/compute/start_instances.rb                 | 2 +-
 lib/fog/aws/requests/compute/stop_instances.rb                  | 2 +-
 lib/fog/aws/requests/compute/terminate_instances.rb             | 2 +-
 lib/fog/aws/requests/compute/unmonitor_instances.rb             | 2 +-
 121 files changed, 121 insertions(+), 121 deletions(-)

diff --git a/lib/fog/aws/requests/compute/allocate_address.rb b/lib/fog/aws/requests/compute/allocate_address.rb
index 9990bcaeea..0b16747283 100644
--- a/lib/fog/aws/requests/compute/allocate_address.rb
+++ b/lib/fog/aws/requests/compute/allocate_address.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/allocate_address'
 
diff --git a/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb b/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb
index 09184331c9..30591f317c 100644
--- a/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb
+++ b/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/assign_private_ip_addresses'
 
diff --git a/lib/fog/aws/requests/compute/associate_address.rb b/lib/fog/aws/requests/compute/associate_address.rb
index bc854c715a..5a96c240f1 100644
--- a/lib/fog/aws/requests/compute/associate_address.rb
+++ b/lib/fog/aws/requests/compute/associate_address.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/associate_address'
 
diff --git a/lib/fog/aws/requests/compute/associate_dhcp_options.rb b/lib/fog/aws/requests/compute/associate_dhcp_options.rb
index 9bd4afd874..39c18807ee 100644
--- a/lib/fog/aws/requests/compute/associate_dhcp_options.rb
+++ b/lib/fog/aws/requests/compute/associate_dhcp_options.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         #
diff --git a/lib/fog/aws/requests/compute/associate_route_table.rb b/lib/fog/aws/requests/compute/associate_route_table.rb
index 27cf2bcc3e..5bd024ad00 100644
--- a/lib/fog/aws/requests/compute/associate_route_table.rb
+++ b/lib/fog/aws/requests/compute/associate_route_table.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/associate_route_table'
         # Associates a subnet with a route table.
diff --git a/lib/fog/aws/requests/compute/attach_classic_link_vpc.rb b/lib/fog/aws/requests/compute/attach_classic_link_vpc.rb
index 9d8141d648..026db2faeb 100644
--- a/lib/fog/aws/requests/compute/attach_classic_link_vpc.rb
+++ b/lib/fog/aws/requests/compute/attach_classic_link_vpc.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # Links an EC2-Classic instance to a ClassicLink-enabled VPC through one or more of the VPC's security groups
diff --git a/lib/fog/aws/requests/compute/attach_internet_gateway.rb b/lib/fog/aws/requests/compute/attach_internet_gateway.rb
index a17498f481..62745f84f6 100644
--- a/lib/fog/aws/requests/compute/attach_internet_gateway.rb
+++ b/lib/fog/aws/requests/compute/attach_internet_gateway.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # Attaches an Internet gateway to a VPC, enabling connectivity between the Internet and the VPC
diff --git a/lib/fog/aws/requests/compute/attach_network_interface.rb b/lib/fog/aws/requests/compute/attach_network_interface.rb
index 78bfffaead..3b1b51ed77 100644
--- a/lib/fog/aws/requests/compute/attach_network_interface.rb
+++ b/lib/fog/aws/requests/compute/attach_network_interface.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/attach_network_interface'
 
diff --git a/lib/fog/aws/requests/compute/attach_volume.rb b/lib/fog/aws/requests/compute/attach_volume.rb
index b6304c6624..e06da1545e 100644
--- a/lib/fog/aws/requests/compute/attach_volume.rb
+++ b/lib/fog/aws/requests/compute/attach_volume.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/attach_volume'
 
diff --git a/lib/fog/aws/requests/compute/authorize_security_group_egress.rb b/lib/fog/aws/requests/compute/authorize_security_group_egress.rb
index cd19244a7a..ced6078883 100644
--- a/lib/fog/aws/requests/compute/authorize_security_group_egress.rb
+++ b/lib/fog/aws/requests/compute/authorize_security_group_egress.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb b/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb
index 1d6ec9ef2b..159c9a6dd5 100644
--- a/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb
+++ b/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb b/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb
index b7acb2080b..6505587111 100644
--- a/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb
+++ b/lib/fog/aws/requests/compute/cancel_spot_instance_requests.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/cancel_spot_instance_requests'
 
diff --git a/lib/fog/aws/requests/compute/copy_image.rb b/lib/fog/aws/requests/compute/copy_image.rb
index aa78988651..8213dcaf1a 100644
--- a/lib/fog/aws/requests/compute/copy_image.rb
+++ b/lib/fog/aws/requests/compute/copy_image.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/copy_image'
 
diff --git a/lib/fog/aws/requests/compute/copy_snapshot.rb b/lib/fog/aws/requests/compute/copy_snapshot.rb
index 0c230609c2..9070e31be8 100644
--- a/lib/fog/aws/requests/compute/copy_snapshot.rb
+++ b/lib/fog/aws/requests/compute/copy_snapshot.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/copy_snapshot'
 
diff --git a/lib/fog/aws/requests/compute/create_dhcp_options.rb b/lib/fog/aws/requests/compute/create_dhcp_options.rb
index c1a8b26243..21c11e2f31 100644
--- a/lib/fog/aws/requests/compute/create_dhcp_options.rb
+++ b/lib/fog/aws/requests/compute/create_dhcp_options.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/create_dhcp_options'
 
diff --git a/lib/fog/aws/requests/compute/create_image.rb b/lib/fog/aws/requests/compute/create_image.rb
index 13c30ef8a6..6649622a72 100644
--- a/lib/fog/aws/requests/compute/create_image.rb
+++ b/lib/fog/aws/requests/compute/create_image.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/create_image'
 
diff --git a/lib/fog/aws/requests/compute/create_internet_gateway.rb b/lib/fog/aws/requests/compute/create_internet_gateway.rb
index 8ee4807170..5a5249edfa 100644
--- a/lib/fog/aws/requests/compute/create_internet_gateway.rb
+++ b/lib/fog/aws/requests/compute/create_internet_gateway.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/create_internet_gateway'
 
diff --git a/lib/fog/aws/requests/compute/create_key_pair.rb b/lib/fog/aws/requests/compute/create_key_pair.rb
index 920876cb28..245bd782aa 100644
--- a/lib/fog/aws/requests/compute/create_key_pair.rb
+++ b/lib/fog/aws/requests/compute/create_key_pair.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/create_key_pair'
 
diff --git a/lib/fog/aws/requests/compute/create_network_acl.rb b/lib/fog/aws/requests/compute/create_network_acl.rb
index 4e9f9f853c..b1a1605df1 100644
--- a/lib/fog/aws/requests/compute/create_network_acl.rb
+++ b/lib/fog/aws/requests/compute/create_network_acl.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/create_network_acl'
 
diff --git a/lib/fog/aws/requests/compute/create_network_acl_entry.rb b/lib/fog/aws/requests/compute/create_network_acl_entry.rb
index d58fc4e11c..f8cc8e8b0f 100644
--- a/lib/fog/aws/requests/compute/create_network_acl_entry.rb
+++ b/lib/fog/aws/requests/compute/create_network_acl_entry.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/create_network_interface.rb b/lib/fog/aws/requests/compute/create_network_interface.rb
index e99e7cd568..33e3225eb3 100644
--- a/lib/fog/aws/requests/compute/create_network_interface.rb
+++ b/lib/fog/aws/requests/compute/create_network_interface.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/create_network_interface'
 
diff --git a/lib/fog/aws/requests/compute/create_placement_group.rb b/lib/fog/aws/requests/compute/create_placement_group.rb
index 77b59f77ec..5b2b95bbd5 100644
--- a/lib/fog/aws/requests/compute/create_placement_group.rb
+++ b/lib/fog/aws/requests/compute/create_placement_group.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/create_route.rb b/lib/fog/aws/requests/compute/create_route.rb
index fd706dc9d6..fbfe908b96 100644
--- a/lib/fog/aws/requests/compute/create_route.rb
+++ b/lib/fog/aws/requests/compute/create_route.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/create_route_table.rb b/lib/fog/aws/requests/compute/create_route_table.rb
index d351b2d576..b9ffb947b9 100644
--- a/lib/fog/aws/requests/compute/create_route_table.rb
+++ b/lib/fog/aws/requests/compute/create_route_table.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/create_route_table'
 
diff --git a/lib/fog/aws/requests/compute/create_security_group.rb b/lib/fog/aws/requests/compute/create_security_group.rb
index cfb1d62921..881da8de2f 100644
--- a/lib/fog/aws/requests/compute/create_security_group.rb
+++ b/lib/fog/aws/requests/compute/create_security_group.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/create_security_group'
 
diff --git a/lib/fog/aws/requests/compute/create_snapshot.rb b/lib/fog/aws/requests/compute/create_snapshot.rb
index b3f51a7521..2329eefe30 100644
--- a/lib/fog/aws/requests/compute/create_snapshot.rb
+++ b/lib/fog/aws/requests/compute/create_snapshot.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/create_snapshot'
 
diff --git a/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb b/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb
index 990598a120..e5333c0670 100644
--- a/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb
+++ b/lib/fog/aws/requests/compute/create_spot_datafeed_subscription.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/spot_datafeed_subscription'
 
diff --git a/lib/fog/aws/requests/compute/create_subnet.rb b/lib/fog/aws/requests/compute/create_subnet.rb
index 6c3521e389..d9302ba5ee 100644
--- a/lib/fog/aws/requests/compute/create_subnet.rb
+++ b/lib/fog/aws/requests/compute/create_subnet.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'ipaddress'
         require 'fog/aws/parsers/compute/create_subnet'
diff --git a/lib/fog/aws/requests/compute/create_tags.rb b/lib/fog/aws/requests/compute/create_tags.rb
index 4fc127002a..f180467dc0 100644
--- a/lib/fog/aws/requests/compute/create_tags.rb
+++ b/lib/fog/aws/requests/compute/create_tags.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/create_volume.rb b/lib/fog/aws/requests/compute/create_volume.rb
index 3026f49da3..44c23df77d 100644
--- a/lib/fog/aws/requests/compute/create_volume.rb
+++ b/lib/fog/aws/requests/compute/create_volume.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/create_volume'
 
diff --git a/lib/fog/aws/requests/compute/create_vpc.rb b/lib/fog/aws/requests/compute/create_vpc.rb
index 6d016debc0..13a815a228 100644
--- a/lib/fog/aws/requests/compute/create_vpc.rb
+++ b/lib/fog/aws/requests/compute/create_vpc.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/create_vpc'
 
diff --git a/lib/fog/aws/requests/compute/delete_dhcp_options.rb b/lib/fog/aws/requests/compute/delete_dhcp_options.rb
index cda1f0bab6..8655bf4073 100644
--- a/lib/fog/aws/requests/compute/delete_dhcp_options.rb
+++ b/lib/fog/aws/requests/compute/delete_dhcp_options.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         #Deletes a set of DHCP options that you specify. Amazon VPC returns an error if the set of options you specify is currently
diff --git a/lib/fog/aws/requests/compute/delete_internet_gateway.rb b/lib/fog/aws/requests/compute/delete_internet_gateway.rb
index 4e8a6c715f..86e3de4a9f 100644
--- a/lib/fog/aws/requests/compute/delete_internet_gateway.rb
+++ b/lib/fog/aws/requests/compute/delete_internet_gateway.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         #Deletes an Internet gateway from your AWS account. The gateway must not be attached to a VPC
diff --git a/lib/fog/aws/requests/compute/delete_key_pair.rb b/lib/fog/aws/requests/compute/delete_key_pair.rb
index d00c2177ac..afacf2c711 100644
--- a/lib/fog/aws/requests/compute/delete_key_pair.rb
+++ b/lib/fog/aws/requests/compute/delete_key_pair.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/delete_network_acl.rb b/lib/fog/aws/requests/compute/delete_network_acl.rb
index b0d0af9d37..8a5265e9e0 100644
--- a/lib/fog/aws/requests/compute/delete_network_acl.rb
+++ b/lib/fog/aws/requests/compute/delete_network_acl.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/delete_network_acl_entry.rb b/lib/fog/aws/requests/compute/delete_network_acl_entry.rb
index 13fb8263d9..4238153c2e 100644
--- a/lib/fog/aws/requests/compute/delete_network_acl_entry.rb
+++ b/lib/fog/aws/requests/compute/delete_network_acl_entry.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/delete_network_interface.rb b/lib/fog/aws/requests/compute/delete_network_interface.rb
index 286fd27d9e..8d123e387e 100644
--- a/lib/fog/aws/requests/compute/delete_network_interface.rb
+++ b/lib/fog/aws/requests/compute/delete_network_interface.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # Deletes a network interface.
diff --git a/lib/fog/aws/requests/compute/delete_placement_group.rb b/lib/fog/aws/requests/compute/delete_placement_group.rb
index dfc152c65c..959cd167eb 100644
--- a/lib/fog/aws/requests/compute/delete_placement_group.rb
+++ b/lib/fog/aws/requests/compute/delete_placement_group.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/delete_route.rb b/lib/fog/aws/requests/compute/delete_route.rb
index b337aa1ce4..77051f1f99 100644
--- a/lib/fog/aws/requests/compute/delete_route.rb
+++ b/lib/fog/aws/requests/compute/delete_route.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/delete_route_table.rb b/lib/fog/aws/requests/compute/delete_route_table.rb
index 25dde57ada..7c77d92660 100644
--- a/lib/fog/aws/requests/compute/delete_route_table.rb
+++ b/lib/fog/aws/requests/compute/delete_route_table.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/delete_security_group.rb b/lib/fog/aws/requests/compute/delete_security_group.rb
index 80207bd282..77e4e4a3db 100644
--- a/lib/fog/aws/requests/compute/delete_security_group.rb
+++ b/lib/fog/aws/requests/compute/delete_security_group.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/delete_snapshot.rb b/lib/fog/aws/requests/compute/delete_snapshot.rb
index 459c77f4a6..6570594988 100644
--- a/lib/fog/aws/requests/compute/delete_snapshot.rb
+++ b/lib/fog/aws/requests/compute/delete_snapshot.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb b/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb
index eec5a7c896..0935ec4a74 100644
--- a/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb
+++ b/lib/fog/aws/requests/compute/delete_spot_datafeed_subscription.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/delete_subnet.rb b/lib/fog/aws/requests/compute/delete_subnet.rb
index 2db9f7b45e..3e284d17e1 100644
--- a/lib/fog/aws/requests/compute/delete_subnet.rb
+++ b/lib/fog/aws/requests/compute/delete_subnet.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # Deletes a subnet from a VPC. You must terminate all running instances in the subnet before deleting it, otherwise Amazon
diff --git a/lib/fog/aws/requests/compute/delete_tags.rb b/lib/fog/aws/requests/compute/delete_tags.rb
index 170c7d02b3..882a6dbd24 100644
--- a/lib/fog/aws/requests/compute/delete_tags.rb
+++ b/lib/fog/aws/requests/compute/delete_tags.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/delete_volume.rb b/lib/fog/aws/requests/compute/delete_volume.rb
index 64c00161ab..eaa0ee14bb 100644
--- a/lib/fog/aws/requests/compute/delete_volume.rb
+++ b/lib/fog/aws/requests/compute/delete_volume.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/delete_vpc.rb b/lib/fog/aws/requests/compute/delete_vpc.rb
index 9bd66d6152..8ecb89cf0f 100644
--- a/lib/fog/aws/requests/compute/delete_vpc.rb
+++ b/lib/fog/aws/requests/compute/delete_vpc.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/deregister_image.rb b/lib/fog/aws/requests/compute/deregister_image.rb
index 6fc6719884..d3e9132519 100644
--- a/lib/fog/aws/requests/compute/deregister_image.rb
+++ b/lib/fog/aws/requests/compute/deregister_image.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/deregister_image'
 
diff --git a/lib/fog/aws/requests/compute/describe_account_attributes.rb b/lib/fog/aws/requests/compute/describe_account_attributes.rb
index f1d5b7dbfc..59128ea270 100644
--- a/lib/fog/aws/requests/compute/describe_account_attributes.rb
+++ b/lib/fog/aws/requests/compute/describe_account_attributes.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_account_attributes'
 
diff --git a/lib/fog/aws/requests/compute/describe_addresses.rb b/lib/fog/aws/requests/compute/describe_addresses.rb
index aeca1219f7..9486be3739 100644
--- a/lib/fog/aws/requests/compute/describe_addresses.rb
+++ b/lib/fog/aws/requests/compute/describe_addresses.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_addresses'
 
diff --git a/lib/fog/aws/requests/compute/describe_availability_zones.rb b/lib/fog/aws/requests/compute/describe_availability_zones.rb
index bcbefa2c7a..a2e3b83304 100644
--- a/lib/fog/aws/requests/compute/describe_availability_zones.rb
+++ b/lib/fog/aws/requests/compute/describe_availability_zones.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_availability_zones'
 
diff --git a/lib/fog/aws/requests/compute/describe_classic_link_instances.rb b/lib/fog/aws/requests/compute/describe_classic_link_instances.rb
index 9acbaed819..8d0e8b09e9 100644
--- a/lib/fog/aws/requests/compute/describe_classic_link_instances.rb
+++ b/lib/fog/aws/requests/compute/describe_classic_link_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_classic_link_instances'
         # Describes one or more of your linked EC2-Classic instances. This request only returns information about EC2-Classic instances linked to a VPC through ClassicLink; you cannot use this request to return information about other instances.
diff --git a/lib/fog/aws/requests/compute/describe_dhcp_options.rb b/lib/fog/aws/requests/compute/describe_dhcp_options.rb
index 64c93cc49f..93c12a41f5 100644
--- a/lib/fog/aws/requests/compute/describe_dhcp_options.rb
+++ b/lib/fog/aws/requests/compute/describe_dhcp_options.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_dhcp_options'
 
diff --git a/lib/fog/aws/requests/compute/describe_images.rb b/lib/fog/aws/requests/compute/describe_images.rb
index 681f0c47c7..0461e8dbb0 100644
--- a/lib/fog/aws/requests/compute/describe_images.rb
+++ b/lib/fog/aws/requests/compute/describe_images.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_images'
 
diff --git a/lib/fog/aws/requests/compute/describe_instance_attribute.rb b/lib/fog/aws/requests/compute/describe_instance_attribute.rb
index d906ef9a00..3de96ffe59 100644
--- a/lib/fog/aws/requests/compute/describe_instance_attribute.rb
+++ b/lib/fog/aws/requests/compute/describe_instance_attribute.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_instance_attribute'
         # Describes an instance attribute value
diff --git a/lib/fog/aws/requests/compute/describe_instance_status.rb b/lib/fog/aws/requests/compute/describe_instance_status.rb
index fb070cbbb1..92e5b9f45c 100644
--- a/lib/fog/aws/requests/compute/describe_instance_status.rb
+++ b/lib/fog/aws/requests/compute/describe_instance_status.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_instance_status'
 
diff --git a/lib/fog/aws/requests/compute/describe_instances.rb b/lib/fog/aws/requests/compute/describe_instances.rb
index c9a085adcd..be704c6d1d 100644
--- a/lib/fog/aws/requests/compute/describe_instances.rb
+++ b/lib/fog/aws/requests/compute/describe_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_instances'
 
diff --git a/lib/fog/aws/requests/compute/describe_internet_gateways.rb b/lib/fog/aws/requests/compute/describe_internet_gateways.rb
index f665991b3d..97b5a822b3 100644
--- a/lib/fog/aws/requests/compute/describe_internet_gateways.rb
+++ b/lib/fog/aws/requests/compute/describe_internet_gateways.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_internet_gateways'
 
diff --git a/lib/fog/aws/requests/compute/describe_key_pairs.rb b/lib/fog/aws/requests/compute/describe_key_pairs.rb
index f5f603da1d..5cdd302472 100644
--- a/lib/fog/aws/requests/compute/describe_key_pairs.rb
+++ b/lib/fog/aws/requests/compute/describe_key_pairs.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_key_pairs'
 
diff --git a/lib/fog/aws/requests/compute/describe_network_acls.rb b/lib/fog/aws/requests/compute/describe_network_acls.rb
index 33f11c8bf6..7160744c27 100644
--- a/lib/fog/aws/requests/compute/describe_network_acls.rb
+++ b/lib/fog/aws/requests/compute/describe_network_acls.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_network_acls'
 
diff --git a/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb b/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb
index 8fa74dd80f..8eaa4b73fd 100644
--- a/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb
+++ b/lib/fog/aws/requests/compute/describe_network_interface_attribute.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_network_interface_attribute'
         # Describes a network interface attribute value
diff --git a/lib/fog/aws/requests/compute/describe_network_interfaces.rb b/lib/fog/aws/requests/compute/describe_network_interfaces.rb
index c712ae22f9..e0219d18e4 100644
--- a/lib/fog/aws/requests/compute/describe_network_interfaces.rb
+++ b/lib/fog/aws/requests/compute/describe_network_interfaces.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_network_interfaces'
 
diff --git a/lib/fog/aws/requests/compute/describe_placement_groups.rb b/lib/fog/aws/requests/compute/describe_placement_groups.rb
index fe09c733be..8efd729d22 100644
--- a/lib/fog/aws/requests/compute/describe_placement_groups.rb
+++ b/lib/fog/aws/requests/compute/describe_placement_groups.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_placement_groups'
 
diff --git a/lib/fog/aws/requests/compute/describe_regions.rb b/lib/fog/aws/requests/compute/describe_regions.rb
index 1b2c0fcacf..9008079633 100644
--- a/lib/fog/aws/requests/compute/describe_regions.rb
+++ b/lib/fog/aws/requests/compute/describe_regions.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_regions'
 
diff --git a/lib/fog/aws/requests/compute/describe_reserved_instances.rb b/lib/fog/aws/requests/compute/describe_reserved_instances.rb
index 204ecdca0a..c6dbb2c981 100644
--- a/lib/fog/aws/requests/compute/describe_reserved_instances.rb
+++ b/lib/fog/aws/requests/compute/describe_reserved_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_reserved_instances'
 
diff --git a/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb b/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb
index 6662c20194..d744065cd6 100644
--- a/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb
+++ b/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_reserved_instances_offerings'
 
diff --git a/lib/fog/aws/requests/compute/describe_route_tables.rb b/lib/fog/aws/requests/compute/describe_route_tables.rb
index c50d2952b9..f52ea2f00c 100644
--- a/lib/fog/aws/requests/compute/describe_route_tables.rb
+++ b/lib/fog/aws/requests/compute/describe_route_tables.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_route_tables'
 
diff --git a/lib/fog/aws/requests/compute/describe_security_groups.rb b/lib/fog/aws/requests/compute/describe_security_groups.rb
index c72a614677..7e11ddd5bb 100644
--- a/lib/fog/aws/requests/compute/describe_security_groups.rb
+++ b/lib/fog/aws/requests/compute/describe_security_groups.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_security_groups'
 
diff --git a/lib/fog/aws/requests/compute/describe_snapshots.rb b/lib/fog/aws/requests/compute/describe_snapshots.rb
index 5b1db74ffe..c477d28b9e 100644
--- a/lib/fog/aws/requests/compute/describe_snapshots.rb
+++ b/lib/fog/aws/requests/compute/describe_snapshots.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_snapshots'
 
diff --git a/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb b/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb
index ffc44c4860..0dde96628d 100644
--- a/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb
+++ b/lib/fog/aws/requests/compute/describe_spot_datafeed_subscription.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/spot_datafeed_subscription'
 
diff --git a/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb b/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb
index 97c7de5783..84d52fdba9 100644
--- a/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb
+++ b/lib/fog/aws/requests/compute/describe_spot_instance_requests.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/spot_instance_requests'
 
diff --git a/lib/fog/aws/requests/compute/describe_spot_price_history.rb b/lib/fog/aws/requests/compute/describe_spot_price_history.rb
index acfbfc2ca6..852a248449 100644
--- a/lib/fog/aws/requests/compute/describe_spot_price_history.rb
+++ b/lib/fog/aws/requests/compute/describe_spot_price_history.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_spot_price_history'
 
diff --git a/lib/fog/aws/requests/compute/describe_subnets.rb b/lib/fog/aws/requests/compute/describe_subnets.rb
index 29c655054d..1b93fbd9ed 100644
--- a/lib/fog/aws/requests/compute/describe_subnets.rb
+++ b/lib/fog/aws/requests/compute/describe_subnets.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_subnets'
 
diff --git a/lib/fog/aws/requests/compute/describe_tags.rb b/lib/fog/aws/requests/compute/describe_tags.rb
index 208df4af0a..a253ad465e 100644
--- a/lib/fog/aws/requests/compute/describe_tags.rb
+++ b/lib/fog/aws/requests/compute/describe_tags.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_tags'
 
diff --git a/lib/fog/aws/requests/compute/describe_volume_status.rb b/lib/fog/aws/requests/compute/describe_volume_status.rb
index 0bd9a710c7..2880fd32c1 100644
--- a/lib/fog/aws/requests/compute/describe_volume_status.rb
+++ b/lib/fog/aws/requests/compute/describe_volume_status.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_volume_status'
 
diff --git a/lib/fog/aws/requests/compute/describe_volumes.rb b/lib/fog/aws/requests/compute/describe_volumes.rb
index 384999a04a..42f18bbbd1 100644
--- a/lib/fog/aws/requests/compute/describe_volumes.rb
+++ b/lib/fog/aws/requests/compute/describe_volumes.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_volumes'
 
diff --git a/lib/fog/aws/requests/compute/describe_volumes_modifications.rb b/lib/fog/aws/requests/compute/describe_volumes_modifications.rb
index fffdc37418..361d0e3628 100644
--- a/lib/fog/aws/requests/compute/describe_volumes_modifications.rb
+++ b/lib/fog/aws/requests/compute/describe_volumes_modifications.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_volumes_modifications'
 
diff --git a/lib/fog/aws/requests/compute/describe_vpc_attribute.rb b/lib/fog/aws/requests/compute/describe_vpc_attribute.rb
index 80b0df618f..6b546f8039 100644
--- a/lib/fog/aws/requests/compute/describe_vpc_attribute.rb
+++ b/lib/fog/aws/requests/compute/describe_vpc_attribute.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_vpc_attribute'
         # Describes a vpc attribute value
diff --git a/lib/fog/aws/requests/compute/describe_vpc_classic_link.rb b/lib/fog/aws/requests/compute/describe_vpc_classic_link.rb
index 5356a774a5..d0393fd228 100644
--- a/lib/fog/aws/requests/compute/describe_vpc_classic_link.rb
+++ b/lib/fog/aws/requests/compute/describe_vpc_classic_link.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_vpc_classic_link'
         # Describes the ClassicLink status of one or more VPCs.
diff --git a/lib/fog/aws/requests/compute/describe_vpc_classic_link_dns_support.rb b/lib/fog/aws/requests/compute/describe_vpc_classic_link_dns_support.rb
index d2ae493c3c..c5a1cb9c3c 100644
--- a/lib/fog/aws/requests/compute/describe_vpc_classic_link_dns_support.rb
+++ b/lib/fog/aws/requests/compute/describe_vpc_classic_link_dns_support.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_vpc_classic_link_dns_support'
 
diff --git a/lib/fog/aws/requests/compute/describe_vpcs.rb b/lib/fog/aws/requests/compute/describe_vpcs.rb
index 08ea466873..727418bdc3 100644
--- a/lib/fog/aws/requests/compute/describe_vpcs.rb
+++ b/lib/fog/aws/requests/compute/describe_vpcs.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/describe_vpcs'
 
diff --git a/lib/fog/aws/requests/compute/detach_classic_link_vpc.rb b/lib/fog/aws/requests/compute/detach_classic_link_vpc.rb
index a4d594ba30..55100ae4cc 100644
--- a/lib/fog/aws/requests/compute/detach_classic_link_vpc.rb
+++ b/lib/fog/aws/requests/compute/detach_classic_link_vpc.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # Links an EC2-Classic instance to a ClassicLink-enabled VPC through one or more of the VPC's security groups
diff --git a/lib/fog/aws/requests/compute/detach_internet_gateway.rb b/lib/fog/aws/requests/compute/detach_internet_gateway.rb
index f7e4ac1d65..465523a3ab 100644
--- a/lib/fog/aws/requests/compute/detach_internet_gateway.rb
+++ b/lib/fog/aws/requests/compute/detach_internet_gateway.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # Detaches an Internet gateway to a VPC, enabling connectivity between the Internet and the VPC
diff --git a/lib/fog/aws/requests/compute/detach_network_interface.rb b/lib/fog/aws/requests/compute/detach_network_interface.rb
index fe1f5507f2..530656ff9d 100644
--- a/lib/fog/aws/requests/compute/detach_network_interface.rb
+++ b/lib/fog/aws/requests/compute/detach_network_interface.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # Detaches a network interface.
diff --git a/lib/fog/aws/requests/compute/detach_volume.rb b/lib/fog/aws/requests/compute/detach_volume.rb
index 515b0a981f..1e39284e13 100644
--- a/lib/fog/aws/requests/compute/detach_volume.rb
+++ b/lib/fog/aws/requests/compute/detach_volume.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/detach_volume'
 
diff --git a/lib/fog/aws/requests/compute/disable_vpc_classic_link.rb b/lib/fog/aws/requests/compute/disable_vpc_classic_link.rb
index eb16412f72..dd91fffc4d 100644
--- a/lib/fog/aws/requests/compute/disable_vpc_classic_link.rb
+++ b/lib/fog/aws/requests/compute/disable_vpc_classic_link.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # disavbles classic link for a vpc
diff --git a/lib/fog/aws/requests/compute/disable_vpc_classic_link_dns_support.rb b/lib/fog/aws/requests/compute/disable_vpc_classic_link_dns_support.rb
index 7179ab3e54..893629dd7c 100644
--- a/lib/fog/aws/requests/compute/disable_vpc_classic_link_dns_support.rb
+++ b/lib/fog/aws/requests/compute/disable_vpc_classic_link_dns_support.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/disassociate_address.rb b/lib/fog/aws/requests/compute/disassociate_address.rb
index 14910e3b9d..4914b5d65f 100644
--- a/lib/fog/aws/requests/compute/disassociate_address.rb
+++ b/lib/fog/aws/requests/compute/disassociate_address.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/disassociate_route_table.rb b/lib/fog/aws/requests/compute/disassociate_route_table.rb
index 0512f7e42e..afca086d58 100644
--- a/lib/fog/aws/requests/compute/disassociate_route_table.rb
+++ b/lib/fog/aws/requests/compute/disassociate_route_table.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/enable_vpc_classic_link.rb b/lib/fog/aws/requests/compute/enable_vpc_classic_link.rb
index 8a1fb915cf..aaa79431bb 100644
--- a/lib/fog/aws/requests/compute/enable_vpc_classic_link.rb
+++ b/lib/fog/aws/requests/compute/enable_vpc_classic_link.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
         # enables classic link for a vpc
diff --git a/lib/fog/aws/requests/compute/enable_vpc_classic_link_dns_support.rb b/lib/fog/aws/requests/compute/enable_vpc_classic_link_dns_support.rb
index bb47461480..fcbad31713 100644
--- a/lib/fog/aws/requests/compute/enable_vpc_classic_link_dns_support.rb
+++ b/lib/fog/aws/requests/compute/enable_vpc_classic_link_dns_support.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/get_console_output.rb b/lib/fog/aws/requests/compute/get_console_output.rb
index 089e96119a..c1224c3162 100644
--- a/lib/fog/aws/requests/compute/get_console_output.rb
+++ b/lib/fog/aws/requests/compute/get_console_output.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/get_console_output'
 
diff --git a/lib/fog/aws/requests/compute/get_password_data.rb b/lib/fog/aws/requests/compute/get_password_data.rb
index 58eb94e993..f5d6167879 100644
--- a/lib/fog/aws/requests/compute/get_password_data.rb
+++ b/lib/fog/aws/requests/compute/get_password_data.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/get_password_data'
 
diff --git a/lib/fog/aws/requests/compute/import_key_pair.rb b/lib/fog/aws/requests/compute/import_key_pair.rb
index 56f0be04a6..07b5537dda 100644
--- a/lib/fog/aws/requests/compute/import_key_pair.rb
+++ b/lib/fog/aws/requests/compute/import_key_pair.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/import_key_pair'
 
diff --git a/lib/fog/aws/requests/compute/modify_image_attribute.rb b/lib/fog/aws/requests/compute/modify_image_attribute.rb
index 551a0c8a3b..f5caebde2a 100644
--- a/lib/fog/aws/requests/compute/modify_image_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_image_attribute.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/modify_instance_attribute.rb b/lib/fog/aws/requests/compute/modify_instance_attribute.rb
index 4523a8ea69..b9965404b1 100644
--- a/lib/fog/aws/requests/compute/modify_instance_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_instance_attribute.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb b/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb
index c69dc13ea1..158ab4bc39 100644
--- a/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_network_interface_attribute.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb b/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb
index 1b8de54d95..fd98842238 100644
--- a/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/modify_subnet_attribute.rb b/lib/fog/aws/requests/compute/modify_subnet_attribute.rb
index 94f47d10c8..ecfaf2d5e4 100644
--- a/lib/fog/aws/requests/compute/modify_subnet_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_subnet_attribute.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/modify_subnet_attribute'
 
diff --git a/lib/fog/aws/requests/compute/modify_volume.rb b/lib/fog/aws/requests/compute/modify_volume.rb
index 76130a8437..0e9e179e55 100644
--- a/lib/fog/aws/requests/compute/modify_volume.rb
+++ b/lib/fog/aws/requests/compute/modify_volume.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/modify_volume'
 
diff --git a/lib/fog/aws/requests/compute/modify_volume_attribute.rb b/lib/fog/aws/requests/compute/modify_volume_attribute.rb
index 831137f9fc..94fb5e75f4 100644
--- a/lib/fog/aws/requests/compute/modify_volume_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_volume_attribute.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/modify_vpc_attribute.rb b/lib/fog/aws/requests/compute/modify_vpc_attribute.rb
index 4e87e78af9..d20e0f6a01 100644
--- a/lib/fog/aws/requests/compute/modify_vpc_attribute.rb
+++ b/lib/fog/aws/requests/compute/modify_vpc_attribute.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/monitor_instances.rb b/lib/fog/aws/requests/compute/monitor_instances.rb
index 3815886acd..41e1abb44e 100644
--- a/lib/fog/aws/requests/compute/monitor_instances.rb
+++ b/lib/fog/aws/requests/compute/monitor_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/monitor_unmonitor_instances'
 
diff --git a/lib/fog/aws/requests/compute/move_address_to_vpc.rb b/lib/fog/aws/requests/compute/move_address_to_vpc.rb
index 5f2a325925..754eb4081d 100644
--- a/lib/fog/aws/requests/compute/move_address_to_vpc.rb
+++ b/lib/fog/aws/requests/compute/move_address_to_vpc.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/move_address_to_vpc'
 
diff --git a/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb b/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb
index 05a43532d3..fba0da315a 100644
--- a/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb
+++ b/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/purchase_reserved_instances_offering'
 
diff --git a/lib/fog/aws/requests/compute/reboot_instances.rb b/lib/fog/aws/requests/compute/reboot_instances.rb
index 9b4bb6050a..fa72f08646 100644
--- a/lib/fog/aws/requests/compute/reboot_instances.rb
+++ b/lib/fog/aws/requests/compute/reboot_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/register_image.rb b/lib/fog/aws/requests/compute/register_image.rb
index ad392984de..f1d11804b4 100644
--- a/lib/fog/aws/requests/compute/register_image.rb
+++ b/lib/fog/aws/requests/compute/register_image.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/register_image'
 
diff --git a/lib/fog/aws/requests/compute/release_address.rb b/lib/fog/aws/requests/compute/release_address.rb
index ec7ad8e59e..897af86a89 100644
--- a/lib/fog/aws/requests/compute/release_address.rb
+++ b/lib/fog/aws/requests/compute/release_address.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/replace_network_acl_association.rb b/lib/fog/aws/requests/compute/replace_network_acl_association.rb
index 3aec54d26c..0ed2ed8ff5 100644
--- a/lib/fog/aws/requests/compute/replace_network_acl_association.rb
+++ b/lib/fog/aws/requests/compute/replace_network_acl_association.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/replace_network_acl_association'
 
diff --git a/lib/fog/aws/requests/compute/replace_network_acl_entry.rb b/lib/fog/aws/requests/compute/replace_network_acl_entry.rb
index 22f2c75589..331c8dec2b 100644
--- a/lib/fog/aws/requests/compute/replace_network_acl_entry.rb
+++ b/lib/fog/aws/requests/compute/replace_network_acl_entry.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/replace_route.rb b/lib/fog/aws/requests/compute/replace_route.rb
index 1be85f2d89..25ce5afc5d 100644
--- a/lib/fog/aws/requests/compute/replace_route.rb
+++ b/lib/fog/aws/requests/compute/replace_route.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/request_spot_instances.rb b/lib/fog/aws/requests/compute/request_spot_instances.rb
index 466638434d..c1638aa10e 100644
--- a/lib/fog/aws/requests/compute/request_spot_instances.rb
+++ b/lib/fog/aws/requests/compute/request_spot_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/spot_instance_requests'
 
diff --git a/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb b/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb
index 3af1ba0a31..81226f8d83 100644
--- a/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb
+++ b/lib/fog/aws/requests/compute/reset_network_interface_attribute.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/restore_address_to_classic.rb b/lib/fog/aws/requests/compute/restore_address_to_classic.rb
index 24fafe8aaa..2c5b5f8c43 100644
--- a/lib/fog/aws/requests/compute/restore_address_to_classic.rb
+++ b/lib/fog/aws/requests/compute/restore_address_to_classic.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/restore_address_to_classic'
 
diff --git a/lib/fog/aws/requests/compute/revoke_security_group_egress.rb b/lib/fog/aws/requests/compute/revoke_security_group_egress.rb
index 92b8537b57..9fbb502c1b 100644
--- a/lib/fog/aws/requests/compute/revoke_security_group_egress.rb
+++ b/lib/fog/aws/requests/compute/revoke_security_group_egress.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb b/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb
index 2626c43a60..5eb948cc3d 100644
--- a/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb
+++ b/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/basic'
 
diff --git a/lib/fog/aws/requests/compute/run_instances.rb b/lib/fog/aws/requests/compute/run_instances.rb
index 66b39b9665..1ae2cf57f8 100644
--- a/lib/fog/aws/requests/compute/run_instances.rb
+++ b/lib/fog/aws/requests/compute/run_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/run_instances'
 
diff --git a/lib/fog/aws/requests/compute/start_instances.rb b/lib/fog/aws/requests/compute/start_instances.rb
index 7e0956e4aa..9fcc325f2a 100644
--- a/lib/fog/aws/requests/compute/start_instances.rb
+++ b/lib/fog/aws/requests/compute/start_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/start_stop_instances'
 
diff --git a/lib/fog/aws/requests/compute/stop_instances.rb b/lib/fog/aws/requests/compute/stop_instances.rb
index b0c4d36026..a6f3e1e528 100644
--- a/lib/fog/aws/requests/compute/stop_instances.rb
+++ b/lib/fog/aws/requests/compute/stop_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/start_stop_instances'
 
diff --git a/lib/fog/aws/requests/compute/terminate_instances.rb b/lib/fog/aws/requests/compute/terminate_instances.rb
index 47bd30deba..979f1da30f 100644
--- a/lib/fog/aws/requests/compute/terminate_instances.rb
+++ b/lib/fog/aws/requests/compute/terminate_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/terminate_instances'
 
diff --git a/lib/fog/aws/requests/compute/unmonitor_instances.rb b/lib/fog/aws/requests/compute/unmonitor_instances.rb
index 4daef82369..b3fd0a0db2 100644
--- a/lib/fog/aws/requests/compute/unmonitor_instances.rb
+++ b/lib/fog/aws/requests/compute/unmonitor_instances.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Compute
       class Real
         require 'fog/aws/parsers/compute/monitor_unmonitor_instances'
 

From 57d5b3d531db75d48abf7a5427cd9df1bf0a5c90 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Wed, 12 Sep 2018 18:46:11 +0900
Subject: [PATCH 12/39] Deprecate Compute::AWS

---
 lib/fog/aws/compute.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/fog/aws/compute.rb b/lib/fog/aws/compute.rb
index 5516b23f91..8a1ad8c994 100644
--- a/lib/fog/aws/compute.rb
+++ b/lib/fog/aws/compute.rb
@@ -656,4 +656,17 @@ def _request(body, headers, idempotent, parser, retries = 0)
       end
     end
   end
+
+  # @deprecated
+  module Compute
+    # @deprecated
+    class AWS < Fog::AWS::Compute
+      # @deprecated
+      # @overrides Fog::Service.new (from the fog-core gem)
+      def self.new(*)
+        Fog::Logger.deprecation 'Fog::Compute::AWS is deprecated, please use Fog::AWS::Compute.'
+        super
+      end
+    end
+  end
 end

From 3256c95a67943ae3ba14d3379464026252485a3d Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:06:53 +0900
Subject: [PATCH 13/39] Add AWS::DNS

---
 lib/fog/aws.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/fog/aws.rb b/lib/fog/aws.rb
index cf5f69cc66..321f3def53 100644
--- a/lib/fog/aws.rb
+++ b/lib/fog/aws.rb
@@ -13,10 +13,6 @@ module Compute
     autoload :AWS, File.expand_path('../aws/compute', __FILE__)
   end
 
-  module DNS
-    autoload :AWS, File.expand_path('../aws/dns', __FILE__)
-  end
-
   module Storage
     autoload :AWS, File.expand_path('../aws/storage', __FILE__)
   end
@@ -35,6 +31,7 @@ module AWS
     autoload :CloudFormation,   File.expand_path('../aws/cloud_formation', __FILE__)
     autoload :CloudWatch,       File.expand_path('../aws/cloud_watch', __FILE__)
     autoload :DataPipeline,     File.expand_path('../aws/data_pipeline', __FILE__)
+    autoload :DNS,              File.expand_path('../aws/dns', __FILE__)
     autoload :DynamoDB,         File.expand_path('../aws/dynamodb', __FILE__)
     autoload :ECS,              File.expand_path('../aws/ecs', __FILE__)
     autoload :EFS,              File.expand_path('../aws/efs', __FILE__)

From 23213cc239d1d3d3893451f7be562215f6d15c47 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:08:19 +0900
Subject: [PATCH 14/39] git grep -l "module DNS" -- lib/fog/aws/models/dns/ |
 xargs sed -i "" "s/module DNS/module AWS/g"

---
 lib/fog/aws/models/dns/record.rb  | 2 +-
 lib/fog/aws/models/dns/records.rb | 2 +-
 lib/fog/aws/models/dns/zone.rb    | 2 +-
 lib/fog/aws/models/dns/zones.rb   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/fog/aws/models/dns/record.rb b/lib/fog/aws/models/dns/record.rb
index 2aee4fb161..d968e6b39c 100644
--- a/lib/fog/aws/models/dns/record.rb
+++ b/lib/fog/aws/models/dns/record.rb
@@ -1,5 +1,5 @@
 module Fog
-  module DNS
+  module AWS
     class AWS
       class Record < Fog::Model
         extend Fog::Deprecation
diff --git a/lib/fog/aws/models/dns/records.rb b/lib/fog/aws/models/dns/records.rb
index 058d5ed297..bf9b2d2211 100644
--- a/lib/fog/aws/models/dns/records.rb
+++ b/lib/fog/aws/models/dns/records.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/dns/record'
 
 module Fog
-  module DNS
+  module AWS
     class AWS
       class Records < Fog::Collection
         attribute :is_truncated,            :aliases => ['IsTruncated']
diff --git a/lib/fog/aws/models/dns/zone.rb b/lib/fog/aws/models/dns/zone.rb
index 491ba9fc1e..6e865df562 100644
--- a/lib/fog/aws/models/dns/zone.rb
+++ b/lib/fog/aws/models/dns/zone.rb
@@ -1,7 +1,7 @@
 # require 'fog/aws/models/dns/records'
 
 module Fog
-  module DNS
+  module AWS
     class AWS
       class Zone < Fog::Model
         identity :id,                 :aliases => 'Id'
diff --git a/lib/fog/aws/models/dns/zones.rb b/lib/fog/aws/models/dns/zones.rb
index c8b53b7af9..2c758d2d8c 100644
--- a/lib/fog/aws/models/dns/zones.rb
+++ b/lib/fog/aws/models/dns/zones.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/dns/zone'
 
 module Fog
-  module DNS
+  module AWS
     class AWS
       class Zones < Fog::Collection
         attribute :marker,    :aliases => 'Marker'

From 5dd4bcc86efb46d043d7a3c7f4d506b43dc5e1e9 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:08:30 +0900
Subject: [PATCH 15/39] git grep -l "class AWS" -- lib/fog/aws/models/dns/ |
 xargs sed -i "" "s/class AWS/class DNS/g"

---
 lib/fog/aws/models/dns/record.rb  | 2 +-
 lib/fog/aws/models/dns/records.rb | 2 +-
 lib/fog/aws/models/dns/zone.rb    | 2 +-
 lib/fog/aws/models/dns/zones.rb   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/fog/aws/models/dns/record.rb b/lib/fog/aws/models/dns/record.rb
index d968e6b39c..61d7e31c00 100644
--- a/lib/fog/aws/models/dns/record.rb
+++ b/lib/fog/aws/models/dns/record.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class DNS
       class Record < Fog::Model
         extend Fog::Deprecation
         deprecate :ip, :value
diff --git a/lib/fog/aws/models/dns/records.rb b/lib/fog/aws/models/dns/records.rb
index bf9b2d2211..3ea655a689 100644
--- a/lib/fog/aws/models/dns/records.rb
+++ b/lib/fog/aws/models/dns/records.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class DNS
       class Records < Fog::Collection
         attribute :is_truncated,            :aliases => ['IsTruncated']
         attribute :max_items,               :aliases => ['MaxItems']
diff --git a/lib/fog/aws/models/dns/zone.rb b/lib/fog/aws/models/dns/zone.rb
index 6e865df562..c146cc99d4 100644
--- a/lib/fog/aws/models/dns/zone.rb
+++ b/lib/fog/aws/models/dns/zone.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class DNS
       class Zone < Fog::Model
         identity :id,                 :aliases => 'Id'
 
diff --git a/lib/fog/aws/models/dns/zones.rb b/lib/fog/aws/models/dns/zones.rb
index 2c758d2d8c..a638e5743f 100644
--- a/lib/fog/aws/models/dns/zones.rb
+++ b/lib/fog/aws/models/dns/zones.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class DNS
       class Zones < Fog::Collection
         attribute :marker,    :aliases => 'Marker'
         attribute :max_items, :aliases => 'MaxItems'

From 538d6a64c9b7678f3728b3310f1f5cfede2da5ee Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Sat, 15 Sep 2018 00:06:52 +0900
Subject: [PATCH 16/39] git grep -l "    module DNS" --
 lib/fog/aws/parsers/dns/ | xargs sed -i "" "s/    module DNS/    module
 AWS/g"

---
 lib/fog/aws/parsers/dns/change_resource_record_sets.rb | 2 +-
 lib/fog/aws/parsers/dns/create_hosted_zone.rb          | 2 +-
 lib/fog/aws/parsers/dns/delete_hosted_zone.rb          | 2 +-
 lib/fog/aws/parsers/dns/get_change.rb                  | 2 +-
 lib/fog/aws/parsers/dns/get_hosted_zone.rb             | 2 +-
 lib/fog/aws/parsers/dns/health_check.rb                | 2 +-
 lib/fog/aws/parsers/dns/list_health_checks.rb          | 2 +-
 lib/fog/aws/parsers/dns/list_hosted_zones.rb           | 2 +-
 lib/fog/aws/parsers/dns/list_resource_record_sets.rb   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/fog/aws/parsers/dns/change_resource_record_sets.rb b/lib/fog/aws/parsers/dns/change_resource_record_sets.rb
index 6f863240ed..958685fc4d 100644
--- a/lib/fog/aws/parsers/dns/change_resource_record_sets.rb
+++ b/lib/fog/aws/parsers/dns/change_resource_record_sets.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module DNS
+    module AWS
       module AWS
         class ChangeResourceRecordSets < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/dns/create_hosted_zone.rb b/lib/fog/aws/parsers/dns/create_hosted_zone.rb
index a835e63f61..2a9ba6afeb 100644
--- a/lib/fog/aws/parsers/dns/create_hosted_zone.rb
+++ b/lib/fog/aws/parsers/dns/create_hosted_zone.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module DNS
+    module AWS
       module AWS
         class CreateHostedZone < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/dns/delete_hosted_zone.rb b/lib/fog/aws/parsers/dns/delete_hosted_zone.rb
index 0ed53e9fb1..335cb65564 100644
--- a/lib/fog/aws/parsers/dns/delete_hosted_zone.rb
+++ b/lib/fog/aws/parsers/dns/delete_hosted_zone.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module DNS
+    module AWS
       module AWS
         class DeleteHostedZone < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/dns/get_change.rb b/lib/fog/aws/parsers/dns/get_change.rb
index 3e46d6a470..19e77f4a23 100644
--- a/lib/fog/aws/parsers/dns/get_change.rb
+++ b/lib/fog/aws/parsers/dns/get_change.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module DNS
+    module AWS
       module AWS
         class GetChange < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/dns/get_hosted_zone.rb b/lib/fog/aws/parsers/dns/get_hosted_zone.rb
index 83488ed1d6..a6cd545292 100644
--- a/lib/fog/aws/parsers/dns/get_hosted_zone.rb
+++ b/lib/fog/aws/parsers/dns/get_hosted_zone.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module DNS
+    module AWS
       module AWS
         class GetHostedZone < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/dns/health_check.rb b/lib/fog/aws/parsers/dns/health_check.rb
index 3b3ccb460d..e2d6e9e2d6 100644
--- a/lib/fog/aws/parsers/dns/health_check.rb
+++ b/lib/fog/aws/parsers/dns/health_check.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module DNS
+    module AWS
       module AWS
         class HealthCheck < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/dns/list_health_checks.rb b/lib/fog/aws/parsers/dns/list_health_checks.rb
index a775ada86f..bbba6c8841 100644
--- a/lib/fog/aws/parsers/dns/list_health_checks.rb
+++ b/lib/fog/aws/parsers/dns/list_health_checks.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module DNS
+    module AWS
       module AWS
         class ListHealthChecks < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/dns/list_hosted_zones.rb b/lib/fog/aws/parsers/dns/list_hosted_zones.rb
index fd709b5747..81c3d815eb 100644
--- a/lib/fog/aws/parsers/dns/list_hosted_zones.rb
+++ b/lib/fog/aws/parsers/dns/list_hosted_zones.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module DNS
+    module AWS
       module AWS
         class ListHostedZones < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/dns/list_resource_record_sets.rb b/lib/fog/aws/parsers/dns/list_resource_record_sets.rb
index 98385e5868..f9c4e739f3 100644
--- a/lib/fog/aws/parsers/dns/list_resource_record_sets.rb
+++ b/lib/fog/aws/parsers/dns/list_resource_record_sets.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module DNS
+    module AWS
       module AWS
         class ListResourceRecordSets < Fog::Parsers::Base
           def reset

From 0b8bd964bbe455b2e75ac8a6dbde199f8a8a211d Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Sat, 15 Sep 2018 00:07:05 +0900
Subject: [PATCH 17/39] git grep -l "      module AWS" --
 lib/fog/aws/parsers/dns/ | xargs sed -i "" "s/      module AWS/      module
 DNS/g"

---
 lib/fog/aws/parsers/dns/change_resource_record_sets.rb | 2 +-
 lib/fog/aws/parsers/dns/create_hosted_zone.rb          | 2 +-
 lib/fog/aws/parsers/dns/delete_hosted_zone.rb          | 2 +-
 lib/fog/aws/parsers/dns/get_change.rb                  | 2 +-
 lib/fog/aws/parsers/dns/get_hosted_zone.rb             | 2 +-
 lib/fog/aws/parsers/dns/health_check.rb                | 2 +-
 lib/fog/aws/parsers/dns/list_health_checks.rb          | 2 +-
 lib/fog/aws/parsers/dns/list_hosted_zones.rb           | 2 +-
 lib/fog/aws/parsers/dns/list_resource_record_sets.rb   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/fog/aws/parsers/dns/change_resource_record_sets.rb b/lib/fog/aws/parsers/dns/change_resource_record_sets.rb
index 958685fc4d..c9ca705cd3 100644
--- a/lib/fog/aws/parsers/dns/change_resource_record_sets.rb
+++ b/lib/fog/aws/parsers/dns/change_resource_record_sets.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module DNS
         class ChangeResourceRecordSets < Fog::Parsers::Base
           def reset
             @response = {}
diff --git a/lib/fog/aws/parsers/dns/create_hosted_zone.rb b/lib/fog/aws/parsers/dns/create_hosted_zone.rb
index 2a9ba6afeb..d4c9afae14 100644
--- a/lib/fog/aws/parsers/dns/create_hosted_zone.rb
+++ b/lib/fog/aws/parsers/dns/create_hosted_zone.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module DNS
         class CreateHostedZone < Fog::Parsers::Base
           def reset
             @hosted_zone = {}
diff --git a/lib/fog/aws/parsers/dns/delete_hosted_zone.rb b/lib/fog/aws/parsers/dns/delete_hosted_zone.rb
index 335cb65564..157aacb3cd 100644
--- a/lib/fog/aws/parsers/dns/delete_hosted_zone.rb
+++ b/lib/fog/aws/parsers/dns/delete_hosted_zone.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module DNS
         class DeleteHostedZone < Fog::Parsers::Base
           def reset
             @response = {}
diff --git a/lib/fog/aws/parsers/dns/get_change.rb b/lib/fog/aws/parsers/dns/get_change.rb
index 19e77f4a23..c7a33db014 100644
--- a/lib/fog/aws/parsers/dns/get_change.rb
+++ b/lib/fog/aws/parsers/dns/get_change.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module DNS
         class GetChange < Fog::Parsers::Base
           def reset
             @response = {}
diff --git a/lib/fog/aws/parsers/dns/get_hosted_zone.rb b/lib/fog/aws/parsers/dns/get_hosted_zone.rb
index a6cd545292..1049134ddf 100644
--- a/lib/fog/aws/parsers/dns/get_hosted_zone.rb
+++ b/lib/fog/aws/parsers/dns/get_hosted_zone.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module DNS
         class GetHostedZone < Fog::Parsers::Base
           def reset
             @hosted_zone = {}
diff --git a/lib/fog/aws/parsers/dns/health_check.rb b/lib/fog/aws/parsers/dns/health_check.rb
index e2d6e9e2d6..05edb97be8 100644
--- a/lib/fog/aws/parsers/dns/health_check.rb
+++ b/lib/fog/aws/parsers/dns/health_check.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module DNS
         class HealthCheck < Fog::Parsers::Base
           def reset
             @health_check = {}
diff --git a/lib/fog/aws/parsers/dns/list_health_checks.rb b/lib/fog/aws/parsers/dns/list_health_checks.rb
index bbba6c8841..60c504f242 100644
--- a/lib/fog/aws/parsers/dns/list_health_checks.rb
+++ b/lib/fog/aws/parsers/dns/list_health_checks.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module DNS
         class ListHealthChecks < Fog::Parsers::Base
           def reset
             @health_checks = []
diff --git a/lib/fog/aws/parsers/dns/list_hosted_zones.rb b/lib/fog/aws/parsers/dns/list_hosted_zones.rb
index 81c3d815eb..cbfe472e69 100644
--- a/lib/fog/aws/parsers/dns/list_hosted_zones.rb
+++ b/lib/fog/aws/parsers/dns/list_hosted_zones.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module DNS
         class ListHostedZones < Fog::Parsers::Base
           def reset
             @hosted_zones = []
diff --git a/lib/fog/aws/parsers/dns/list_resource_record_sets.rb b/lib/fog/aws/parsers/dns/list_resource_record_sets.rb
index f9c4e739f3..d350294614 100644
--- a/lib/fog/aws/parsers/dns/list_resource_record_sets.rb
+++ b/lib/fog/aws/parsers/dns/list_resource_record_sets.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module DNS
         class ListResourceRecordSets < Fog::Parsers::Base
           def reset
             @resource_record = []

From f9cc6bf2b128b158a394c1793fb64c865717e93a Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:09:08 +0900
Subject: [PATCH 18/39] git grep -l "DNS::AWS" -- lib/ | xargs sed -i ""
 "s/DNS::AWS/AWS::DNS/g"

---
 lib/fog/aws/dns.rb                                      | 6 +++---
 lib/fog/aws/models/dns/records.rb                       | 4 ++--
 lib/fog/aws/models/dns/zone.rb                          | 2 +-
 lib/fog/aws/models/dns/zones.rb                         | 4 ++--
 lib/fog/aws/requests/dns/change_resource_record_sets.rb | 6 +++---
 lib/fog/aws/requests/dns/create_health_check.rb         | 2 +-
 lib/fog/aws/requests/dns/create_hosted_zone.rb          | 4 ++--
 lib/fog/aws/requests/dns/delete_hosted_zone.rb          | 4 ++--
 lib/fog/aws/requests/dns/get_change.rb                  | 4 ++--
 lib/fog/aws/requests/dns/get_health_check.rb            | 2 +-
 lib/fog/aws/requests/dns/get_hosted_zone.rb             | 4 ++--
 lib/fog/aws/requests/dns/list_health_checks.rb          | 2 +-
 lib/fog/aws/requests/dns/list_hosted_zones.rb           | 2 +-
 lib/fog/aws/requests/dns/list_resource_record_sets.rb   | 6 +++---
 lib/fog/aws/service_mapper.rb                           | 2 +-
 15 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/lib/fog/aws/dns.rb b/lib/fog/aws/dns.rb
index 3418d778a9..c8158de153 100644
--- a/lib/fog/aws/dns.rb
+++ b/lib/fog/aws/dns.rb
@@ -77,7 +77,7 @@ class Real
         # :aws_secret_access_key in order to create a connection
         #
         # ==== Examples
-        #   dns = Fog::DNS::AWS.new(
+        #   dns = Fog::AWS::DNS.new(
         #     :aws_access_key_id => your_aws_access_key_id,
         #     :aws_secret_access_key => your_aws_secret_access_key
         #   )
@@ -147,9 +147,9 @@ def _request(params, &block)
           else
             raise case match[:code]
             when 'NoSuchHostedZone', 'NoSuchChange' then
-              Fog::DNS::AWS::NotFound.slurp(error, match[:message])
+              Fog::AWS::DNS::NotFound.slurp(error, match[:message])
             else
-              Fog::DNS::AWS::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
+              Fog::AWS::DNS::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
             end
           end
         end
diff --git a/lib/fog/aws/models/dns/records.rb b/lib/fog/aws/models/dns/records.rb
index 3ea655a689..80486c0f31 100644
--- a/lib/fog/aws/models/dns/records.rb
+++ b/lib/fog/aws/models/dns/records.rb
@@ -15,7 +15,7 @@ class Records < Fog::Collection
 
         attribute :zone
 
-        model Fog::DNS::AWS::Record
+        model Fog::AWS::DNS::Record
 
         def all(options = {})
           requires :zone
@@ -99,7 +99,7 @@ def get(record_name, record_type = nil, record_identifier = nil)
               record
             end
           end.compact.first
-        rescue Fog::DNS::AWS::NotFound
+        rescue Fog::AWS::DNS::NotFound
           nil
         end
 
diff --git a/lib/fog/aws/models/dns/zone.rb b/lib/fog/aws/models/dns/zone.rb
index c146cc99d4..7e7ddc65cc 100644
--- a/lib/fog/aws/models/dns/zone.rb
+++ b/lib/fog/aws/models/dns/zone.rb
@@ -20,7 +20,7 @@ def destroy
 
         def records
           @records ||= begin
-            Fog::DNS::AWS::Records.new(
+            Fog::AWS::DNS::Records.new(
               :zone       => self,
               :service => service
             )
diff --git a/lib/fog/aws/models/dns/zones.rb b/lib/fog/aws/models/dns/zones.rb
index a638e5743f..50b0b40923 100644
--- a/lib/fog/aws/models/dns/zones.rb
+++ b/lib/fog/aws/models/dns/zones.rb
@@ -7,7 +7,7 @@ class Zones < Fog::Collection
         attribute :marker,    :aliases => 'Marker'
         attribute :max_items, :aliases => 'MaxItems'
 
-        model Fog::DNS::AWS::Zone
+        model Fog::AWS::DNS::Zone
 
         def all(options = {})
           options[:marker]   ||= marker unless marker.nil?
@@ -19,7 +19,7 @@ def all(options = {})
         def get(zone_id)
           data = service.get_hosted_zone(zone_id).body
           new(data)
-        rescue Fog::DNS::AWS::NotFound
+        rescue Fog::AWS::DNS::NotFound
           nil
         end
       end
diff --git a/lib/fog/aws/requests/dns/change_resource_record_sets.rb b/lib/fog/aws/requests/dns/change_resource_record_sets.rb
index 07e86199ff..cbad361c36 100644
--- a/lib/fog/aws/requests/dns/change_resource_record_sets.rb
+++ b/lib/fog/aws/requests/dns/change_resource_record_sets.rb
@@ -198,7 +198,7 @@ def change_resource_record_sets(zone_id, change_batch, options = {})
           request({
             :body       => body,
             :idempotent => true,
-            :parser     => Fog::Parsers::DNS::AWS::ChangeResourceRecordSets.new,
+            :parser     => Fog::Parsers::AWS::DNS::ChangeResourceRecordSets.new,
             :expects    => 200,
             :method     => 'POST',
             :path       => "hostedzone/#{zone_id}/rrset"
@@ -302,10 +302,10 @@ def change_resource_record_sets(zone_id, change_batch, options = {})
               }
               response
             else
-              raise Fog::DNS::AWS::Error.new("InvalidChangeBatch => #{errors.join(", ")}")
+              raise Fog::AWS::DNS::Error.new("InvalidChangeBatch => #{errors.join(", ")}")
             end
           else
-            raise Fog::DNS::AWS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone ID does not exist.")
+            raise Fog::AWS::DNS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone ID does not exist.")
           end
         end
       end
diff --git a/lib/fog/aws/requests/dns/create_health_check.rb b/lib/fog/aws/requests/dns/create_health_check.rb
index 6f05a79052..4505ba97ea 100644
--- a/lib/fog/aws/requests/dns/create_health_check.rb
+++ b/lib/fog/aws/requests/dns/create_health_check.rb
@@ -55,7 +55,7 @@ def create_health_check(ip_address, port, type, options = {})
             :expects => 201,
             :method  => 'POST',
             :path    => 'healthcheck',
-            :parser  => Fog::Parsers::DNS::AWS::HealthCheck.new
+            :parser  => Fog::Parsers::AWS::DNS::HealthCheck.new
           })
         end
       end
diff --git a/lib/fog/aws/requests/dns/create_hosted_zone.rb b/lib/fog/aws/requests/dns/create_hosted_zone.rb
index 34595c3c92..61cd798c96 100644
--- a/lib/fog/aws/requests/dns/create_hosted_zone.rb
+++ b/lib/fog/aws/requests/dns/create_hosted_zone.rb
@@ -48,7 +48,7 @@ def create_hosted_zone(name, options = {})
 
           request({
             :body    => %Q{<?xml version="1.0" encoding="UTF-8"?><CreateHostedZoneRequest xmlns="https://route53.amazonaws.com/doc/#{@version}/"><Name>#{name}</Name>#{optional_tags}</CreateHostedZoneRequest>},
-            :parser  => Fog::Parsers::DNS::AWS::CreateHostedZone.new,
+            :parser  => Fog::Parsers::AWS::DNS::CreateHostedZone.new,
             :expects => 201,
             :method  => 'POST',
             :path    => "hostedzone"
@@ -102,7 +102,7 @@ def create_hosted_zone(name, options = {})
             }
             response
           else
-            raise Fog::DNS::AWS::Error.new("DelegationSetNotAvailable => Amazon Route 53 allows some duplication, but Amazon Route 53 has a maximum threshold of duplicated domains. This error is generated when you reach that threshold. In this case, the error indicates that too many hosted zones with the given domain name exist. If you want to create a hosted zone and Amazon Route 53 generates this error, contact Customer Support.")
+            raise Fog::AWS::DNS::Error.new("DelegationSetNotAvailable => Amazon Route 53 allows some duplication, but Amazon Route 53 has a maximum threshold of duplicated domains. This error is generated when you reach that threshold. In this case, the error indicates that too many hosted zones with the given domain name exist. If you want to create a hosted zone and Amazon Route 53 generates this error, contact Customer Support.")
           end
         end
       end
diff --git a/lib/fog/aws/requests/dns/delete_hosted_zone.rb b/lib/fog/aws/requests/dns/delete_hosted_zone.rb
index f515106a3e..e8d956f269 100644
--- a/lib/fog/aws/requests/dns/delete_hosted_zone.rb
+++ b/lib/fog/aws/requests/dns/delete_hosted_zone.rb
@@ -24,7 +24,7 @@ def delete_hosted_zone(zone_id)
 
           request({
             :expects => 200,
-            :parser  => Fog::Parsers::DNS::AWS::DeleteHostedZone.new,
+            :parser  => Fog::Parsers::AWS::DNS::DeleteHostedZone.new,
             :method  => 'DELETE',
             :path    => "hostedzone/#{zone_id}"
           })
@@ -37,7 +37,7 @@ class Mock
         def delete_hosted_zone(zone_id)
           response = Excon::Response.new
           key = [zone_id, "/hostedzone/#{zone_id}"].find { |k| !self.data[:zones][k].nil? } ||
-            raise(Fog::DNS::AWS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone does not exist."))
+            raise(Fog::AWS::DNS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone does not exist."))
 
             change = {
               :id => Fog::AWS::Mock.change_id,
diff --git a/lib/fog/aws/requests/dns/get_change.rb b/lib/fog/aws/requests/dns/get_change.rb
index f66eda4002..16a3ec9495 100644
--- a/lib/fog/aws/requests/dns/get_change.rb
+++ b/lib/fog/aws/requests/dns/get_change.rb
@@ -23,7 +23,7 @@ def get_change(change_id)
 
           request({
             :expects => 200,
-            :parser  => Fog::Parsers::DNS::AWS::GetChange.new,
+            :parser  => Fog::Parsers::AWS::DNS::GetChange.new,
             :method  => 'GET',
             :path    => "change/#{change_id}"
           })
@@ -36,7 +36,7 @@ def get_change(change_id)
           # find the record with matching change_id
           # records = data[:zones].values.map{|z| z[:records].values.map{|r| r.values}}.flatten
           change = self.data[:changes][change_id] ||
-            raise(Fog::DNS::AWS::NotFound.new("NoSuchChange => Could not find resource with ID: #{change_id}"))
+            raise(Fog::AWS::DNS::NotFound.new("NoSuchChange => Could not find resource with ID: #{change_id}"))
 
           response.status = 200
           submitted_at = Time.parse(change[:submitted_at])
diff --git a/lib/fog/aws/requests/dns/get_health_check.rb b/lib/fog/aws/requests/dns/get_health_check.rb
index 6bbc3d128e..4636522a9f 100644
--- a/lib/fog/aws/requests/dns/get_health_check.rb
+++ b/lib/fog/aws/requests/dns/get_health_check.rb
@@ -30,7 +30,7 @@ class Real
         def get_health_check(id)
           request({
             :expects => 200,
-            :parser  => Fog::Parsers::DNS::AWS::HealthCheck.new,
+            :parser  => Fog::Parsers::AWS::DNS::HealthCheck.new,
             :method  => 'GET',
             :path    => "healthcheck/#{id}"
           })
diff --git a/lib/fog/aws/requests/dns/get_hosted_zone.rb b/lib/fog/aws/requests/dns/get_hosted_zone.rb
index 32918f32c2..b36fce1ecd 100644
--- a/lib/fog/aws/requests/dns/get_hosted_zone.rb
+++ b/lib/fog/aws/requests/dns/get_hosted_zone.rb
@@ -29,7 +29,7 @@ def get_hosted_zone(zone_id)
             :expects => 200,
             :idempotent => true,
             :method  => 'GET',
-            :parser  => Fog::Parsers::DNS::AWS::GetHostedZone.new,
+            :parser  => Fog::Parsers::AWS::DNS::GetHostedZone.new,
             :path    => "hostedzone/#{zone_id}"
           })
         end
@@ -51,7 +51,7 @@ def get_hosted_zone(zone_id)
             }
             response
           else
-            raise Fog::DNS::AWS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone ID does not exist.")
+            raise Fog::AWS::DNS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone ID does not exist.")
           end
         end
       end
diff --git a/lib/fog/aws/requests/dns/list_health_checks.rb b/lib/fog/aws/requests/dns/list_health_checks.rb
index 6da1847c86..c0e4ff0495 100644
--- a/lib/fog/aws/requests/dns/list_health_checks.rb
+++ b/lib/fog/aws/requests/dns/list_health_checks.rb
@@ -26,7 +26,7 @@ def list_health_checks
             :expects => 200,
             :method  => 'GET',
             :path    => "healthcheck",
-            :parser  => Fog::Parsers::DNS::AWS::ListHealthChecks.new
+            :parser  => Fog::Parsers::AWS::DNS::ListHealthChecks.new
           })
         end
       end
diff --git a/lib/fog/aws/requests/dns/list_hosted_zones.rb b/lib/fog/aws/requests/dns/list_hosted_zones.rb
index 9efd269904..0c0ca9a836 100644
--- a/lib/fog/aws/requests/dns/list_hosted_zones.rb
+++ b/lib/fog/aws/requests/dns/list_hosted_zones.rb
@@ -38,7 +38,7 @@ def list_hosted_zones(options = {})
 
           request({
             :query   => parameters,
-            :parser  => Fog::Parsers::DNS::AWS::ListHostedZones.new,
+            :parser  => Fog::Parsers::AWS::DNS::ListHostedZones.new,
             :expects => 200,
             :method  => 'GET',
             :path    => "hostedzone"
diff --git a/lib/fog/aws/requests/dns/list_resource_record_sets.rb b/lib/fog/aws/requests/dns/list_resource_record_sets.rb
index 243b19f5df..b525d7f973 100644
--- a/lib/fog/aws/requests/dns/list_resource_record_sets.rb
+++ b/lib/fog/aws/requests/dns/list_resource_record_sets.rb
@@ -51,7 +51,7 @@ def list_resource_record_sets(zone_id, options = {})
             :expects => 200,
             :idempotent => true,
             :method  => 'GET',
-            :parser  => Fog::Parsers::DNS::AWS::ListResourceRecordSets.new,
+            :parser  => Fog::Parsers::AWS::DNS::ListResourceRecordSets.new,
             :path    => "hostedzone/#{zone_id}/rrset",
             :query   => parameters
           })
@@ -64,7 +64,7 @@ def list_all_records(record, zone, name)
             tmp_records.push(record) if !record[:name].nil? && ( name.nil? || record[:name].gsub(zone[:name],"") >= name)
             record.each do |key,subr|
               if subr.is_a?(Hash) && key.is_a?(String) &&
-                key.start_with?(Fog::DNS::AWS::Mock::SET_PREFIX)
+                key.start_with?(Fog::AWS::DNS::Mock::SET_PREFIX)
                 if name.nil?
                   tmp_records.append(subr)
                 else
@@ -81,7 +81,7 @@ def list_resource_record_sets(zone_id, options = {})
           response = Excon::Response.new
 
           zone = self.data[:zones][zone_id] ||
-            raise(Fog::DNS::AWS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone ID does not exist."))
+            raise(Fog::AWS::DNS::NotFound.new("NoSuchHostedZone => A hosted zone with the specified hosted zone ID does not exist."))
 
           records = if options[:type]
                       records_type = zone[:records][options[:type]]
diff --git a/lib/fog/aws/service_mapper.rb b/lib/fog/aws/service_mapper.rb
index fa532b0076..616a2fbeeb 100644
--- a/lib/fog/aws/service_mapper.rb
+++ b/lib/fog/aws/service_mapper.rb
@@ -26,7 +26,7 @@ def self.class_for(key)
           when :ddb, :dynamodb
             Fog::AWS::DynamoDB
           when :dns
-            Fog::DNS::AWS
+            Fog::AWS::DNS
           when :elasticache
             Fog::AWS::Elasticache
           when :elb

From aa26a2cf12d1201515a2b0e416f57f0890bf4ac8 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:09:17 +0900
Subject: [PATCH 19/39] git grep -l "DNS::AWS" -- tests/ | xargs sed -i ""
 "s/DNS::AWS/AWS::DNS/g"

---
 tests/requests/dns/change_resource_record_sets_tests.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/requests/dns/change_resource_record_sets_tests.rb b/tests/requests/dns/change_resource_record_sets_tests.rb
index 29036163b2..95fb3ed004 100644
--- a/tests/requests/dns/change_resource_record_sets_tests.rb
+++ b/tests/requests/dns/change_resource_record_sets_tests.rb
@@ -1,8 +1,8 @@
 Shindo.tests('Fog::DNS[:aws] | change_resource_record_sets', ['aws', 'dns']) do
   tests('success') do
     test('#elb_hosted_zone_mapping from DNS name') do
-      zone_id = Fog::DNS::AWS.hosted_zone_for_alias_target('arbitrary-sub-domain.eu-west-1.elb.amazonaws.com')
-      zone_id == Fog::DNS::AWS.elb_hosted_zone_mapping['eu-west-1']
+      zone_id = Fog::AWS::DNS.hosted_zone_for_alias_target('arbitrary-sub-domain.eu-west-1.elb.amazonaws.com')
+      zone_id == Fog::AWS::DNS.elb_hosted_zone_mapping['eu-west-1']
     end
   end
 
@@ -18,7 +18,7 @@
         }]
 
     version = '2013-04-01'
-    result = Fog::DNS::AWS.change_resource_record_sets_data('zone_id123', change_batch, version)
+    result = Fog::AWS::DNS.change_resource_record_sets_data('zone_id123', change_batch, version)
     doc = Nokogiri::XML(result)
 
     returns("https://route53.amazonaws.com/doc/#{version}/") { doc.namespaces['xmlns'] }

From 9e88a9c598261c6df034001c87a00e49b5368ce4 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:09:28 +0900
Subject: [PATCH 20/39] git grep -l "module DNS" -- lib/fog/aws/dns.rb | xargs
 sed -i "" "s/module DNS/module AWS/g"

---
 lib/fog/aws/dns.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fog/aws/dns.rb b/lib/fog/aws/dns.rb
index c8158de153..7142588c4a 100644
--- a/lib/fog/aws/dns.rb
+++ b/lib/fog/aws/dns.rb
@@ -1,5 +1,5 @@
 module Fog
-  module DNS
+  module AWS
     class AWS < Fog::Service
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 

From 626b0f0390899cac6d947bfc410d1f9844e8730a Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:09:40 +0900
Subject: [PATCH 21/39] git grep -l "class AWS" -- lib/fog/aws/dns.rb | xargs
 sed -i "" "s/class AWS/class DNS/g"

---
 lib/fog/aws/dns.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fog/aws/dns.rb b/lib/fog/aws/dns.rb
index 7142588c4a..aa1a417308 100644
--- a/lib/fog/aws/dns.rb
+++ b/lib/fog/aws/dns.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS < Fog::Service
+    class DNS < Fog::Service
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key

From 805f590b49fa0855f0bb36bcc3018f6ec878a370 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Sun, 16 Sep 2018 17:35:28 +0900
Subject: [PATCH 22/39] git grep -l "module DNS" -- lib/fog/aws/requests/dns/ |
 xargs sed -i "" "s/module DNS/module AWS/g"

---
 lib/fog/aws/requests/dns/change_resource_record_sets.rb | 2 +-
 lib/fog/aws/requests/dns/create_health_check.rb         | 2 +-
 lib/fog/aws/requests/dns/create_hosted_zone.rb          | 2 +-
 lib/fog/aws/requests/dns/delete_health_check.rb         | 2 +-
 lib/fog/aws/requests/dns/delete_hosted_zone.rb          | 2 +-
 lib/fog/aws/requests/dns/get_change.rb                  | 2 +-
 lib/fog/aws/requests/dns/get_health_check.rb            | 2 +-
 lib/fog/aws/requests/dns/get_hosted_zone.rb             | 2 +-
 lib/fog/aws/requests/dns/list_health_checks.rb          | 2 +-
 lib/fog/aws/requests/dns/list_hosted_zones.rb           | 2 +-
 lib/fog/aws/requests/dns/list_resource_record_sets.rb   | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/fog/aws/requests/dns/change_resource_record_sets.rb b/lib/fog/aws/requests/dns/change_resource_record_sets.rb
index cbad361c36..d72e311e7b 100644
--- a/lib/fog/aws/requests/dns/change_resource_record_sets.rb
+++ b/lib/fog/aws/requests/dns/change_resource_record_sets.rb
@@ -1,5 +1,5 @@
 module Fog
-  module DNS
+  module AWS
     class AWS
 
       def self.hosted_zone_for_alias_target(dns_name)
diff --git a/lib/fog/aws/requests/dns/create_health_check.rb b/lib/fog/aws/requests/dns/create_health_check.rb
index 4505ba97ea..de325343c3 100644
--- a/lib/fog/aws/requests/dns/create_health_check.rb
+++ b/lib/fog/aws/requests/dns/create_health_check.rb
@@ -1,5 +1,5 @@
 module Fog
-  module DNS
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/dns/health_check'
diff --git a/lib/fog/aws/requests/dns/create_hosted_zone.rb b/lib/fog/aws/requests/dns/create_hosted_zone.rb
index 61cd798c96..e97b2aec80 100644
--- a/lib/fog/aws/requests/dns/create_hosted_zone.rb
+++ b/lib/fog/aws/requests/dns/create_hosted_zone.rb
@@ -1,5 +1,5 @@
 module Fog
-  module DNS
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/dns/create_hosted_zone'
diff --git a/lib/fog/aws/requests/dns/delete_health_check.rb b/lib/fog/aws/requests/dns/delete_health_check.rb
index 3efb2608ad..0f7a451bca 100644
--- a/lib/fog/aws/requests/dns/delete_health_check.rb
+++ b/lib/fog/aws/requests/dns/delete_health_check.rb
@@ -1,5 +1,5 @@
 module Fog
-  module DNS
+  module AWS
     class AWS
       class Real
         # This action deletes a health check.
diff --git a/lib/fog/aws/requests/dns/delete_hosted_zone.rb b/lib/fog/aws/requests/dns/delete_hosted_zone.rb
index e8d956f269..4a2e903801 100644
--- a/lib/fog/aws/requests/dns/delete_hosted_zone.rb
+++ b/lib/fog/aws/requests/dns/delete_hosted_zone.rb
@@ -1,5 +1,5 @@
 module Fog
-  module DNS
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/dns/delete_hosted_zone'
diff --git a/lib/fog/aws/requests/dns/get_change.rb b/lib/fog/aws/requests/dns/get_change.rb
index 16a3ec9495..14aa9c0887 100644
--- a/lib/fog/aws/requests/dns/get_change.rb
+++ b/lib/fog/aws/requests/dns/get_change.rb
@@ -1,5 +1,5 @@
 module Fog
-  module DNS
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/dns/get_change'
diff --git a/lib/fog/aws/requests/dns/get_health_check.rb b/lib/fog/aws/requests/dns/get_health_check.rb
index 4636522a9f..7000f1e430 100644
--- a/lib/fog/aws/requests/dns/get_health_check.rb
+++ b/lib/fog/aws/requests/dns/get_health_check.rb
@@ -1,5 +1,5 @@
 module Fog
-  module DNS
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/dns/health_check'
diff --git a/lib/fog/aws/requests/dns/get_hosted_zone.rb b/lib/fog/aws/requests/dns/get_hosted_zone.rb
index b36fce1ecd..910af9e3fb 100644
--- a/lib/fog/aws/requests/dns/get_hosted_zone.rb
+++ b/lib/fog/aws/requests/dns/get_hosted_zone.rb
@@ -1,5 +1,5 @@
 module Fog
-  module DNS
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/dns/get_hosted_zone'
diff --git a/lib/fog/aws/requests/dns/list_health_checks.rb b/lib/fog/aws/requests/dns/list_health_checks.rb
index c0e4ff0495..9ad1d5ac25 100644
--- a/lib/fog/aws/requests/dns/list_health_checks.rb
+++ b/lib/fog/aws/requests/dns/list_health_checks.rb
@@ -1,5 +1,5 @@
 module Fog
-  module DNS
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/dns/list_health_checks'
diff --git a/lib/fog/aws/requests/dns/list_hosted_zones.rb b/lib/fog/aws/requests/dns/list_hosted_zones.rb
index 0c0ca9a836..72ee8770fb 100644
--- a/lib/fog/aws/requests/dns/list_hosted_zones.rb
+++ b/lib/fog/aws/requests/dns/list_hosted_zones.rb
@@ -1,5 +1,5 @@
 module Fog
-  module DNS
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/dns/list_hosted_zones'
diff --git a/lib/fog/aws/requests/dns/list_resource_record_sets.rb b/lib/fog/aws/requests/dns/list_resource_record_sets.rb
index b525d7f973..76f2f43308 100644
--- a/lib/fog/aws/requests/dns/list_resource_record_sets.rb
+++ b/lib/fog/aws/requests/dns/list_resource_record_sets.rb
@@ -1,5 +1,5 @@
 module Fog
-  module DNS
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/dns/list_resource_record_sets'

From f0f6126a96fdcd2a0795e3ef7d6cc26d4a040f69 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Sun, 16 Sep 2018 17:35:43 +0900
Subject: [PATCH 23/39] git grep -l "class AWS" -- lib/fog/aws/requests/dns/ |
 xargs sed -i "" "s/class AWS/class DNS/g"

---
 lib/fog/aws/requests/dns/change_resource_record_sets.rb | 2 +-
 lib/fog/aws/requests/dns/create_health_check.rb         | 2 +-
 lib/fog/aws/requests/dns/create_hosted_zone.rb          | 2 +-
 lib/fog/aws/requests/dns/delete_health_check.rb         | 2 +-
 lib/fog/aws/requests/dns/delete_hosted_zone.rb          | 2 +-
 lib/fog/aws/requests/dns/get_change.rb                  | 2 +-
 lib/fog/aws/requests/dns/get_health_check.rb            | 2 +-
 lib/fog/aws/requests/dns/get_hosted_zone.rb             | 2 +-
 lib/fog/aws/requests/dns/list_health_checks.rb          | 2 +-
 lib/fog/aws/requests/dns/list_hosted_zones.rb           | 2 +-
 lib/fog/aws/requests/dns/list_resource_record_sets.rb   | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/fog/aws/requests/dns/change_resource_record_sets.rb b/lib/fog/aws/requests/dns/change_resource_record_sets.rb
index d72e311e7b..7dac116ad1 100644
--- a/lib/fog/aws/requests/dns/change_resource_record_sets.rb
+++ b/lib/fog/aws/requests/dns/change_resource_record_sets.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class DNS
 
       def self.hosted_zone_for_alias_target(dns_name)
         hosted_zones = if dns_name.match(/^dualstack\./)
diff --git a/lib/fog/aws/requests/dns/create_health_check.rb b/lib/fog/aws/requests/dns/create_health_check.rb
index de325343c3..3dece46b2d 100644
--- a/lib/fog/aws/requests/dns/create_health_check.rb
+++ b/lib/fog/aws/requests/dns/create_health_check.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/health_check'
 
diff --git a/lib/fog/aws/requests/dns/create_hosted_zone.rb b/lib/fog/aws/requests/dns/create_hosted_zone.rb
index e97b2aec80..a410e43153 100644
--- a/lib/fog/aws/requests/dns/create_hosted_zone.rb
+++ b/lib/fog/aws/requests/dns/create_hosted_zone.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/create_hosted_zone'
 
diff --git a/lib/fog/aws/requests/dns/delete_health_check.rb b/lib/fog/aws/requests/dns/delete_health_check.rb
index 0f7a451bca..9188801f45 100644
--- a/lib/fog/aws/requests/dns/delete_health_check.rb
+++ b/lib/fog/aws/requests/dns/delete_health_check.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class DNS
       class Real
         # This action deletes a health check.
         # http://docs.aws.amazon.com/Route53/latest/APIReference/API_DeleteHealthCheck.html
diff --git a/lib/fog/aws/requests/dns/delete_hosted_zone.rb b/lib/fog/aws/requests/dns/delete_hosted_zone.rb
index 4a2e903801..8ede200894 100644
--- a/lib/fog/aws/requests/dns/delete_hosted_zone.rb
+++ b/lib/fog/aws/requests/dns/delete_hosted_zone.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/delete_hosted_zone'
 
diff --git a/lib/fog/aws/requests/dns/get_change.rb b/lib/fog/aws/requests/dns/get_change.rb
index 14aa9c0887..bed5d75bf2 100644
--- a/lib/fog/aws/requests/dns/get_change.rb
+++ b/lib/fog/aws/requests/dns/get_change.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/get_change'
 
diff --git a/lib/fog/aws/requests/dns/get_health_check.rb b/lib/fog/aws/requests/dns/get_health_check.rb
index 7000f1e430..b0ec3b9871 100644
--- a/lib/fog/aws/requests/dns/get_health_check.rb
+++ b/lib/fog/aws/requests/dns/get_health_check.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/health_check'
 
diff --git a/lib/fog/aws/requests/dns/get_hosted_zone.rb b/lib/fog/aws/requests/dns/get_hosted_zone.rb
index 910af9e3fb..363d64a046 100644
--- a/lib/fog/aws/requests/dns/get_hosted_zone.rb
+++ b/lib/fog/aws/requests/dns/get_hosted_zone.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/get_hosted_zone'
 
diff --git a/lib/fog/aws/requests/dns/list_health_checks.rb b/lib/fog/aws/requests/dns/list_health_checks.rb
index 9ad1d5ac25..99f3a9dae4 100644
--- a/lib/fog/aws/requests/dns/list_health_checks.rb
+++ b/lib/fog/aws/requests/dns/list_health_checks.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/list_health_checks'
 
diff --git a/lib/fog/aws/requests/dns/list_hosted_zones.rb b/lib/fog/aws/requests/dns/list_hosted_zones.rb
index 72ee8770fb..f2bb9e1a57 100644
--- a/lib/fog/aws/requests/dns/list_hosted_zones.rb
+++ b/lib/fog/aws/requests/dns/list_hosted_zones.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/list_hosted_zones'
 
diff --git a/lib/fog/aws/requests/dns/list_resource_record_sets.rb b/lib/fog/aws/requests/dns/list_resource_record_sets.rb
index 76f2f43308..93299df1ad 100644
--- a/lib/fog/aws/requests/dns/list_resource_record_sets.rb
+++ b/lib/fog/aws/requests/dns/list_resource_record_sets.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class DNS
       class Real
         require 'fog/aws/parsers/dns/list_resource_record_sets'
 

From 5a9f1afa8a76d61338edcec1de565073727078cd Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:10:36 +0900
Subject: [PATCH 24/39] Deprecate DNS::AWS

---
 lib/fog/aws/dns.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/fog/aws/dns.rb b/lib/fog/aws/dns.rb
index aa1a417308..8749e5c8de 100644
--- a/lib/fog/aws/dns.rb
+++ b/lib/fog/aws/dns.rb
@@ -162,4 +162,17 @@ def signature(params)
       end
     end
   end
+
+  # @deprecated
+  module DNS
+    # @deprecated
+    class AWS < Fog::AWS::DNS
+      # @deprecated
+      # @overrides Fog::Service.new (from the fog-core gem)
+      def self.new(*)
+        Fog::Logger.deprecation 'Fog::DNS::AWS is deprecated, please use Fog::AWS::DNS.'
+        super
+      end
+    end
+  end
 end

From 46e23a7cb3950bf18da75c2b0cbb9aa98c6dc0fa Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:12:24 +0900
Subject: [PATCH 25/39] Add AWS::Storage

---
 lib/fog/aws.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/fog/aws.rb b/lib/fog/aws.rb
index cf5f69cc66..5d28d65019 100644
--- a/lib/fog/aws.rb
+++ b/lib/fog/aws.rb
@@ -17,10 +17,6 @@ module DNS
     autoload :AWS, File.expand_path('../aws/dns', __FILE__)
   end
 
-  module Storage
-    autoload :AWS, File.expand_path('../aws/storage', __FILE__)
-  end
-
   module AWS
     extend Fog::Provider
 
@@ -54,6 +50,7 @@ module AWS
     autoload :SNS,              File.expand_path('../aws/sns', __FILE__)
     autoload :SQS,              File.expand_path('../aws/sqs', __FILE__)
     autoload :STS,              File.expand_path('../aws/sts', __FILE__)
+    autoload :Storage,          File.expand_path('../aws/storage', __FILE__)
     autoload :Support,          File.expand_path('../aws/support', __FILE__)
     autoload :SimpleDB,         File.expand_path('../aws/simpledb', __FILE__)
 

From 1013b696c6cecdd905e45ec02aa2cd4cf971f2f5 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:13:06 +0900
Subject: [PATCH 26/39] git grep -l "module Storage" --
 lib/fog/aws/models/storage/ | xargs sed -i "" "s/module Storage/module AWS/g"

---
 lib/fog/aws/models/storage/directories.rb | 2 +-
 lib/fog/aws/models/storage/directory.rb   | 2 +-
 lib/fog/aws/models/storage/file.rb        | 2 +-
 lib/fog/aws/models/storage/files.rb       | 2 +-
 lib/fog/aws/models/storage/version.rb     | 2 +-
 lib/fog/aws/models/storage/versions.rb    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/fog/aws/models/storage/directories.rb b/lib/fog/aws/models/storage/directories.rb
index 83617f67dd..f48508f40d 100644
--- a/lib/fog/aws/models/storage/directories.rb
+++ b/lib/fog/aws/models/storage/directories.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/storage/directory'
 
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Directories < Fog::Collection
         model Fog::Storage::AWS::Directory
diff --git a/lib/fog/aws/models/storage/directory.rb b/lib/fog/aws/models/storage/directory.rb
index f6d58e1235..97d142d0df 100644
--- a/lib/fog/aws/models/storage/directory.rb
+++ b/lib/fog/aws/models/storage/directory.rb
@@ -2,7 +2,7 @@
 require 'fog/aws/models/storage/versions'
 
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Directory < Fog::Model
         VALID_ACLS = ['private', 'public-read', 'public-read-write', 'authenticated-read']
diff --git a/lib/fog/aws/models/storage/file.rb b/lib/fog/aws/models/storage/file.rb
index b6f20d099d..593ebe254d 100644
--- a/lib/fog/aws/models/storage/file.rb
+++ b/lib/fog/aws/models/storage/file.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/storage/versions'
 
 module Fog
-  module Storage
+  module AWS
     class AWS
       class File < Fog::Model
         # @see AWS Object docs http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectOps.html
diff --git a/lib/fog/aws/models/storage/files.rb b/lib/fog/aws/models/storage/files.rb
index 45d687ea4a..30dfa99247 100644
--- a/lib/fog/aws/models/storage/files.rb
+++ b/lib/fog/aws/models/storage/files.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/storage/file'
 
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Files < Fog::Collection
         extend Fog::Deprecation
diff --git a/lib/fog/aws/models/storage/version.rb b/lib/fog/aws/models/storage/version.rb
index 88a2b7b79d..6f3bc555de 100644
--- a/lib/fog/aws/models/storage/version.rb
+++ b/lib/fog/aws/models/storage/version.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Version < Fog::Model
         identity  :version,             :aliases => 'VersionId'
diff --git a/lib/fog/aws/models/storage/versions.rb b/lib/fog/aws/models/storage/versions.rb
index 01e0c2c780..e19f3c74db 100644
--- a/lib/fog/aws/models/storage/versions.rb
+++ b/lib/fog/aws/models/storage/versions.rb
@@ -1,7 +1,7 @@
 require 'fog/aws/models/storage/version'
 
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Versions < Fog::Collection
         attribute :file

From 613cc24fde0c7f39e6c8e8c0256db0edb87627e8 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:13:21 +0900
Subject: [PATCH 27/39] git grep -l "class AWS" -- lib/fog/aws/models/storage/
 | xargs sed -i "" "s/class AWS/class Storage/g"

---
 lib/fog/aws/models/storage/directories.rb | 2 +-
 lib/fog/aws/models/storage/directory.rb   | 2 +-
 lib/fog/aws/models/storage/file.rb        | 2 +-
 lib/fog/aws/models/storage/files.rb       | 2 +-
 lib/fog/aws/models/storage/version.rb     | 2 +-
 lib/fog/aws/models/storage/versions.rb    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/fog/aws/models/storage/directories.rb b/lib/fog/aws/models/storage/directories.rb
index f48508f40d..2c3c0a4e60 100644
--- a/lib/fog/aws/models/storage/directories.rb
+++ b/lib/fog/aws/models/storage/directories.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Directories < Fog::Collection
         model Fog::Storage::AWS::Directory
 
diff --git a/lib/fog/aws/models/storage/directory.rb b/lib/fog/aws/models/storage/directory.rb
index 97d142d0df..2d35f2d1e1 100644
--- a/lib/fog/aws/models/storage/directory.rb
+++ b/lib/fog/aws/models/storage/directory.rb
@@ -3,7 +3,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Directory < Fog::Model
         VALID_ACLS = ['private', 'public-read', 'public-read-write', 'authenticated-read']
 
diff --git a/lib/fog/aws/models/storage/file.rb b/lib/fog/aws/models/storage/file.rb
index 593ebe254d..7d211d3540 100644
--- a/lib/fog/aws/models/storage/file.rb
+++ b/lib/fog/aws/models/storage/file.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Storage
       class File < Fog::Model
         # @see AWS Object docs http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectOps.html
 
diff --git a/lib/fog/aws/models/storage/files.rb b/lib/fog/aws/models/storage/files.rb
index 30dfa99247..77e783a3bf 100644
--- a/lib/fog/aws/models/storage/files.rb
+++ b/lib/fog/aws/models/storage/files.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Files < Fog::Collection
         extend Fog::Deprecation
         deprecate :get_url, :get_https_url
diff --git a/lib/fog/aws/models/storage/version.rb b/lib/fog/aws/models/storage/version.rb
index 6f3bc555de..4b585c2bb4 100644
--- a/lib/fog/aws/models/storage/version.rb
+++ b/lib/fog/aws/models/storage/version.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Version < Fog::Model
         identity  :version,             :aliases => 'VersionId'
 
diff --git a/lib/fog/aws/models/storage/versions.rb b/lib/fog/aws/models/storage/versions.rb
index e19f3c74db..fd388f664a 100644
--- a/lib/fog/aws/models/storage/versions.rb
+++ b/lib/fog/aws/models/storage/versions.rb
@@ -2,7 +2,7 @@
 
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Versions < Fog::Collection
         attribute :file
         attribute :directory

From a54b14120ec813121486aa3f4e2ce56f342ab51d Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Sat, 15 Sep 2018 00:08:23 +0900
Subject: [PATCH 28/39] git grep -l "    module Storage" --
 lib/fog/aws/parsers/storage/ | xargs sed -i "" "s/    module Storage/   
 module AWS/g"

---
 lib/fog/aws/parsers/storage/access_control_list.rb        | 2 +-
 lib/fog/aws/parsers/storage/complete_multipart_upload.rb  | 2 +-
 lib/fog/aws/parsers/storage/copy_object.rb                | 2 +-
 lib/fog/aws/parsers/storage/cors_configuration.rb         | 2 +-
 lib/fog/aws/parsers/storage/delete_multiple_objects.rb    | 2 +-
 lib/fog/aws/parsers/storage/get_bucket.rb                 | 2 +-
 lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb       | 2 +-
 lib/fog/aws/parsers/storage/get_bucket_location.rb        | 2 +-
 lib/fog/aws/parsers/storage/get_bucket_logging.rb         | 2 +-
 lib/fog/aws/parsers/storage/get_bucket_notification.rb    | 2 +-
 lib/fog/aws/parsers/storage/get_bucket_object_versions.rb | 2 +-
 lib/fog/aws/parsers/storage/get_bucket_tagging.rb         | 2 +-
 lib/fog/aws/parsers/storage/get_bucket_versioning.rb      | 2 +-
 lib/fog/aws/parsers/storage/get_bucket_website.rb         | 2 +-
 lib/fog/aws/parsers/storage/get_request_payment.rb        | 2 +-
 lib/fog/aws/parsers/storage/get_service.rb                | 2 +-
 lib/fog/aws/parsers/storage/initiate_multipart_upload.rb  | 2 +-
 lib/fog/aws/parsers/storage/list_multipart_uploads.rb     | 2 +-
 lib/fog/aws/parsers/storage/list_parts.rb                 | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/fog/aws/parsers/storage/access_control_list.rb b/lib/fog/aws/parsers/storage/access_control_list.rb
index 53247e1fad..b922115e22 100644
--- a/lib/fog/aws/parsers/storage/access_control_list.rb
+++ b/lib/fog/aws/parsers/storage/access_control_list.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class AccessControlList < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/storage/complete_multipart_upload.rb b/lib/fog/aws/parsers/storage/complete_multipart_upload.rb
index 6c02c71756..5d1c010dce 100644
--- a/lib/fog/aws/parsers/storage/complete_multipart_upload.rb
+++ b/lib/fog/aws/parsers/storage/complete_multipart_upload.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class CompleteMultipartUpload < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/storage/copy_object.rb b/lib/fog/aws/parsers/storage/copy_object.rb
index 7223f4ae76..eb7566ef59 100644
--- a/lib/fog/aws/parsers/storage/copy_object.rb
+++ b/lib/fog/aws/parsers/storage/copy_object.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class CopyObject < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/storage/cors_configuration.rb b/lib/fog/aws/parsers/storage/cors_configuration.rb
index f969feb5cd..33d6093a83 100644
--- a/lib/fog/aws/parsers/storage/cors_configuration.rb
+++ b/lib/fog/aws/parsers/storage/cors_configuration.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class CorsConfiguration < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/storage/delete_multiple_objects.rb b/lib/fog/aws/parsers/storage/delete_multiple_objects.rb
index 6d6198d7d5..ef01288b71 100644
--- a/lib/fog/aws/parsers/storage/delete_multiple_objects.rb
+++ b/lib/fog/aws/parsers/storage/delete_multiple_objects.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class DeleteMultipleObjects < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/storage/get_bucket.rb b/lib/fog/aws/parsers/storage/get_bucket.rb
index 2d53f6441c..42e3ef10b6 100644
--- a/lib/fog/aws/parsers/storage/get_bucket.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class GetBucket < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb b/lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb
index 3eff79cf85..baf103452b 100644
--- a/lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class GetBucketLifecycle < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/storage/get_bucket_location.rb b/lib/fog/aws/parsers/storage/get_bucket_location.rb
index 920f697616..f9f67debb2 100644
--- a/lib/fog/aws/parsers/storage/get_bucket_location.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket_location.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class GetBucketLocation < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/storage/get_bucket_logging.rb b/lib/fog/aws/parsers/storage/get_bucket_logging.rb
index 931aeaadb5..6680741eba 100644
--- a/lib/fog/aws/parsers/storage/get_bucket_logging.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket_logging.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class GetBucketLogging < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/storage/get_bucket_notification.rb b/lib/fog/aws/parsers/storage/get_bucket_notification.rb
index eaa3d170b9..5919d0c044 100644
--- a/lib/fog/aws/parsers/storage/get_bucket_notification.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket_notification.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class GetBucketNotification < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/storage/get_bucket_object_versions.rb b/lib/fog/aws/parsers/storage/get_bucket_object_versions.rb
index dae2f2d475..edf234f7d5 100644
--- a/lib/fog/aws/parsers/storage/get_bucket_object_versions.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket_object_versions.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class GetBucketObjectVersions < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/storage/get_bucket_tagging.rb b/lib/fog/aws/parsers/storage/get_bucket_tagging.rb
index 3b26b89c7f..47ba801469 100644
--- a/lib/fog/aws/parsers/storage/get_bucket_tagging.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket_tagging.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class GetBucketTagging < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/storage/get_bucket_versioning.rb b/lib/fog/aws/parsers/storage/get_bucket_versioning.rb
index 549c6ebf4d..b02c2d1161 100644
--- a/lib/fog/aws/parsers/storage/get_bucket_versioning.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket_versioning.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class GetBucketVersioning < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/storage/get_bucket_website.rb b/lib/fog/aws/parsers/storage/get_bucket_website.rb
index 1863ddeb9b..b9ae633f89 100644
--- a/lib/fog/aws/parsers/storage/get_bucket_website.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket_website.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
 
         # http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETwebsite.html
diff --git a/lib/fog/aws/parsers/storage/get_request_payment.rb b/lib/fog/aws/parsers/storage/get_request_payment.rb
index 91edb28ade..b93aaaf121 100644
--- a/lib/fog/aws/parsers/storage/get_request_payment.rb
+++ b/lib/fog/aws/parsers/storage/get_request_payment.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class GetRequestPayment < Fog::Parsers::Base
           def end_element(name)
diff --git a/lib/fog/aws/parsers/storage/get_service.rb b/lib/fog/aws/parsers/storage/get_service.rb
index 403cb81886..9a585b15d6 100644
--- a/lib/fog/aws/parsers/storage/get_service.rb
+++ b/lib/fog/aws/parsers/storage/get_service.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class GetService < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/storage/initiate_multipart_upload.rb b/lib/fog/aws/parsers/storage/initiate_multipart_upload.rb
index df5d66310c..1eddaa5ed7 100644
--- a/lib/fog/aws/parsers/storage/initiate_multipart_upload.rb
+++ b/lib/fog/aws/parsers/storage/initiate_multipart_upload.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class InitiateMultipartUpload < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/storage/list_multipart_uploads.rb b/lib/fog/aws/parsers/storage/list_multipart_uploads.rb
index 0692f00745..f90e469da6 100644
--- a/lib/fog/aws/parsers/storage/list_multipart_uploads.rb
+++ b/lib/fog/aws/parsers/storage/list_multipart_uploads.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class ListMultipartUploads < Fog::Parsers::Base
           def reset
diff --git a/lib/fog/aws/parsers/storage/list_parts.rb b/lib/fog/aws/parsers/storage/list_parts.rb
index 4cb6916f62..93285204cf 100644
--- a/lib/fog/aws/parsers/storage/list_parts.rb
+++ b/lib/fog/aws/parsers/storage/list_parts.rb
@@ -1,6 +1,6 @@
 module Fog
   module Parsers
-    module Storage
+    module AWS
       module AWS
         class ListParts < Fog::Parsers::Base
           def reset

From 270d6f632e15e5273312a7d9e9a8f529f617968a Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Sat, 15 Sep 2018 00:08:36 +0900
Subject: [PATCH 29/39] git grep -l "      module AWS" --
 lib/fog/aws/parsers/storage/ | xargs sed -i "" "s/      module AWS/     
 module Storage/g"

---
 lib/fog/aws/parsers/storage/access_control_list.rb        | 2 +-
 lib/fog/aws/parsers/storage/complete_multipart_upload.rb  | 2 +-
 lib/fog/aws/parsers/storage/copy_object.rb                | 2 +-
 lib/fog/aws/parsers/storage/cors_configuration.rb         | 2 +-
 lib/fog/aws/parsers/storage/delete_multiple_objects.rb    | 2 +-
 lib/fog/aws/parsers/storage/get_bucket.rb                 | 2 +-
 lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb       | 2 +-
 lib/fog/aws/parsers/storage/get_bucket_location.rb        | 2 +-
 lib/fog/aws/parsers/storage/get_bucket_logging.rb         | 2 +-
 lib/fog/aws/parsers/storage/get_bucket_notification.rb    | 2 +-
 lib/fog/aws/parsers/storage/get_bucket_object_versions.rb | 2 +-
 lib/fog/aws/parsers/storage/get_bucket_tagging.rb         | 2 +-
 lib/fog/aws/parsers/storage/get_bucket_versioning.rb      | 2 +-
 lib/fog/aws/parsers/storage/get_bucket_website.rb         | 2 +-
 lib/fog/aws/parsers/storage/get_request_payment.rb        | 2 +-
 lib/fog/aws/parsers/storage/get_service.rb                | 2 +-
 lib/fog/aws/parsers/storage/initiate_multipart_upload.rb  | 2 +-
 lib/fog/aws/parsers/storage/list_multipart_uploads.rb     | 2 +-
 lib/fog/aws/parsers/storage/list_parts.rb                 | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/fog/aws/parsers/storage/access_control_list.rb b/lib/fog/aws/parsers/storage/access_control_list.rb
index b922115e22..66c7764f5e 100644
--- a/lib/fog/aws/parsers/storage/access_control_list.rb
+++ b/lib/fog/aws/parsers/storage/access_control_list.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class AccessControlList < Fog::Parsers::Base
           def reset
             @in_access_control_list = false
diff --git a/lib/fog/aws/parsers/storage/complete_multipart_upload.rb b/lib/fog/aws/parsers/storage/complete_multipart_upload.rb
index 5d1c010dce..1e9ba1ef30 100644
--- a/lib/fog/aws/parsers/storage/complete_multipart_upload.rb
+++ b/lib/fog/aws/parsers/storage/complete_multipart_upload.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class CompleteMultipartUpload < Fog::Parsers::Base
           def reset
             @response = {}
diff --git a/lib/fog/aws/parsers/storage/copy_object.rb b/lib/fog/aws/parsers/storage/copy_object.rb
index eb7566ef59..ae3e923aaa 100644
--- a/lib/fog/aws/parsers/storage/copy_object.rb
+++ b/lib/fog/aws/parsers/storage/copy_object.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class CopyObject < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/storage/cors_configuration.rb b/lib/fog/aws/parsers/storage/cors_configuration.rb
index 33d6093a83..5dfd2d262a 100644
--- a/lib/fog/aws/parsers/storage/cors_configuration.rb
+++ b/lib/fog/aws/parsers/storage/cors_configuration.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class CorsConfiguration < Fog::Parsers::Base
           def reset
             @in_cors_configuration_list = false
diff --git a/lib/fog/aws/parsers/storage/delete_multiple_objects.rb b/lib/fog/aws/parsers/storage/delete_multiple_objects.rb
index ef01288b71..c6e0a16ddd 100644
--- a/lib/fog/aws/parsers/storage/delete_multiple_objects.rb
+++ b/lib/fog/aws/parsers/storage/delete_multiple_objects.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class DeleteMultipleObjects < Fog::Parsers::Base
           def reset
             @deleted = { 'Deleted' => {} }
diff --git a/lib/fog/aws/parsers/storage/get_bucket.rb b/lib/fog/aws/parsers/storage/get_bucket.rb
index 42e3ef10b6..ae3f31ce28 100644
--- a/lib/fog/aws/parsers/storage/get_bucket.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class GetBucket < Fog::Parsers::Base
           def reset
             @object = { 'Owner' => {} }
diff --git a/lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb b/lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb
index baf103452b..320c3f4cdd 100644
--- a/lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class GetBucketLifecycle < Fog::Parsers::Base
           def reset
             @expiration = {}
diff --git a/lib/fog/aws/parsers/storage/get_bucket_location.rb b/lib/fog/aws/parsers/storage/get_bucket_location.rb
index f9f67debb2..dc53717f70 100644
--- a/lib/fog/aws/parsers/storage/get_bucket_location.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket_location.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class GetBucketLocation < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/storage/get_bucket_logging.rb b/lib/fog/aws/parsers/storage/get_bucket_logging.rb
index 6680741eba..a836a8a264 100644
--- a/lib/fog/aws/parsers/storage/get_bucket_logging.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket_logging.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class GetBucketLogging < Fog::Parsers::Base
           def reset
             @grant = { 'Grantee' => {} }
diff --git a/lib/fog/aws/parsers/storage/get_bucket_notification.rb b/lib/fog/aws/parsers/storage/get_bucket_notification.rb
index 5919d0c044..7a02be04ee 100644
--- a/lib/fog/aws/parsers/storage/get_bucket_notification.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket_notification.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class GetBucketNotification < Fog::Parsers::Base
           def reset
             @func = {}
diff --git a/lib/fog/aws/parsers/storage/get_bucket_object_versions.rb b/lib/fog/aws/parsers/storage/get_bucket_object_versions.rb
index edf234f7d5..f6a3abe8e0 100644
--- a/lib/fog/aws/parsers/storage/get_bucket_object_versions.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket_object_versions.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class GetBucketObjectVersions < Fog::Parsers::Base
           def reset
             @delete_marker = { 'Owner' => {} }
diff --git a/lib/fog/aws/parsers/storage/get_bucket_tagging.rb b/lib/fog/aws/parsers/storage/get_bucket_tagging.rb
index 47ba801469..7fb0841cf9 100644
--- a/lib/fog/aws/parsers/storage/get_bucket_tagging.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket_tagging.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class GetBucketTagging < Fog::Parsers::Base
           def reset
             @in_tag = {}
diff --git a/lib/fog/aws/parsers/storage/get_bucket_versioning.rb b/lib/fog/aws/parsers/storage/get_bucket_versioning.rb
index b02c2d1161..9053de9d86 100644
--- a/lib/fog/aws/parsers/storage/get_bucket_versioning.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket_versioning.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class GetBucketVersioning < Fog::Parsers::Base
           def reset
             @response = { 'VersioningConfiguration' => {} }
diff --git a/lib/fog/aws/parsers/storage/get_bucket_website.rb b/lib/fog/aws/parsers/storage/get_bucket_website.rb
index b9ae633f89..4ca3697779 100644
--- a/lib/fog/aws/parsers/storage/get_bucket_website.rb
+++ b/lib/fog/aws/parsers/storage/get_bucket_website.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
 
         # http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETwebsite.html
         class GetBucketWebsite < Fog::Parsers::Base
diff --git a/lib/fog/aws/parsers/storage/get_request_payment.rb b/lib/fog/aws/parsers/storage/get_request_payment.rb
index b93aaaf121..0170b8314c 100644
--- a/lib/fog/aws/parsers/storage/get_request_payment.rb
+++ b/lib/fog/aws/parsers/storage/get_request_payment.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class GetRequestPayment < Fog::Parsers::Base
           def end_element(name)
             case name
diff --git a/lib/fog/aws/parsers/storage/get_service.rb b/lib/fog/aws/parsers/storage/get_service.rb
index 9a585b15d6..8cc9a34715 100644
--- a/lib/fog/aws/parsers/storage/get_service.rb
+++ b/lib/fog/aws/parsers/storage/get_service.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class GetService < Fog::Parsers::Base
           def reset
             @bucket = {}
diff --git a/lib/fog/aws/parsers/storage/initiate_multipart_upload.rb b/lib/fog/aws/parsers/storage/initiate_multipart_upload.rb
index 1eddaa5ed7..1a4b5c963f 100644
--- a/lib/fog/aws/parsers/storage/initiate_multipart_upload.rb
+++ b/lib/fog/aws/parsers/storage/initiate_multipart_upload.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class InitiateMultipartUpload < Fog::Parsers::Base
           def reset
             @response = {}
diff --git a/lib/fog/aws/parsers/storage/list_multipart_uploads.rb b/lib/fog/aws/parsers/storage/list_multipart_uploads.rb
index f90e469da6..be167fb9bc 100644
--- a/lib/fog/aws/parsers/storage/list_multipart_uploads.rb
+++ b/lib/fog/aws/parsers/storage/list_multipart_uploads.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class ListMultipartUploads < Fog::Parsers::Base
           def reset
             @upload = { 'Initiator' => {}, 'Owner' => {} }
diff --git a/lib/fog/aws/parsers/storage/list_parts.rb b/lib/fog/aws/parsers/storage/list_parts.rb
index 93285204cf..712458ce46 100644
--- a/lib/fog/aws/parsers/storage/list_parts.rb
+++ b/lib/fog/aws/parsers/storage/list_parts.rb
@@ -1,7 +1,7 @@
 module Fog
   module Parsers
     module AWS
-      module AWS
+      module Storage
         class ListParts < Fog::Parsers::Base
           def reset
             @part = {}

From ed087d80d9d0c19c59ab31f289584e99ed1211d0 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:13:30 +0900
Subject: [PATCH 30/39] git grep -l "Storage::AWS" -- lib/ | xargs sed -i ""
 "s/Storage::AWS/AWS::Storage/g"

---
 lib/fog/aws/models/storage/directories.rb                  | 2 +-
 lib/fog/aws/models/storage/directory.rb                    | 4 ++--
 lib/fog/aws/models/storage/file.rb                         | 4 ++--
 lib/fog/aws/models/storage/files.rb                        | 4 ++--
 lib/fog/aws/models/storage/versions.rb                     | 2 +-
 lib/fog/aws/requests/storage/abort_multipart_upload.rb     | 2 +-
 lib/fog/aws/requests/storage/acl_utils.rb                  | 2 +-
 lib/fog/aws/requests/storage/complete_multipart_upload.rb  | 4 ++--
 lib/fog/aws/requests/storage/copy_object.rb                | 2 +-
 lib/fog/aws/requests/storage/cors_utils.rb                 | 2 +-
 lib/fog/aws/requests/storage/delete_multiple_objects.rb    | 2 +-
 lib/fog/aws/requests/storage/get_bucket.rb                 | 2 +-
 lib/fog/aws/requests/storage/get_bucket_acl.rb             | 4 ++--
 lib/fog/aws/requests/storage/get_bucket_cors.rb            | 4 ++--
 lib/fog/aws/requests/storage/get_bucket_lifecycle.rb       | 2 +-
 lib/fog/aws/requests/storage/get_bucket_location.rb        | 2 +-
 lib/fog/aws/requests/storage/get_bucket_logging.rb         | 2 +-
 lib/fog/aws/requests/storage/get_bucket_notification.rb    | 2 +-
 lib/fog/aws/requests/storage/get_bucket_object_versions.rb | 2 +-
 lib/fog/aws/requests/storage/get_bucket_tagging.rb         | 2 +-
 lib/fog/aws/requests/storage/get_bucket_versioning.rb      | 2 +-
 lib/fog/aws/requests/storage/get_bucket_website.rb         | 2 +-
 lib/fog/aws/requests/storage/get_object_acl.rb             | 4 ++--
 lib/fog/aws/requests/storage/get_request_payment.rb        | 2 +-
 lib/fog/aws/requests/storage/get_service.rb                | 2 +-
 lib/fog/aws/requests/storage/initiate_multipart_upload.rb  | 4 ++--
 lib/fog/aws/requests/storage/list_multipart_uploads.rb     | 2 +-
 lib/fog/aws/requests/storage/list_parts.rb                 | 2 +-
 lib/fog/aws/requests/storage/put_bucket_acl.rb             | 4 ++--
 lib/fog/aws/requests/storage/put_bucket_cors.rb            | 4 ++--
 lib/fog/aws/requests/storage/put_object.rb                 | 4 ++--
 lib/fog/aws/requests/storage/put_object_acl.rb             | 4 ++--
 lib/fog/aws/requests/storage/upload_part.rb                | 2 +-
 lib/fog/aws/service_mapper.rb                              | 2 +-
 lib/fog/aws/storage.rb                                     | 2 +-
 35 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/lib/fog/aws/models/storage/directories.rb b/lib/fog/aws/models/storage/directories.rb
index 2c3c0a4e60..64341509a2 100644
--- a/lib/fog/aws/models/storage/directories.rb
+++ b/lib/fog/aws/models/storage/directories.rb
@@ -4,7 +4,7 @@ module Fog
   module AWS
     class Storage
       class Directories < Fog::Collection
-        model Fog::Storage::AWS::Directory
+        model Fog::AWS::Storage::Directory
 
         def all
           data = service.get_service.body['Buckets']
diff --git a/lib/fog/aws/models/storage/directory.rb b/lib/fog/aws/models/storage/directory.rb
index 2d35f2d1e1..26ac1ee8f8 100644
--- a/lib/fog/aws/models/storage/directory.rb
+++ b/lib/fog/aws/models/storage/directory.rb
@@ -40,7 +40,7 @@ def location=(new_location)
         end
 
         def files
-          @files ||= Fog::Storage::AWS::Files.new(:directory => self, :service => service)
+          @files ||= Fog::AWS::Storage::Files.new(:directory => self, :service => service)
         end
 
         def payer
@@ -67,7 +67,7 @@ def versioning=(new_versioning)
         end
 
         def versions
-          @versions ||= Fog::Storage::AWS::Versions.new(:directory => self, :service => service)
+          @versions ||= Fog::AWS::Storage::Versions.new(:directory => self, :service => service)
         end
 
         def public=(new_public)
diff --git a/lib/fog/aws/models/storage/file.rb b/lib/fog/aws/models/storage/file.rb
index 7d211d3540..4e16cb19ac 100644
--- a/lib/fog/aws/models/storage/file.rb
+++ b/lib/fog/aws/models/storage/file.rb
@@ -240,11 +240,11 @@ def url(expires, options = {})
         end
 
         # File version if exists or creates new version.
-        # @return [Fog::Storage::AWS::Version]
+        # @return [Fog::AWS::Storage::Version]
         #
         def versions
           @versions ||= begin
-            Fog::Storage::AWS::Versions.new(
+            Fog::AWS::Storage::Versions.new(
               :file         => self,
               :service   => service
             )
diff --git a/lib/fog/aws/models/storage/files.rb b/lib/fog/aws/models/storage/files.rb
index 77e783a3bf..1a50cf4e7f 100644
--- a/lib/fog/aws/models/storage/files.rb
+++ b/lib/fog/aws/models/storage/files.rb
@@ -15,7 +15,7 @@ class Files < Fog::Collection
         attribute :max_keys,        :aliases => ['MaxKeys', 'max-keys']
         attribute :prefix,          :aliases => 'Prefix'
 
-        model Fog::Storage::AWS::File
+        model Fog::AWS::Storage::File
 
         def all(options = {})
           requires :directory
@@ -70,7 +70,7 @@ def get(key, options = {}, &block)
           when /<Code>NoSuchKey<\/Code>/
             nil
           when /<Code>NoSuchBucket<\/Code>/
-            raise(Fog::Storage::AWS::NotFound.new("Directory #{directory.identity} does not exist."))
+            raise(Fog::AWS::Storage::NotFound.new("Directory #{directory.identity} does not exist."))
           else
             raise(error)
           end
diff --git a/lib/fog/aws/models/storage/versions.rb b/lib/fog/aws/models/storage/versions.rb
index fd388f664a..aac379e41c 100644
--- a/lib/fog/aws/models/storage/versions.rb
+++ b/lib/fog/aws/models/storage/versions.rb
@@ -7,7 +7,7 @@ class Versions < Fog::Collection
         attribute :file
         attribute :directory
 
-        model Fog::Storage::AWS::Version
+        model Fog::AWS::Storage::Version
 
         def all(options = {})
           data = if file
diff --git a/lib/fog/aws/requests/storage/abort_multipart_upload.rb b/lib/fog/aws/requests/storage/abort_multipart_upload.rb
index 4191e3fdc0..bc5f46e10b 100644
--- a/lib/fog/aws/requests/storage/abort_multipart_upload.rb
+++ b/lib/fog/aws/requests/storage/abort_multipart_upload.rb
@@ -25,7 +25,7 @@ def abort_multipart_upload(bucket_name, object_name, upload_id)
 
       class Mock # :nodoc:all
         require 'fog/aws/requests/storage/shared_mock_methods'
-        include Fog::Storage::AWS::SharedMockMethods
+        include Fog::AWS::Storage::SharedMockMethods
 
         def abort_multipart_upload(bucket_name, object_name, upload_id)
           verify_mock_bucket_exists(bucket_name)
diff --git a/lib/fog/aws/requests/storage/acl_utils.rb b/lib/fog/aws/requests/storage/acl_utils.rb
index 61902f999b..17b494fe67 100644
--- a/lib/fog/aws/requests/storage/acl_utils.rb
+++ b/lib/fog/aws/requests/storage/acl_utils.rb
@@ -51,7 +51,7 @@ def self.hash_to_acl(acl)
         end
 
         def self.acl_to_hash(acl_xml)
-          parser = Fog::Parsers::Storage::AWS::AccessControlList.new
+          parser = Fog::Parsers::AWS::Storage::AccessControlList.new
           Nokogiri::XML::SAX::Parser.new(parser).parse(acl_xml)
           parser.response
         end
diff --git a/lib/fog/aws/requests/storage/complete_multipart_upload.rb b/lib/fog/aws/requests/storage/complete_multipart_upload.rb
index c5580cc8ea..4eac73b9da 100644
--- a/lib/fog/aws/requests/storage/complete_multipart_upload.rb
+++ b/lib/fog/aws/requests/storage/complete_multipart_upload.rb
@@ -40,7 +40,7 @@ def complete_multipart_upload(bucket_name, object_name, upload_id, parts)
             :bucket_name => bucket_name,
             :object_name => object_name,
             :method     => 'POST',
-            :parser     => Fog::Parsers::Storage::AWS::CompleteMultipartUpload.new,
+            :parser     => Fog::Parsers::AWS::Storage::CompleteMultipartUpload.new,
             :query      => {'uploadId' => upload_id}
           })
         end
@@ -48,7 +48,7 @@ def complete_multipart_upload(bucket_name, object_name, upload_id, parts)
 
       class Mock # :nodoc:all
         require 'fog/aws/requests/storage/shared_mock_methods'
-        include Fog::Storage::AWS::SharedMockMethods
+        include Fog::AWS::Storage::SharedMockMethods
 
         def complete_multipart_upload(bucket_name, object_name, upload_id, parts)
           bucket = verify_mock_bucket_exists(bucket_name)
diff --git a/lib/fog/aws/requests/storage/copy_object.rb b/lib/fog/aws/requests/storage/copy_object.rb
index 4ac712e954..89963ee9ed 100644
--- a/lib/fog/aws/requests/storage/copy_object.rb
+++ b/lib/fog/aws/requests/storage/copy_object.rb
@@ -35,7 +35,7 @@ def copy_object(source_bucket_name, source_object_name, target_bucket_name, targ
             :bucket_name => target_bucket_name,
             :object_name => target_object_name,
             :method   => 'PUT',
-            :parser   => Fog::Parsers::Storage::AWS::CopyObject.new,
+            :parser   => Fog::Parsers::AWS::Storage::CopyObject.new,
           })
         end
       end
diff --git a/lib/fog/aws/requests/storage/cors_utils.rb b/lib/fog/aws/requests/storage/cors_utils.rb
index 0e4b3e59bf..39222dfe07 100644
--- a/lib/fog/aws/requests/storage/cors_utils.rb
+++ b/lib/fog/aws/requests/storage/cors_utils.rb
@@ -30,7 +30,7 @@ def self.hash_to_cors(cors)
         end
 
         def self.cors_to_hash(cors_xml)
-          parser = Fog::Parsers::Storage::AWS::CorsConfiguration.new
+          parser = Fog::Parsers::AWS::Storage::CorsConfiguration.new
           Nokogiri::XML::SAX::Parser.new(parser).parse(cors_xml)
           parser.response
         end
diff --git a/lib/fog/aws/requests/storage/delete_multiple_objects.rb b/lib/fog/aws/requests/storage/delete_multiple_objects.rb
index 82029e6d1c..ea3c44b184 100644
--- a/lib/fog/aws/requests/storage/delete_multiple_objects.rb
+++ b/lib/fog/aws/requests/storage/delete_multiple_objects.rb
@@ -56,7 +56,7 @@ def delete_multiple_objects(bucket_name, object_names, options = {})
             :headers    => headers,
             :bucket_name => bucket_name,
             :method     => 'POST',
-            :parser     => Fog::Parsers::Storage::AWS::DeleteMultipleObjects.new,
+            :parser     => Fog::Parsers::AWS::Storage::DeleteMultipleObjects.new,
             :query      => {'delete' => nil}
           })
         end
diff --git a/lib/fog/aws/requests/storage/get_bucket.rb b/lib/fog/aws/requests/storage/get_bucket.rb
index 266e428eee..49e976ff9e 100644
--- a/lib/fog/aws/requests/storage/get_bucket.rb
+++ b/lib/fog/aws/requests/storage/get_bucket.rb
@@ -46,7 +46,7 @@ def get_bucket(bucket_name, options = {})
             :bucket_name => bucket_name,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::Storage::AWS::GetBucket.new,
+            :parser   => Fog::Parsers::AWS::Storage::GetBucket.new,
             :query    => options
           })
         end
diff --git a/lib/fog/aws/requests/storage/get_bucket_acl.rb b/lib/fog/aws/requests/storage/get_bucket_acl.rb
index 5b5560d5d5..259970c443 100644
--- a/lib/fog/aws/requests/storage/get_bucket_acl.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_acl.rb
@@ -35,7 +35,7 @@ def get_bucket_acl(bucket_name)
             :bucket_name => bucket_name,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Storage::AWS::AccessControlList.new,
+            :parser     => Fog::Parsers::AWS::Storage::AccessControlList.new,
             :query      => {'acl' => nil}
           })
         end
@@ -49,7 +49,7 @@ def get_bucket_acl(bucket_name)
           if acl = self.data[:acls][:bucket][bucket_name]
             response.status = 200
             if acl.is_a?(String)
-              response.body = Fog::Storage::AWS.acl_to_hash(acl)
+              response.body = Fog::AWS::Storage.acl_to_hash(acl)
             else
               response.body = acl
             end
diff --git a/lib/fog/aws/requests/storage/get_bucket_cors.rb b/lib/fog/aws/requests/storage/get_bucket_cors.rb
index 21e42f1ae8..2152d72528 100644
--- a/lib/fog/aws/requests/storage/get_bucket_cors.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_cors.rb
@@ -31,7 +31,7 @@ def get_bucket_cors(bucket_name)
             :bucket_name => bucket_name,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Storage::AWS::CorsConfiguration.new,
+            :parser     => Fog::Parsers::AWS::Storage::CorsConfiguration.new,
             :query      => {'cors' => nil}
           })
         end
@@ -45,7 +45,7 @@ def get_bucket_cors(bucket_name)
           if cors = self.data[:cors][:bucket][bucket_name]
             response.status = 200
             if cors.is_a?(String)
-              response.body = Fog::Storage::AWS.cors_to_hash(cors)
+              response.body = Fog::AWS::Storage.cors_to_hash(cors)
             else
               response.body = cors
             end
diff --git a/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb b/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb
index 21983ec291..231c652f7e 100644
--- a/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb
@@ -25,7 +25,7 @@ def get_bucket_lifecycle(bucket_name)
                     :bucket_name => bucket_name,
                     :idempotent => true,
                     :method   => 'GET',
-                    :parser   => Fog::Parsers::Storage::AWS::GetBucketLifecycle.new,
+                    :parser   => Fog::Parsers::AWS::Storage::GetBucketLifecycle.new,
                     :query    => {'lifecycle' => nil}
                   })
         end
diff --git a/lib/fog/aws/requests/storage/get_bucket_location.rb b/lib/fog/aws/requests/storage/get_bucket_location.rb
index 78c44fc5ea..05baa11f3f 100644
--- a/lib/fog/aws/requests/storage/get_bucket_location.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_location.rb
@@ -21,7 +21,7 @@ def get_bucket_location(bucket_name)
             :bucket_name => bucket_name,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::Storage::AWS::GetBucketLocation.new,
+            :parser   => Fog::Parsers::AWS::Storage::GetBucketLocation.new,
             :query    => {'location' => nil},
             :path_style => true
           })
diff --git a/lib/fog/aws/requests/storage/get_bucket_logging.rb b/lib/fog/aws/requests/storage/get_bucket_logging.rb
index 87c8d5ec2e..6cee5d7127 100644
--- a/lib/fog/aws/requests/storage/get_bucket_logging.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_logging.rb
@@ -35,7 +35,7 @@ def get_bucket_logging(bucket_name)
             :bucket_name => bucket_name,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Storage::AWS::GetBucketLogging.new,
+            :parser     => Fog::Parsers::AWS::Storage::GetBucketLogging.new,
             :query      => {'logging' => nil}
           })
         end
diff --git a/lib/fog/aws/requests/storage/get_bucket_notification.rb b/lib/fog/aws/requests/storage/get_bucket_notification.rb
index 15645b472a..133b9777cd 100644
--- a/lib/fog/aws/requests/storage/get_bucket_notification.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_notification.rb
@@ -35,7 +35,7 @@ def get_bucket_notification(bucket_name)
             :bucket_name => bucket_name,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Storage::AWS::GetBucketNotification.new,
+            :parser     => Fog::Parsers::AWS::Storage::GetBucketNotification.new,
             :query      => {'notification' => nil}
           })
         end
diff --git a/lib/fog/aws/requests/storage/get_bucket_object_versions.rb b/lib/fog/aws/requests/storage/get_bucket_object_versions.rb
index ea421048e2..dc2597dd7a 100644
--- a/lib/fog/aws/requests/storage/get_bucket_object_versions.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_object_versions.rb
@@ -57,7 +57,7 @@ def get_bucket_object_versions(bucket_name, options = {})
             :bucket_name => bucket_name,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::Storage::AWS::GetBucketObjectVersions.new,
+            :parser   => Fog::Parsers::AWS::Storage::GetBucketObjectVersions.new,
             :query    => {'versions' => nil}.merge!(options)          })
         end
       end
diff --git a/lib/fog/aws/requests/storage/get_bucket_tagging.rb b/lib/fog/aws/requests/storage/get_bucket_tagging.rb
index a5f9794182..799568a507 100644
--- a/lib/fog/aws/requests/storage/get_bucket_tagging.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_tagging.rb
@@ -25,7 +25,7 @@ def get_bucket_tagging(bucket_name)
             :bucket_name => bucket_name,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Storage::AWS::GetBucketTagging.new,
+            :parser     => Fog::Parsers::AWS::Storage::GetBucketTagging.new,
             :query      => {'tagging' => nil}
           })
         end
diff --git a/lib/fog/aws/requests/storage/get_bucket_versioning.rb b/lib/fog/aws/requests/storage/get_bucket_versioning.rb
index b3e91dc148..0ca19f6e9e 100644
--- a/lib/fog/aws/requests/storage/get_bucket_versioning.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_versioning.rb
@@ -25,7 +25,7 @@ def get_bucket_versioning(bucket_name)
             :bucket_name => bucket_name,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Storage::AWS::GetBucketVersioning.new,
+            :parser     => Fog::Parsers::AWS::Storage::GetBucketVersioning.new,
             :query      => {'versioning' => nil}
           })
         end
diff --git a/lib/fog/aws/requests/storage/get_bucket_website.rb b/lib/fog/aws/requests/storage/get_bucket_website.rb
index a64ff658f5..c0f8d4c803 100644
--- a/lib/fog/aws/requests/storage/get_bucket_website.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_website.rb
@@ -28,7 +28,7 @@ def get_bucket_website(bucket_name)
             :bucket_name => bucket_name,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Storage::AWS::GetBucketWebsite.new,
+            :parser     => Fog::Parsers::AWS::Storage::GetBucketWebsite.new,
             :query      => {'website' => nil}
           })
         end
diff --git a/lib/fog/aws/requests/storage/get_object_acl.rb b/lib/fog/aws/requests/storage/get_object_acl.rb
index f074e6c19e..b17b5b8ba6 100644
--- a/lib/fog/aws/requests/storage/get_object_acl.rb
+++ b/lib/fog/aws/requests/storage/get_object_acl.rb
@@ -46,7 +46,7 @@ def get_object_acl(bucket_name, object_name, options = {})
             :object_name => object_name,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Storage::AWS::AccessControlList.new,
+            :parser     => Fog::Parsers::AWS::Storage::AccessControlList.new,
             :query      => query
           })
         end
@@ -60,7 +60,7 @@ def get_object_acl(bucket_name, object_name, options = {})
           if acl = self.data[:acls][:object][bucket_name] && self.data[:acls][:object][bucket_name][object_name]
             response.status = 200
             if acl.is_a?(String)
-              response.body = Fog::Storage::AWS.acl_to_hash(acl)
+              response.body = Fog::AWS::Storage.acl_to_hash(acl)
             else
               response.body = acl
             end
diff --git a/lib/fog/aws/requests/storage/get_request_payment.rb b/lib/fog/aws/requests/storage/get_request_payment.rb
index c12baef62b..3840525ac9 100644
--- a/lib/fog/aws/requests/storage/get_request_payment.rb
+++ b/lib/fog/aws/requests/storage/get_request_payment.rb
@@ -21,7 +21,7 @@ def get_request_payment(bucket_name)
             :bucket_name => bucket_name,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::Storage::AWS::GetRequestPayment.new,
+            :parser   => Fog::Parsers::AWS::Storage::GetRequestPayment.new,
             :query    => {'requestPayment' => nil}
           })
         end
diff --git a/lib/fog/aws/requests/storage/get_service.rb b/lib/fog/aws/requests/storage/get_service.rb
index 497f54d1b9..770e87ca0d 100644
--- a/lib/fog/aws/requests/storage/get_service.rb
+++ b/lib/fog/aws/requests/storage/get_service.rb
@@ -24,7 +24,7 @@ def get_service
             :host     => @host,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::Storage::AWS::GetService.new
+            :parser   => Fog::Parsers::AWS::Storage::GetService.new
           })
         end
       end
diff --git a/lib/fog/aws/requests/storage/initiate_multipart_upload.rb b/lib/fog/aws/requests/storage/initiate_multipart_upload.rb
index 95e89125c4..f824c20f56 100644
--- a/lib/fog/aws/requests/storage/initiate_multipart_upload.rb
+++ b/lib/fog/aws/requests/storage/initiate_multipart_upload.rb
@@ -32,7 +32,7 @@ def initiate_multipart_upload(bucket_name, object_name, options = {})
             :bucket_name => bucket_name,
             :object_name => object_name,
             :method     => 'POST',
-            :parser     => Fog::Parsers::Storage::AWS::InitiateMultipartUpload.new,
+            :parser     => Fog::Parsers::AWS::Storage::InitiateMultipartUpload.new,
             :query      => {'uploads' => nil}
           })
         end
@@ -40,7 +40,7 @@ def initiate_multipart_upload(bucket_name, object_name, options = {})
 
       class Mock # :nodoc:all
         require 'fog/aws/requests/storage/shared_mock_methods'
-        include Fog::Storage::AWS::SharedMockMethods
+        include Fog::AWS::Storage::SharedMockMethods
 
         def initiate_multipart_upload(bucket_name, object_name, options = {})
           verify_mock_bucket_exists(bucket_name)
diff --git a/lib/fog/aws/requests/storage/list_multipart_uploads.rb b/lib/fog/aws/requests/storage/list_multipart_uploads.rb
index eb45c0e01a..a5c332e4b6 100644
--- a/lib/fog/aws/requests/storage/list_multipart_uploads.rb
+++ b/lib/fog/aws/requests/storage/list_multipart_uploads.rb
@@ -42,7 +42,7 @@ def list_multipart_uploads(bucket_name, options = {})
             :bucket_name => bucket_name,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::Storage::AWS::ListMultipartUploads.new,
+            :parser   => Fog::Parsers::AWS::Storage::ListMultipartUploads.new,
             :query    => options.merge!({'uploads' => nil})
           })
         end
diff --git a/lib/fog/aws/requests/storage/list_parts.rb b/lib/fog/aws/requests/storage/list_parts.rb
index 4344870da6..74f0ce5a1e 100644
--- a/lib/fog/aws/requests/storage/list_parts.rb
+++ b/lib/fog/aws/requests/storage/list_parts.rb
@@ -43,7 +43,7 @@ def list_parts(bucket_name, object_name, upload_id, options = {})
             :object_name => object_name,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::Storage::AWS::ListParts.new,
+            :parser   => Fog::Parsers::AWS::Storage::ListParts.new,
             :query    => options.merge!({'uploadId' => upload_id})
           })
         end
diff --git a/lib/fog/aws/requests/storage/put_bucket_acl.rb b/lib/fog/aws/requests/storage/put_bucket_acl.rb
index 2fef776fd2..67050a8976 100644
--- a/lib/fog/aws/requests/storage/put_bucket_acl.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_acl.rb
@@ -29,7 +29,7 @@ def put_bucket_acl(bucket_name, acl)
           headers = {}
 
           if acl.is_a?(Hash)
-            data = Fog::Storage::AWS.hash_to_acl(acl)
+            data = Fog::AWS::Storage.hash_to_acl(acl)
           else
             if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
               raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
@@ -55,7 +55,7 @@ def put_bucket_acl(bucket_name, acl)
       class Mock
         def put_bucket_acl(bucket_name, acl)
           if acl.is_a?(Hash)
-            self.data[:acls][:bucket][bucket_name] = Fog::Storage::AWS.hash_to_acl(acl)
+            self.data[:acls][:bucket][bucket_name] = Fog::AWS::Storage.hash_to_acl(acl)
           else
             if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
               raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
diff --git a/lib/fog/aws/requests/storage/put_bucket_cors.rb b/lib/fog/aws/requests/storage/put_bucket_cors.rb
index 0fd9103b94..d71e3852d5 100644
--- a/lib/fog/aws/requests/storage/put_bucket_cors.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_cors.rb
@@ -19,7 +19,7 @@ class Real
         # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTcors.html
 
         def put_bucket_cors(bucket_name, cors)
-          data = Fog::Storage::AWS.hash_to_cors(cors)
+          data = Fog::AWS::Storage.hash_to_cors(cors)
 
           headers = {}
           headers['Content-MD5'] = Base64.encode64(OpenSSL::Digest::MD5.digest(data)).strip
@@ -39,7 +39,7 @@ def put_bucket_cors(bucket_name, cors)
 
       class Mock
         def put_bucket_cors(bucket_name, cors)
-          self.data[:cors][:bucket][bucket_name] = Fog::Storage::AWS.hash_to_cors(cors)
+          self.data[:cors][:bucket][bucket_name] = Fog::AWS::Storage.hash_to_cors(cors)
         end
       end
     end
diff --git a/lib/fog/aws/requests/storage/put_object.rb b/lib/fog/aws/requests/storage/put_object.rb
index 6b0074a25a..e5ce65bb87 100644
--- a/lib/fog/aws/requests/storage/put_object.rb
+++ b/lib/fog/aws/requests/storage/put_object.rb
@@ -57,14 +57,14 @@ def put_object(bucket_name, object_name, data, options = {})
 
       class Mock # :nodoc:all
         require 'fog/aws/requests/storage/shared_mock_methods'
-        include Fog::Storage::AWS::SharedMockMethods
+        include Fog::AWS::Storage::SharedMockMethods
 
         def put_object(bucket_name, object_name, data, options = {})
           define_mock_acl(bucket_name, object_name, options)
 
           data = parse_mock_data(data)
           headers = data[:headers].merge!(options)
-          Fog::Storage::AWS::Real.conforming_to_us_ascii! headers.keys.grep(/^x-amz-meta-/), headers
+          Fog::AWS::Storage::Real.conforming_to_us_ascii! headers.keys.grep(/^x-amz-meta-/), headers
           bucket = verify_mock_bucket_exists(bucket_name)
 
           options['Content-Type'] ||= data[:headers]['Content-Type']
diff --git a/lib/fog/aws/requests/storage/put_object_acl.rb b/lib/fog/aws/requests/storage/put_object_acl.rb
index 7b9c7e526e..eec630e3e8 100644
--- a/lib/fog/aws/requests/storage/put_object_acl.rb
+++ b/lib/fog/aws/requests/storage/put_object_acl.rb
@@ -37,7 +37,7 @@ def put_object_acl(bucket_name, object_name, acl, options = {})
           headers = {}
 
           if acl.is_a?(Hash)
-            data = Fog::Storage::AWS.hash_to_acl(acl)
+            data = Fog::AWS::Storage.hash_to_acl(acl)
           else
             if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
               raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
@@ -64,7 +64,7 @@ def put_object_acl(bucket_name, object_name, acl, options = {})
       class Mock
         def put_object_acl(bucket_name, object_name, acl, options = {})
           if acl.is_a?(Hash)
-            self.data[:acls][:object][bucket_name][object_name] = Fog::Storage::AWS.hash_to_acl(acl)
+            self.data[:acls][:object][bucket_name][object_name] = Fog::AWS::Storage.hash_to_acl(acl)
           else
             if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
               raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
diff --git a/lib/fog/aws/requests/storage/upload_part.rb b/lib/fog/aws/requests/storage/upload_part.rb
index ed9f330741..60486355d3 100644
--- a/lib/fog/aws/requests/storage/upload_part.rb
+++ b/lib/fog/aws/requests/storage/upload_part.rb
@@ -37,7 +37,7 @@ def upload_part(bucket_name, object_name, upload_id, part_number, data, options
 
       class Mock # :nodoc:all
         require 'fog/aws/requests/storage/shared_mock_methods'
-        include Fog::Storage::AWS::SharedMockMethods
+        include Fog::AWS::Storage::SharedMockMethods
 
         def upload_part(bucket_name, object_name, upload_id, part_number, data, options = {})
           data = parse_mock_data(data)
diff --git a/lib/fog/aws/service_mapper.rb b/lib/fog/aws/service_mapper.rb
index fa532b0076..a0a8659855 100644
--- a/lib/fog/aws/service_mapper.rb
+++ b/lib/fog/aws/service_mapper.rb
@@ -46,7 +46,7 @@ def self.class_for(key)
           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/lib/fog/aws/storage.rb b/lib/fog/aws/storage.rb
index 8c92ee9215..c9b586f980 100644
--- a/lib/fog/aws/storage.rb
+++ b/lib/fog/aws/storage.rb
@@ -130,7 +130,7 @@ def https_url(params, expires)
         end
 
         def url(params, expires)
-          Fog::Logger.deprecation("Fog::Storage::AWS => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("Fog::AWS::Storage => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
           https_url(params, expires)
         end
 

From e21685385b1830ad6296e0c1c8d642c77e34e310 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:13:39 +0900
Subject: [PATCH 31/39] git grep -l "Storage::AWS" -- tests/ | xargs sed -i ""
 "s/Storage::AWS/AWS::Storage/g"

---
 tests/requests/storage/acl_utils_tests.rb  | 48 +++++++++++-----------
 tests/requests/storage/cors_utils_tests.rb | 28 ++++++-------
 tests/storage_tests.rb                     |  2 +-
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/tests/requests/storage/acl_utils_tests.rb b/tests/requests/storage/acl_utils_tests.rb
index 5df8ce856b..8214529f3e 100644
--- a/tests/requests/storage/acl_utils_tests.rb
+++ b/tests/requests/storage/acl_utils_tests.rb
@@ -1,44 +1,44 @@
 require 'fog/aws/requests/storage/acl_utils'
 
-Shindo.tests('Fog::Storage::AWS | ACL utils', ["aws"]) do
+Shindo.tests('Fog::AWS::Storage | ACL utils', ["aws"]) do
   tests(".hash_to_acl") do
     tests(".hash_to_acl({}) at xpath //AccessControlPolicy").returns("", "has an empty AccessControlPolicy") do
-      xml = Fog::Storage::AWS.hash_to_acl({})
+      xml = Fog::AWS::Storage.hash_to_acl({})
       Nokogiri::XML(xml).xpath("//AccessControlPolicy").first.content.chomp
     end
 
     tests(".hash_to_acl({}) at xpath //AccessControlPolicy/Owner").returns(nil, "does not have an Owner element") do
-      xml = Fog::Storage::AWS.hash_to_acl({})
+      xml = Fog::AWS::Storage.hash_to_acl({})
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner").first
     end
 
     tests(".hash_to_acl('Owner' => {}) at xpath //AccessControlPolicy/Owner").returns(nil, "does not have an Owner element") do
-      xml = Fog::Storage::AWS.hash_to_acl('Owner' => {})
+      xml = Fog::AWS::Storage.hash_to_acl('Owner' => {})
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner").first
     end
 
     tests(".hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'}) at xpath //AccessControlPolicy/Owner/ID").returns("abcdef0123456789", "returns the Owner ID") do
-      xml = Fog::Storage::AWS.hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'})
+      xml = Fog::AWS::Storage.hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'})
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner/ID").first.content
     end
 
     tests(".hash_to_acl('Owner' => {'DisplayName' => 'bob'}) at xpath //AccessControlPolicy/Owner/ID").returns(nil, "does not have an Owner ID element") do
-      xml = Fog::Storage::AWS.hash_to_acl('Owner' => {'DisplayName' => 'bob'})
+      xml = Fog::AWS::Storage.hash_to_acl('Owner' => {'DisplayName' => 'bob'})
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner/ID").first
     end
 
     tests(".hash_to_acl('Owner' => {'DisplayName' => 'bob'}) at xpath //AccessControlPolicy/Owner/DisplayName").returns("bob", "returns the Owner DisplayName") do
-      xml = Fog::Storage::AWS.hash_to_acl('Owner' => {'DisplayName' => 'bob'})
+      xml = Fog::AWS::Storage.hash_to_acl('Owner' => {'DisplayName' => 'bob'})
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner/DisplayName").first.content
     end
 
     tests(".hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'}) at xpath //AccessControlPolicy/Owner/DisplayName").returns(nil, "does not have an Owner DisplayName element") do
-      xml = Fog::Storage::AWS.hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'})
+      xml = Fog::AWS::Storage.hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'})
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner/DisplayName").first
     end
 
     tests(".hash_to_acl({}) at xpath //AccessControlPolicy/AccessControlList").returns(nil, "has no AccessControlList") do
-      xml = Fog::Storage::AWS.hash_to_acl({})
+      xml = Fog::AWS::Storage.hash_to_acl({})
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlPolicy").first
     end
 
@@ -55,22 +55,22 @@
     }
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee").returns("CanonicalUser", "has an xsi:type of CanonicalUser") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee").first.attributes["type"].value
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/ID").returns("abcdef0123456789", "returns the Grantee ID") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/ID").first.content
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/DisplayName").returns("bob", "returns the Grantee DisplayName") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/DisplayName").first.content
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Permission").returns("READ", "returns the Grantee Permission") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Permission").first.content
     end
 
@@ -86,17 +86,17 @@
     }
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee").returns("AmazonCustomerByEmail", "has an xsi:type of AmazonCustomerByEmail") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee").first.attributes["type"].value
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/EmailAddress").returns("user@example.com", "returns the Grantee EmailAddress") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/EmailAddress").first.content
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Permission").returns("FULL_CONTROL", "returns the Grantee Permission") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Permission").first.content
     end
 
@@ -112,17 +112,17 @@
     }
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee").returns("Group", "has an xsi:type of Group") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee").first.attributes["type"].value
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/URI").returns("http://acs.amazonaws.com/groups/global/AllUsers", "returns the Grantee URI") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/URI").first.content
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Permission").returns("WRITE", "returns the Grantee Permission") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Permission").first.content
     end
 
@@ -151,22 +151,22 @@
     }
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant").returns(3, "has three elements") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant").size
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/ID").returns("abcdef0123456789", "returns the first Grant's Grantee ID") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/ID").first.content
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/EmailAddress").returns("user@example.com", "returns the second Grant's Grantee EmailAddress") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/EmailAddress").first.content
     end
 
     tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/URI").returns("http://acs.amazonaws.com/groups/global/AllUsers", "returns the third Grant's Grantee URI") do
-      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      xml = Fog::AWS::Storage.hash_to_acl(acl)
       Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/URI").first.content
     end
   end
@@ -203,7 +203,7 @@
         "Permission" => "FULL_CONTROL"
       }]
     }, 'returns hash of ACL XML') do
-      Fog::Storage::AWS.acl_to_hash(acl_xml)
+      Fog::AWS::Storage.acl_to_hash(acl_xml)
     end
   end
 end
diff --git a/tests/requests/storage/cors_utils_tests.rb b/tests/requests/storage/cors_utils_tests.rb
index c8c8847c25..ae6d335aef 100644
--- a/tests/requests/storage/cors_utils_tests.rb
+++ b/tests/requests/storage/cors_utils_tests.rb
@@ -1,14 +1,14 @@
 require 'fog/aws/requests/storage/cors_utils'
 
-Shindo.tests('Fog::Storage::AWS | CORS utils', ["aws"]) do
+Shindo.tests('Fog::AWS::Storage | CORS utils', ["aws"]) do
   tests(".hash_to_cors") do
     tests(".hash_to_cors({}) at xpath //CORSConfiguration").returns("", "has an empty CORSConfiguration") do
-      xml = Fog::Storage::AWS.hash_to_cors({})
+      xml = Fog::AWS::Storage.hash_to_cors({})
       Nokogiri::XML(xml).xpath("//CORSConfiguration").first.content.chomp
     end
 
     tests(".hash_to_cors({}) at xpath //CORSConfiguration/CORSRule").returns(nil, "has no CORSRules") do
-      xml = Fog::Storage::AWS.hash_to_cors({})
+      xml = Fog::AWS::Storage.hash_to_cors({})
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule").first
     end
 
@@ -26,52 +26,52 @@
     }
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedOrigin").returns("origin_123", "returns the CORSRule AllowedOrigin") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedOrigin")[0].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedOrigin").returns("origin_456", "returns the CORSRule AllowedOrigin") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedOrigin")[1].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedMethod").returns("GET", "returns the CORSRule AllowedMethod") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedMethod")[0].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedMethod").returns("POST", "returns the CORSRule AllowedMethod") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedMethod")[1].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedHeader").returns("Accept", "returns the CORSRule AllowedHeader") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedHeader")[0].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/AllowedHeader").returns("Content-Type", "returns the CORSRule AllowedHeader") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/AllowedHeader")[1].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/ID").returns("blah-888", "returns the CORSRule ID") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/ID")[0].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/MaxAgeSeconds").returns("2500", "returns the CORSRule MaxAgeSeconds") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/MaxAgeSeconds")[0].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/ExposeHeader").returns("x-some-header", "returns the CORSRule ExposeHeader") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/ExposeHeader")[0].content
     end
 
     tests(".hash_to_cors(#{cors.inspect}) at xpath //CORSConfiguration/CORSRule/ExposeHeader").returns("x-other-header", "returns the CORSRule ExposeHeader") do
-      xml = Fog::Storage::AWS.hash_to_cors(cors)
+      xml = Fog::AWS::Storage.hash_to_cors(cors)
       Nokogiri::XML(xml).xpath("//CORSConfiguration/CORSRule/ExposeHeader")[1].content
     end
   end
@@ -102,7 +102,7 @@
         "ExposeHeader" => ["x-amz-server-side-encryption", "x-amz-balls"]
       }]
     }, 'returns hash of CORS XML') do
-      Fog::Storage::AWS.cors_to_hash(cors_xml)
+      Fog::AWS::Storage.cors_to_hash(cors_xml)
     end
   end
 end
diff --git a/tests/storage_tests.rb b/tests/storage_tests.rb
index 0f2748dfea..a8a307a1d5 100644
--- a/tests/storage_tests.rb
+++ b/tests/storage_tests.rb
@@ -2,6 +2,6 @@
 
 Shindo.tests('AWS Storage | escape', ['aws']) do
   tests('Keys can contain a hierarchical prefix which should not be escaped') do
-    returns( Fog::Storage::AWS.new.send(:escape, "key/with/prefix") ) { "key/with/prefix" }
+    returns( Fog::AWS::Storage.new.send(:escape, "key/with/prefix") ) { "key/with/prefix" }
   end
 end

From afa48062bc1d78c3d46b66e538a1302d246e32c9 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:14:23 +0900
Subject: [PATCH 32/39] git grep -l "module Storage" -- lib/fog/aws/storage.rb
 | xargs sed -i "" "s/module Storage/module AWS/g"

---
 lib/fog/aws/storage.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fog/aws/storage.rb b/lib/fog/aws/storage.rb
index c9b586f980..285edacc76 100644
--- a/lib/fog/aws/storage.rb
+++ b/lib/fog/aws/storage.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS < Fog::Service
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 

From f244ee944ca83cb4c04ee698d914345e9d9a5e36 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:14:34 +0900
Subject: [PATCH 33/39] git grep -l "class AWS" -- lib/fog/aws/storage.rb |
 xargs sed -i "" "s/class AWS/class Storage/g"

---
 lib/fog/aws/storage.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fog/aws/storage.rb b/lib/fog/aws/storage.rb
index 285edacc76..a2bab86d4e 100644
--- a/lib/fog/aws/storage.rb
+++ b/lib/fog/aws/storage.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS < Fog::Service
+    class Storage < Fog::Service
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       COMPLIANT_BUCKET_NAMES = /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/

From 62a716fe2361866ca1d759fa16d2537d93ab4505 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Sun, 16 Sep 2018 17:29:42 +0900
Subject: [PATCH 34/39] git grep -l "module Storage" --
 lib/fog/aws/requests/storage/ | xargs sed -i "" "s/module Storage/module
 AWS/g"

---
 lib/fog/aws/requests/storage/abort_multipart_upload.rb     | 2 +-
 lib/fog/aws/requests/storage/acl_utils.rb                  | 2 +-
 lib/fog/aws/requests/storage/complete_multipart_upload.rb  | 2 +-
 lib/fog/aws/requests/storage/copy_object.rb                | 2 +-
 lib/fog/aws/requests/storage/cors_utils.rb                 | 2 +-
 lib/fog/aws/requests/storage/delete_bucket.rb              | 2 +-
 lib/fog/aws/requests/storage/delete_bucket_cors.rb         | 2 +-
 lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb    | 2 +-
 lib/fog/aws/requests/storage/delete_bucket_policy.rb       | 2 +-
 lib/fog/aws/requests/storage/delete_bucket_tagging.rb      | 2 +-
 lib/fog/aws/requests/storage/delete_bucket_website.rb      | 2 +-
 lib/fog/aws/requests/storage/delete_multiple_objects.rb    | 2 +-
 lib/fog/aws/requests/storage/delete_object.rb              | 2 +-
 lib/fog/aws/requests/storage/delete_object_url.rb          | 2 +-
 lib/fog/aws/requests/storage/get_bucket.rb                 | 2 +-
 lib/fog/aws/requests/storage/get_bucket_acl.rb             | 2 +-
 lib/fog/aws/requests/storage/get_bucket_cors.rb            | 2 +-
 lib/fog/aws/requests/storage/get_bucket_lifecycle.rb       | 2 +-
 lib/fog/aws/requests/storage/get_bucket_location.rb        | 2 +-
 lib/fog/aws/requests/storage/get_bucket_logging.rb         | 2 +-
 lib/fog/aws/requests/storage/get_bucket_notification.rb    | 2 +-
 lib/fog/aws/requests/storage/get_bucket_object_versions.rb | 2 +-
 lib/fog/aws/requests/storage/get_bucket_policy.rb          | 2 +-
 lib/fog/aws/requests/storage/get_bucket_tagging.rb         | 2 +-
 lib/fog/aws/requests/storage/get_bucket_versioning.rb      | 2 +-
 lib/fog/aws/requests/storage/get_bucket_website.rb         | 2 +-
 lib/fog/aws/requests/storage/get_object.rb                 | 2 +-
 lib/fog/aws/requests/storage/get_object_acl.rb             | 2 +-
 lib/fog/aws/requests/storage/get_object_http_url.rb        | 2 +-
 lib/fog/aws/requests/storage/get_object_https_url.rb       | 2 +-
 lib/fog/aws/requests/storage/get_object_torrent.rb         | 2 +-
 lib/fog/aws/requests/storage/get_object_url.rb             | 2 +-
 lib/fog/aws/requests/storage/get_request_payment.rb        | 2 +-
 lib/fog/aws/requests/storage/get_service.rb                | 2 +-
 lib/fog/aws/requests/storage/head_bucket.rb                | 2 +-
 lib/fog/aws/requests/storage/head_object.rb                | 2 +-
 lib/fog/aws/requests/storage/head_object_url.rb            | 2 +-
 lib/fog/aws/requests/storage/initiate_multipart_upload.rb  | 2 +-
 lib/fog/aws/requests/storage/list_multipart_uploads.rb     | 2 +-
 lib/fog/aws/requests/storage/list_parts.rb                 | 2 +-
 lib/fog/aws/requests/storage/post_object_hidden_fields.rb  | 2 +-
 lib/fog/aws/requests/storage/post_object_restore.rb        | 2 +-
 lib/fog/aws/requests/storage/put_bucket.rb                 | 2 +-
 lib/fog/aws/requests/storage/put_bucket_acl.rb             | 2 +-
 lib/fog/aws/requests/storage/put_bucket_cors.rb            | 2 +-
 lib/fog/aws/requests/storage/put_bucket_lifecycle.rb       | 2 +-
 lib/fog/aws/requests/storage/put_bucket_logging.rb         | 2 +-
 lib/fog/aws/requests/storage/put_bucket_notification.rb    | 2 +-
 lib/fog/aws/requests/storage/put_bucket_policy.rb          | 2 +-
 lib/fog/aws/requests/storage/put_bucket_tagging.rb         | 2 +-
 lib/fog/aws/requests/storage/put_bucket_versioning.rb      | 2 +-
 lib/fog/aws/requests/storage/put_bucket_website.rb         | 2 +-
 lib/fog/aws/requests/storage/put_object.rb                 | 2 +-
 lib/fog/aws/requests/storage/put_object_acl.rb             | 2 +-
 lib/fog/aws/requests/storage/put_object_url.rb             | 2 +-
 lib/fog/aws/requests/storage/put_request_payment.rb        | 2 +-
 lib/fog/aws/requests/storage/shared_mock_methods.rb        | 2 +-
 lib/fog/aws/requests/storage/sync_clock.rb                 | 2 +-
 lib/fog/aws/requests/storage/upload_part.rb                | 2 +-
 59 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/lib/fog/aws/requests/storage/abort_multipart_upload.rb b/lib/fog/aws/requests/storage/abort_multipart_upload.rb
index bc5f46e10b..68fbf561f6 100644
--- a/lib/fog/aws/requests/storage/abort_multipart_upload.rb
+++ b/lib/fog/aws/requests/storage/abort_multipart_upload.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         #
diff --git a/lib/fog/aws/requests/storage/acl_utils.rb b/lib/fog/aws/requests/storage/acl_utils.rb
index 17b494fe67..cb0ebac2be 100644
--- a/lib/fog/aws/requests/storage/acl_utils.rb
+++ b/lib/fog/aws/requests/storage/acl_utils.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       require 'fog/aws/parsers/storage/access_control_list'
 
diff --git a/lib/fog/aws/requests/storage/complete_multipart_upload.rb b/lib/fog/aws/requests/storage/complete_multipart_upload.rb
index 4eac73b9da..f12cecb3c2 100644
--- a/lib/fog/aws/requests/storage/complete_multipart_upload.rb
+++ b/lib/fog/aws/requests/storage/complete_multipart_upload.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/complete_multipart_upload'
diff --git a/lib/fog/aws/requests/storage/copy_object.rb b/lib/fog/aws/requests/storage/copy_object.rb
index 89963ee9ed..0c3340dee3 100644
--- a/lib/fog/aws/requests/storage/copy_object.rb
+++ b/lib/fog/aws/requests/storage/copy_object.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/copy_object'
diff --git a/lib/fog/aws/requests/storage/cors_utils.rb b/lib/fog/aws/requests/storage/cors_utils.rb
index 39222dfe07..c94ac7e435 100644
--- a/lib/fog/aws/requests/storage/cors_utils.rb
+++ b/lib/fog/aws/requests/storage/cors_utils.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       require 'fog/aws/parsers/storage/cors_configuration'
 
diff --git a/lib/fog/aws/requests/storage/delete_bucket.rb b/lib/fog/aws/requests/storage/delete_bucket.rb
index 2d53310383..7d18f8d177 100644
--- a/lib/fog/aws/requests/storage/delete_bucket.rb
+++ b/lib/fog/aws/requests/storage/delete_bucket.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Delete an S3 bucket
diff --git a/lib/fog/aws/requests/storage/delete_bucket_cors.rb b/lib/fog/aws/requests/storage/delete_bucket_cors.rb
index 27900a6acd..d1faa450b6 100644
--- a/lib/fog/aws/requests/storage/delete_bucket_cors.rb
+++ b/lib/fog/aws/requests/storage/delete_bucket_cors.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Deletes the cors configuration information set for the bucket.
diff --git a/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb b/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb
index 3574fbbdd0..f47cb51382 100644
--- a/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb
+++ b/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Delete lifecycle configuration for a bucket
diff --git a/lib/fog/aws/requests/storage/delete_bucket_policy.rb b/lib/fog/aws/requests/storage/delete_bucket_policy.rb
index d698f3ea8b..3af7e3333c 100644
--- a/lib/fog/aws/requests/storage/delete_bucket_policy.rb
+++ b/lib/fog/aws/requests/storage/delete_bucket_policy.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Delete policy for a bucket
diff --git a/lib/fog/aws/requests/storage/delete_bucket_tagging.rb b/lib/fog/aws/requests/storage/delete_bucket_tagging.rb
index 8c3af34ec5..1b1f5b6e7b 100644
--- a/lib/fog/aws/requests/storage/delete_bucket_tagging.rb
+++ b/lib/fog/aws/requests/storage/delete_bucket_tagging.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Delete tagging for a bucket
diff --git a/lib/fog/aws/requests/storage/delete_bucket_website.rb b/lib/fog/aws/requests/storage/delete_bucket_website.rb
index d6e80d8029..d5bb666302 100644
--- a/lib/fog/aws/requests/storage/delete_bucket_website.rb
+++ b/lib/fog/aws/requests/storage/delete_bucket_website.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Delete website configuration for a bucket
diff --git a/lib/fog/aws/requests/storage/delete_multiple_objects.rb b/lib/fog/aws/requests/storage/delete_multiple_objects.rb
index ea3c44b184..00c0239f65 100644
--- a/lib/fog/aws/requests/storage/delete_multiple_objects.rb
+++ b/lib/fog/aws/requests/storage/delete_multiple_objects.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/delete_multiple_objects'
diff --git a/lib/fog/aws/requests/storage/delete_object.rb b/lib/fog/aws/requests/storage/delete_object.rb
index b56adcab7b..ea04059ed3 100644
--- a/lib/fog/aws/requests/storage/delete_object.rb
+++ b/lib/fog/aws/requests/storage/delete_object.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Delete an object from S3
diff --git a/lib/fog/aws/requests/storage/delete_object_url.rb b/lib/fog/aws/requests/storage/delete_object_url.rb
index ecbcdf6c85..860a39d602 100644
--- a/lib/fog/aws/requests/storage/delete_object_url.rb
+++ b/lib/fog/aws/requests/storage/delete_object_url.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       module DeleteObjectUrl
         def delete_object_url(bucket_name, object_name, expires, options = {})
diff --git a/lib/fog/aws/requests/storage/get_bucket.rb b/lib/fog/aws/requests/storage/get_bucket.rb
index 49e976ff9e..8cbd2a32b6 100644
--- a/lib/fog/aws/requests/storage/get_bucket.rb
+++ b/lib/fog/aws/requests/storage/get_bucket.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/get_bucket'
diff --git a/lib/fog/aws/requests/storage/get_bucket_acl.rb b/lib/fog/aws/requests/storage/get_bucket_acl.rb
index 259970c443..62910e2136 100644
--- a/lib/fog/aws/requests/storage/get_bucket_acl.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_acl.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/access_control_list'
diff --git a/lib/fog/aws/requests/storage/get_bucket_cors.rb b/lib/fog/aws/requests/storage/get_bucket_cors.rb
index 2152d72528..5f2aaf74b0 100644
--- a/lib/fog/aws/requests/storage/get_bucket_cors.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_cors.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/cors_configuration'
diff --git a/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb b/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb
index 231c652f7e..cbf6406974 100644
--- a/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/get_bucket_lifecycle'
diff --git a/lib/fog/aws/requests/storage/get_bucket_location.rb b/lib/fog/aws/requests/storage/get_bucket_location.rb
index 05baa11f3f..98706d4e4e 100644
--- a/lib/fog/aws/requests/storage/get_bucket_location.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_location.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/get_bucket_location'
diff --git a/lib/fog/aws/requests/storage/get_bucket_logging.rb b/lib/fog/aws/requests/storage/get_bucket_logging.rb
index 6cee5d7127..0710cb8990 100644
--- a/lib/fog/aws/requests/storage/get_bucket_logging.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_logging.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/get_bucket_logging'
diff --git a/lib/fog/aws/requests/storage/get_bucket_notification.rb b/lib/fog/aws/requests/storage/get_bucket_notification.rb
index 133b9777cd..5184c676d9 100644
--- a/lib/fog/aws/requests/storage/get_bucket_notification.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_notification.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/get_bucket_notification'
diff --git a/lib/fog/aws/requests/storage/get_bucket_object_versions.rb b/lib/fog/aws/requests/storage/get_bucket_object_versions.rb
index dc2597dd7a..8f09023113 100644
--- a/lib/fog/aws/requests/storage/get_bucket_object_versions.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_object_versions.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/get_bucket_object_versions'
diff --git a/lib/fog/aws/requests/storage/get_bucket_policy.rb b/lib/fog/aws/requests/storage/get_bucket_policy.rb
index 8a1c793c63..2d004a1abb 100644
--- a/lib/fog/aws/requests/storage/get_bucket_policy.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_policy.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Get bucket policy for an S3 bucket
diff --git a/lib/fog/aws/requests/storage/get_bucket_tagging.rb b/lib/fog/aws/requests/storage/get_bucket_tagging.rb
index 799568a507..324cf4ca67 100644
--- a/lib/fog/aws/requests/storage/get_bucket_tagging.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_tagging.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/get_bucket_tagging'
diff --git a/lib/fog/aws/requests/storage/get_bucket_versioning.rb b/lib/fog/aws/requests/storage/get_bucket_versioning.rb
index 0ca19f6e9e..946f0c4a07 100644
--- a/lib/fog/aws/requests/storage/get_bucket_versioning.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_versioning.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/get_bucket_versioning'
diff --git a/lib/fog/aws/requests/storage/get_bucket_website.rb b/lib/fog/aws/requests/storage/get_bucket_website.rb
index c0f8d4c803..16790ee522 100644
--- a/lib/fog/aws/requests/storage/get_bucket_website.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_website.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/get_bucket_website'
diff --git a/lib/fog/aws/requests/storage/get_object.rb b/lib/fog/aws/requests/storage/get_object.rb
index 5096d4ec04..89308c3978 100644
--- a/lib/fog/aws/requests/storage/get_object.rb
+++ b/lib/fog/aws/requests/storage/get_object.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Get an object from S3
diff --git a/lib/fog/aws/requests/storage/get_object_acl.rb b/lib/fog/aws/requests/storage/get_object_acl.rb
index b17b5b8ba6..f782cd506a 100644
--- a/lib/fog/aws/requests/storage/get_object_acl.rb
+++ b/lib/fog/aws/requests/storage/get_object_acl.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/access_control_list'
diff --git a/lib/fog/aws/requests/storage/get_object_http_url.rb b/lib/fog/aws/requests/storage/get_object_http_url.rb
index 1b5480a033..d00946e0ce 100644
--- a/lib/fog/aws/requests/storage/get_object_http_url.rb
+++ b/lib/fog/aws/requests/storage/get_object_http_url.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       module GetObjectHttpUrl
         def get_object_http_url(bucket_name, object_name, expires, options = {})
diff --git a/lib/fog/aws/requests/storage/get_object_https_url.rb b/lib/fog/aws/requests/storage/get_object_https_url.rb
index 5b8411ed6a..1db402cf92 100644
--- a/lib/fog/aws/requests/storage/get_object_https_url.rb
+++ b/lib/fog/aws/requests/storage/get_object_https_url.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       module GetObjectHttpsUrl
         def get_object_https_url(bucket_name, object_name, expires, options = {})
diff --git a/lib/fog/aws/requests/storage/get_object_torrent.rb b/lib/fog/aws/requests/storage/get_object_torrent.rb
index 2ebab2d4a6..efe07d6203 100644
--- a/lib/fog/aws/requests/storage/get_object_torrent.rb
+++ b/lib/fog/aws/requests/storage/get_object_torrent.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Get torrent for an S3 object
diff --git a/lib/fog/aws/requests/storage/get_object_url.rb b/lib/fog/aws/requests/storage/get_object_url.rb
index fc304e103d..980fecaa88 100644
--- a/lib/fog/aws/requests/storage/get_object_url.rb
+++ b/lib/fog/aws/requests/storage/get_object_url.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       module GetObjectUrl
         def get_object_url(bucket_name, object_name, expires, options = {})
diff --git a/lib/fog/aws/requests/storage/get_request_payment.rb b/lib/fog/aws/requests/storage/get_request_payment.rb
index 3840525ac9..35d396b500 100644
--- a/lib/fog/aws/requests/storage/get_request_payment.rb
+++ b/lib/fog/aws/requests/storage/get_request_payment.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/get_request_payment'
diff --git a/lib/fog/aws/requests/storage/get_service.rb b/lib/fog/aws/requests/storage/get_service.rb
index 770e87ca0d..3df9898193 100644
--- a/lib/fog/aws/requests/storage/get_service.rb
+++ b/lib/fog/aws/requests/storage/get_service.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/get_service'
diff --git a/lib/fog/aws/requests/storage/head_bucket.rb b/lib/fog/aws/requests/storage/head_bucket.rb
index 7ef4fb634c..7ca8fb50e9 100644
--- a/lib/fog/aws/requests/storage/head_bucket.rb
+++ b/lib/fog/aws/requests/storage/head_bucket.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Get headers for an S3 bucket, used to verify if it exists and if you have permission to access it
diff --git a/lib/fog/aws/requests/storage/head_object.rb b/lib/fog/aws/requests/storage/head_object.rb
index 9d2d1e33bf..040fba8ad7 100644
--- a/lib/fog/aws/requests/storage/head_object.rb
+++ b/lib/fog/aws/requests/storage/head_object.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Get headers for an object from S3
diff --git a/lib/fog/aws/requests/storage/head_object_url.rb b/lib/fog/aws/requests/storage/head_object_url.rb
index 3b85a02c20..346748d029 100644
--- a/lib/fog/aws/requests/storage/head_object_url.rb
+++ b/lib/fog/aws/requests/storage/head_object_url.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       module HeadObjectUrl
         def head_object_url(bucket_name, object_name, expires, options = {})
diff --git a/lib/fog/aws/requests/storage/initiate_multipart_upload.rb b/lib/fog/aws/requests/storage/initiate_multipart_upload.rb
index f824c20f56..80973cad34 100644
--- a/lib/fog/aws/requests/storage/initiate_multipart_upload.rb
+++ b/lib/fog/aws/requests/storage/initiate_multipart_upload.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/initiate_multipart_upload'
diff --git a/lib/fog/aws/requests/storage/list_multipart_uploads.rb b/lib/fog/aws/requests/storage/list_multipart_uploads.rb
index a5c332e4b6..d6f51ea391 100644
--- a/lib/fog/aws/requests/storage/list_multipart_uploads.rb
+++ b/lib/fog/aws/requests/storage/list_multipart_uploads.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/list_multipart_uploads'
diff --git a/lib/fog/aws/requests/storage/list_parts.rb b/lib/fog/aws/requests/storage/list_parts.rb
index 74f0ce5a1e..9b3e82b940 100644
--- a/lib/fog/aws/requests/storage/list_parts.rb
+++ b/lib/fog/aws/requests/storage/list_parts.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/parsers/storage/list_parts'
diff --git a/lib/fog/aws/requests/storage/post_object_hidden_fields.rb b/lib/fog/aws/requests/storage/post_object_hidden_fields.rb
index 177615fc7a..a3dfcf2a67 100644
--- a/lib/fog/aws/requests/storage/post_object_hidden_fields.rb
+++ b/lib/fog/aws/requests/storage/post_object_hidden_fields.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       module PostObjectHiddenFields
         # Get a hash of hidden fields for form uploading to S3, in the form {:field_name => :field_value}
diff --git a/lib/fog/aws/requests/storage/post_object_restore.rb b/lib/fog/aws/requests/storage/post_object_restore.rb
index 84a3cf1e39..eeffcbc93a 100644
--- a/lib/fog/aws/requests/storage/post_object_restore.rb
+++ b/lib/fog/aws/requests/storage/post_object_restore.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Restore an object from Glacier to its original S3 path
diff --git a/lib/fog/aws/requests/storage/put_bucket.rb b/lib/fog/aws/requests/storage/put_bucket.rb
index 87f4c28889..de25e4754a 100644
--- a/lib/fog/aws/requests/storage/put_bucket.rb
+++ b/lib/fog/aws/requests/storage/put_bucket.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Create an S3 bucket
diff --git a/lib/fog/aws/requests/storage/put_bucket_acl.rb b/lib/fog/aws/requests/storage/put_bucket_acl.rb
index 67050a8976..d25f6096b8 100644
--- a/lib/fog/aws/requests/storage/put_bucket_acl.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_acl.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/requests/storage/acl_utils'
diff --git a/lib/fog/aws/requests/storage/put_bucket_cors.rb b/lib/fog/aws/requests/storage/put_bucket_cors.rb
index d71e3852d5..60da58675d 100644
--- a/lib/fog/aws/requests/storage/put_bucket_cors.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_cors.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/requests/storage/cors_utils'
diff --git a/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb b/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb
index 3a5f618371..025072e826 100644
--- a/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Change lifecycle configuration for an S3 bucket
diff --git a/lib/fog/aws/requests/storage/put_bucket_logging.rb b/lib/fog/aws/requests/storage/put_bucket_logging.rb
index 50a387b489..a6536d6fbc 100644
--- a/lib/fog/aws/requests/storage/put_bucket_logging.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_logging.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Change logging status for an S3 bucket
diff --git a/lib/fog/aws/requests/storage/put_bucket_notification.rb b/lib/fog/aws/requests/storage/put_bucket_notification.rb
index 22f7b31438..e34aa72f7c 100644
--- a/lib/fog/aws/requests/storage/put_bucket_notification.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_notification.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Change notification configuration for an S3 bucket
diff --git a/lib/fog/aws/requests/storage/put_bucket_policy.rb b/lib/fog/aws/requests/storage/put_bucket_policy.rb
index 35c1f720d3..ac034ed6f8 100644
--- a/lib/fog/aws/requests/storage/put_bucket_policy.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_policy.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Change bucket policy for an S3 bucket
diff --git a/lib/fog/aws/requests/storage/put_bucket_tagging.rb b/lib/fog/aws/requests/storage/put_bucket_tagging.rb
index ede19fe259..c0db76f067 100644
--- a/lib/fog/aws/requests/storage/put_bucket_tagging.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_tagging.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Change tag set for an S3 bucket
diff --git a/lib/fog/aws/requests/storage/put_bucket_versioning.rb b/lib/fog/aws/requests/storage/put_bucket_versioning.rb
index deb1f1188b..c8dee0dcea 100644
--- a/lib/fog/aws/requests/storage/put_bucket_versioning.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_versioning.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Change versioning status for an S3 bucket
diff --git a/lib/fog/aws/requests/storage/put_bucket_website.rb b/lib/fog/aws/requests/storage/put_bucket_website.rb
index 4feebe6b73..a18c9ba9b8 100644
--- a/lib/fog/aws/requests/storage/put_bucket_website.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_website.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Change website configuration for an S3 bucket
diff --git a/lib/fog/aws/requests/storage/put_object.rb b/lib/fog/aws/requests/storage/put_object.rb
index e5ce65bb87..997d14f22f 100644
--- a/lib/fog/aws/requests/storage/put_object.rb
+++ b/lib/fog/aws/requests/storage/put_object.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Create an object in an S3 bucket
diff --git a/lib/fog/aws/requests/storage/put_object_acl.rb b/lib/fog/aws/requests/storage/put_object_acl.rb
index eec630e3e8..23a7346a13 100644
--- a/lib/fog/aws/requests/storage/put_object_acl.rb
+++ b/lib/fog/aws/requests/storage/put_object_acl.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         require 'fog/aws/requests/storage/acl_utils'
diff --git a/lib/fog/aws/requests/storage/put_object_url.rb b/lib/fog/aws/requests/storage/put_object_url.rb
index b0ea262c22..0275cb7ee5 100644
--- a/lib/fog/aws/requests/storage/put_object_url.rb
+++ b/lib/fog/aws/requests/storage/put_object_url.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       module PutObjectUrl
         def put_object_url(bucket_name, object_name, expires, headers = {}, options = {})
diff --git a/lib/fog/aws/requests/storage/put_request_payment.rb b/lib/fog/aws/requests/storage/put_request_payment.rb
index 5126808e2d..fac4178669 100644
--- a/lib/fog/aws/requests/storage/put_request_payment.rb
+++ b/lib/fog/aws/requests/storage/put_request_payment.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Change who pays for requests to an S3 bucket
diff --git a/lib/fog/aws/requests/storage/shared_mock_methods.rb b/lib/fog/aws/requests/storage/shared_mock_methods.rb
index 5038330e7e..e4da701f39 100644
--- a/lib/fog/aws/requests/storage/shared_mock_methods.rb
+++ b/lib/fog/aws/requests/storage/shared_mock_methods.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       module SharedMockMethods
         def define_mock_acl(bucket_name, object_name, options)
diff --git a/lib/fog/aws/requests/storage/sync_clock.rb b/lib/fog/aws/requests/storage/sync_clock.rb
index 669041288f..294e02ec93 100644
--- a/lib/fog/aws/requests/storage/sync_clock.rb
+++ b/lib/fog/aws/requests/storage/sync_clock.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Sync clock against S3 to avoid skew errors
diff --git a/lib/fog/aws/requests/storage/upload_part.rb b/lib/fog/aws/requests/storage/upload_part.rb
index 60486355d3..f175a57844 100644
--- a/lib/fog/aws/requests/storage/upload_part.rb
+++ b/lib/fog/aws/requests/storage/upload_part.rb
@@ -1,5 +1,5 @@
 module Fog
-  module Storage
+  module AWS
     class AWS
       class Real
         # Upload a part for a multipart upload

From d0a52e2da22353f1c68438da86a38e3c49c29aab Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Sun, 16 Sep 2018 17:30:40 +0900
Subject: [PATCH 35/39] git grep -l "class AWS" --
 lib/fog/aws/requests/storage/ | xargs sed -i "" "s/class AWS/class Storage/g"

---
 lib/fog/aws/requests/storage/abort_multipart_upload.rb     | 2 +-
 lib/fog/aws/requests/storage/acl_utils.rb                  | 2 +-
 lib/fog/aws/requests/storage/complete_multipart_upload.rb  | 2 +-
 lib/fog/aws/requests/storage/copy_object.rb                | 2 +-
 lib/fog/aws/requests/storage/cors_utils.rb                 | 2 +-
 lib/fog/aws/requests/storage/delete_bucket.rb              | 2 +-
 lib/fog/aws/requests/storage/delete_bucket_cors.rb         | 2 +-
 lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb    | 2 +-
 lib/fog/aws/requests/storage/delete_bucket_policy.rb       | 2 +-
 lib/fog/aws/requests/storage/delete_bucket_tagging.rb      | 2 +-
 lib/fog/aws/requests/storage/delete_bucket_website.rb      | 2 +-
 lib/fog/aws/requests/storage/delete_multiple_objects.rb    | 2 +-
 lib/fog/aws/requests/storage/delete_object.rb              | 2 +-
 lib/fog/aws/requests/storage/delete_object_url.rb          | 2 +-
 lib/fog/aws/requests/storage/get_bucket.rb                 | 2 +-
 lib/fog/aws/requests/storage/get_bucket_acl.rb             | 2 +-
 lib/fog/aws/requests/storage/get_bucket_cors.rb            | 2 +-
 lib/fog/aws/requests/storage/get_bucket_lifecycle.rb       | 2 +-
 lib/fog/aws/requests/storage/get_bucket_location.rb        | 2 +-
 lib/fog/aws/requests/storage/get_bucket_logging.rb         | 2 +-
 lib/fog/aws/requests/storage/get_bucket_notification.rb    | 2 +-
 lib/fog/aws/requests/storage/get_bucket_object_versions.rb | 2 +-
 lib/fog/aws/requests/storage/get_bucket_policy.rb          | 2 +-
 lib/fog/aws/requests/storage/get_bucket_tagging.rb         | 2 +-
 lib/fog/aws/requests/storage/get_bucket_versioning.rb      | 2 +-
 lib/fog/aws/requests/storage/get_bucket_website.rb         | 2 +-
 lib/fog/aws/requests/storage/get_object.rb                 | 2 +-
 lib/fog/aws/requests/storage/get_object_acl.rb             | 2 +-
 lib/fog/aws/requests/storage/get_object_http_url.rb        | 2 +-
 lib/fog/aws/requests/storage/get_object_https_url.rb       | 2 +-
 lib/fog/aws/requests/storage/get_object_torrent.rb         | 2 +-
 lib/fog/aws/requests/storage/get_object_url.rb             | 2 +-
 lib/fog/aws/requests/storage/get_request_payment.rb        | 2 +-
 lib/fog/aws/requests/storage/get_service.rb                | 2 +-
 lib/fog/aws/requests/storage/head_bucket.rb                | 2 +-
 lib/fog/aws/requests/storage/head_object.rb                | 2 +-
 lib/fog/aws/requests/storage/head_object_url.rb            | 2 +-
 lib/fog/aws/requests/storage/initiate_multipart_upload.rb  | 2 +-
 lib/fog/aws/requests/storage/list_multipart_uploads.rb     | 2 +-
 lib/fog/aws/requests/storage/list_parts.rb                 | 2 +-
 lib/fog/aws/requests/storage/post_object_hidden_fields.rb  | 2 +-
 lib/fog/aws/requests/storage/post_object_restore.rb        | 2 +-
 lib/fog/aws/requests/storage/put_bucket.rb                 | 2 +-
 lib/fog/aws/requests/storage/put_bucket_acl.rb             | 2 +-
 lib/fog/aws/requests/storage/put_bucket_cors.rb            | 2 +-
 lib/fog/aws/requests/storage/put_bucket_lifecycle.rb       | 2 +-
 lib/fog/aws/requests/storage/put_bucket_logging.rb         | 2 +-
 lib/fog/aws/requests/storage/put_bucket_notification.rb    | 2 +-
 lib/fog/aws/requests/storage/put_bucket_policy.rb          | 2 +-
 lib/fog/aws/requests/storage/put_bucket_tagging.rb         | 2 +-
 lib/fog/aws/requests/storage/put_bucket_versioning.rb      | 2 +-
 lib/fog/aws/requests/storage/put_bucket_website.rb         | 2 +-
 lib/fog/aws/requests/storage/put_object.rb                 | 2 +-
 lib/fog/aws/requests/storage/put_object_acl.rb             | 2 +-
 lib/fog/aws/requests/storage/put_object_url.rb             | 2 +-
 lib/fog/aws/requests/storage/put_request_payment.rb        | 2 +-
 lib/fog/aws/requests/storage/shared_mock_methods.rb        | 2 +-
 lib/fog/aws/requests/storage/sync_clock.rb                 | 2 +-
 lib/fog/aws/requests/storage/upload_part.rb                | 2 +-
 59 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/lib/fog/aws/requests/storage/abort_multipart_upload.rb b/lib/fog/aws/requests/storage/abort_multipart_upload.rb
index 68fbf561f6..fc36440045 100644
--- a/lib/fog/aws/requests/storage/abort_multipart_upload.rb
+++ b/lib/fog/aws/requests/storage/abort_multipart_upload.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         #
         # Abort a multipart upload
diff --git a/lib/fog/aws/requests/storage/acl_utils.rb b/lib/fog/aws/requests/storage/acl_utils.rb
index cb0ebac2be..84a0339200 100644
--- a/lib/fog/aws/requests/storage/acl_utils.rb
+++ b/lib/fog/aws/requests/storage/acl_utils.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       require 'fog/aws/parsers/storage/access_control_list'
 
       private
diff --git a/lib/fog/aws/requests/storage/complete_multipart_upload.rb b/lib/fog/aws/requests/storage/complete_multipart_upload.rb
index f12cecb3c2..6e8b4aa6ec 100644
--- a/lib/fog/aws/requests/storage/complete_multipart_upload.rb
+++ b/lib/fog/aws/requests/storage/complete_multipart_upload.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/complete_multipart_upload'
 
diff --git a/lib/fog/aws/requests/storage/copy_object.rb b/lib/fog/aws/requests/storage/copy_object.rb
index 0c3340dee3..4ae10f0b68 100644
--- a/lib/fog/aws/requests/storage/copy_object.rb
+++ b/lib/fog/aws/requests/storage/copy_object.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/copy_object'
 
diff --git a/lib/fog/aws/requests/storage/cors_utils.rb b/lib/fog/aws/requests/storage/cors_utils.rb
index c94ac7e435..35cc38bc77 100644
--- a/lib/fog/aws/requests/storage/cors_utils.rb
+++ b/lib/fog/aws/requests/storage/cors_utils.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       require 'fog/aws/parsers/storage/cors_configuration'
 
       private
diff --git a/lib/fog/aws/requests/storage/delete_bucket.rb b/lib/fog/aws/requests/storage/delete_bucket.rb
index 7d18f8d177..dac0536524 100644
--- a/lib/fog/aws/requests/storage/delete_bucket.rb
+++ b/lib/fog/aws/requests/storage/delete_bucket.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Delete an S3 bucket
         #
diff --git a/lib/fog/aws/requests/storage/delete_bucket_cors.rb b/lib/fog/aws/requests/storage/delete_bucket_cors.rb
index d1faa450b6..ee949e4796 100644
--- a/lib/fog/aws/requests/storage/delete_bucket_cors.rb
+++ b/lib/fog/aws/requests/storage/delete_bucket_cors.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Deletes the cors configuration information set for the bucket.
         #
diff --git a/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb b/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb
index f47cb51382..97c6d609a6 100644
--- a/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb
+++ b/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Delete lifecycle configuration for a bucket
         #
diff --git a/lib/fog/aws/requests/storage/delete_bucket_policy.rb b/lib/fog/aws/requests/storage/delete_bucket_policy.rb
index 3af7e3333c..355d7fd4ff 100644
--- a/lib/fog/aws/requests/storage/delete_bucket_policy.rb
+++ b/lib/fog/aws/requests/storage/delete_bucket_policy.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Delete policy for a bucket
         #
diff --git a/lib/fog/aws/requests/storage/delete_bucket_tagging.rb b/lib/fog/aws/requests/storage/delete_bucket_tagging.rb
index 1b1f5b6e7b..e929220ce4 100644
--- a/lib/fog/aws/requests/storage/delete_bucket_tagging.rb
+++ b/lib/fog/aws/requests/storage/delete_bucket_tagging.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Delete tagging for a bucket
         #
diff --git a/lib/fog/aws/requests/storage/delete_bucket_website.rb b/lib/fog/aws/requests/storage/delete_bucket_website.rb
index d5bb666302..437037c905 100644
--- a/lib/fog/aws/requests/storage/delete_bucket_website.rb
+++ b/lib/fog/aws/requests/storage/delete_bucket_website.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Delete website configuration for a bucket
         #
diff --git a/lib/fog/aws/requests/storage/delete_multiple_objects.rb b/lib/fog/aws/requests/storage/delete_multiple_objects.rb
index 00c0239f65..7b79d3750d 100644
--- a/lib/fog/aws/requests/storage/delete_multiple_objects.rb
+++ b/lib/fog/aws/requests/storage/delete_multiple_objects.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/delete_multiple_objects'
 
diff --git a/lib/fog/aws/requests/storage/delete_object.rb b/lib/fog/aws/requests/storage/delete_object.rb
index ea04059ed3..0e416eea7d 100644
--- a/lib/fog/aws/requests/storage/delete_object.rb
+++ b/lib/fog/aws/requests/storage/delete_object.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Delete an object from S3
         #
diff --git a/lib/fog/aws/requests/storage/delete_object_url.rb b/lib/fog/aws/requests/storage/delete_object_url.rb
index 860a39d602..57580ecdfc 100644
--- a/lib/fog/aws/requests/storage/delete_object_url.rb
+++ b/lib/fog/aws/requests/storage/delete_object_url.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       module DeleteObjectUrl
         def delete_object_url(bucket_name, object_name, expires, options = {})
           unless bucket_name
diff --git a/lib/fog/aws/requests/storage/get_bucket.rb b/lib/fog/aws/requests/storage/get_bucket.rb
index 8cbd2a32b6..5f4ab5095f 100644
--- a/lib/fog/aws/requests/storage/get_bucket.rb
+++ b/lib/fog/aws/requests/storage/get_bucket.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/get_bucket'
 
diff --git a/lib/fog/aws/requests/storage/get_bucket_acl.rb b/lib/fog/aws/requests/storage/get_bucket_acl.rb
index 62910e2136..8213fba165 100644
--- a/lib/fog/aws/requests/storage/get_bucket_acl.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_acl.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/access_control_list'
 
diff --git a/lib/fog/aws/requests/storage/get_bucket_cors.rb b/lib/fog/aws/requests/storage/get_bucket_cors.rb
index 5f2aaf74b0..f3a4db72b9 100644
--- a/lib/fog/aws/requests/storage/get_bucket_cors.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_cors.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/cors_configuration'
 
diff --git a/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb b/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb
index cbf6406974..882ecd2731 100644
--- a/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_lifecycle.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/get_bucket_lifecycle'
 
diff --git a/lib/fog/aws/requests/storage/get_bucket_location.rb b/lib/fog/aws/requests/storage/get_bucket_location.rb
index 98706d4e4e..e3441de4e0 100644
--- a/lib/fog/aws/requests/storage/get_bucket_location.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_location.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/get_bucket_location'
 
diff --git a/lib/fog/aws/requests/storage/get_bucket_logging.rb b/lib/fog/aws/requests/storage/get_bucket_logging.rb
index 0710cb8990..d3b4d9165f 100644
--- a/lib/fog/aws/requests/storage/get_bucket_logging.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_logging.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/get_bucket_logging'
 
diff --git a/lib/fog/aws/requests/storage/get_bucket_notification.rb b/lib/fog/aws/requests/storage/get_bucket_notification.rb
index 5184c676d9..24dab6891b 100644
--- a/lib/fog/aws/requests/storage/get_bucket_notification.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_notification.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/get_bucket_notification'
 
diff --git a/lib/fog/aws/requests/storage/get_bucket_object_versions.rb b/lib/fog/aws/requests/storage/get_bucket_object_versions.rb
index 8f09023113..466c698df1 100644
--- a/lib/fog/aws/requests/storage/get_bucket_object_versions.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_object_versions.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/get_bucket_object_versions'
 
diff --git a/lib/fog/aws/requests/storage/get_bucket_policy.rb b/lib/fog/aws/requests/storage/get_bucket_policy.rb
index 2d004a1abb..73bafef176 100644
--- a/lib/fog/aws/requests/storage/get_bucket_policy.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_policy.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Get bucket policy for an S3 bucket
         #
diff --git a/lib/fog/aws/requests/storage/get_bucket_tagging.rb b/lib/fog/aws/requests/storage/get_bucket_tagging.rb
index 324cf4ca67..9b5e362783 100644
--- a/lib/fog/aws/requests/storage/get_bucket_tagging.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_tagging.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/get_bucket_tagging'
 
diff --git a/lib/fog/aws/requests/storage/get_bucket_versioning.rb b/lib/fog/aws/requests/storage/get_bucket_versioning.rb
index 946f0c4a07..2610a4c723 100644
--- a/lib/fog/aws/requests/storage/get_bucket_versioning.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_versioning.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/get_bucket_versioning'
 
diff --git a/lib/fog/aws/requests/storage/get_bucket_website.rb b/lib/fog/aws/requests/storage/get_bucket_website.rb
index 16790ee522..455f75a3e3 100644
--- a/lib/fog/aws/requests/storage/get_bucket_website.rb
+++ b/lib/fog/aws/requests/storage/get_bucket_website.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/get_bucket_website'
 
diff --git a/lib/fog/aws/requests/storage/get_object.rb b/lib/fog/aws/requests/storage/get_object.rb
index 89308c3978..39cff00f3f 100644
--- a/lib/fog/aws/requests/storage/get_object.rb
+++ b/lib/fog/aws/requests/storage/get_object.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Get an object from S3
         #
diff --git a/lib/fog/aws/requests/storage/get_object_acl.rb b/lib/fog/aws/requests/storage/get_object_acl.rb
index f782cd506a..a5aee8093f 100644
--- a/lib/fog/aws/requests/storage/get_object_acl.rb
+++ b/lib/fog/aws/requests/storage/get_object_acl.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/access_control_list'
 
diff --git a/lib/fog/aws/requests/storage/get_object_http_url.rb b/lib/fog/aws/requests/storage/get_object_http_url.rb
index d00946e0ce..119849d5c6 100644
--- a/lib/fog/aws/requests/storage/get_object_http_url.rb
+++ b/lib/fog/aws/requests/storage/get_object_http_url.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       module GetObjectHttpUrl
         def get_object_http_url(bucket_name, object_name, expires, options = {})
           get_object_url(bucket_name, object_name, expires, options.merge(:scheme => 'http'))
diff --git a/lib/fog/aws/requests/storage/get_object_https_url.rb b/lib/fog/aws/requests/storage/get_object_https_url.rb
index 1db402cf92..363fdc5986 100644
--- a/lib/fog/aws/requests/storage/get_object_https_url.rb
+++ b/lib/fog/aws/requests/storage/get_object_https_url.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       module GetObjectHttpsUrl
         def get_object_https_url(bucket_name, object_name, expires, options = {})
           get_object_url(bucket_name, object_name, expires, options.merge(:scheme => 'https'))
diff --git a/lib/fog/aws/requests/storage/get_object_torrent.rb b/lib/fog/aws/requests/storage/get_object_torrent.rb
index efe07d6203..1e7e64a003 100644
--- a/lib/fog/aws/requests/storage/get_object_torrent.rb
+++ b/lib/fog/aws/requests/storage/get_object_torrent.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Get torrent for an S3 object
         #
diff --git a/lib/fog/aws/requests/storage/get_object_url.rb b/lib/fog/aws/requests/storage/get_object_url.rb
index 980fecaa88..106ae80bbf 100644
--- a/lib/fog/aws/requests/storage/get_object_url.rb
+++ b/lib/fog/aws/requests/storage/get_object_url.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       module GetObjectUrl
         def get_object_url(bucket_name, object_name, expires, options = {})
           unless bucket_name
diff --git a/lib/fog/aws/requests/storage/get_request_payment.rb b/lib/fog/aws/requests/storage/get_request_payment.rb
index 35d396b500..5b939d8d07 100644
--- a/lib/fog/aws/requests/storage/get_request_payment.rb
+++ b/lib/fog/aws/requests/storage/get_request_payment.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/get_request_payment'
 
diff --git a/lib/fog/aws/requests/storage/get_service.rb b/lib/fog/aws/requests/storage/get_service.rb
index 3df9898193..3979e016e2 100644
--- a/lib/fog/aws/requests/storage/get_service.rb
+++ b/lib/fog/aws/requests/storage/get_service.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/get_service'
 
diff --git a/lib/fog/aws/requests/storage/head_bucket.rb b/lib/fog/aws/requests/storage/head_bucket.rb
index 7ca8fb50e9..68c1b79bb6 100644
--- a/lib/fog/aws/requests/storage/head_bucket.rb
+++ b/lib/fog/aws/requests/storage/head_bucket.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Get headers for an S3 bucket, used to verify if it exists and if you have permission to access it
         #
diff --git a/lib/fog/aws/requests/storage/head_object.rb b/lib/fog/aws/requests/storage/head_object.rb
index 040fba8ad7..91b9daed5f 100644
--- a/lib/fog/aws/requests/storage/head_object.rb
+++ b/lib/fog/aws/requests/storage/head_object.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Get headers for an object from S3
         #
diff --git a/lib/fog/aws/requests/storage/head_object_url.rb b/lib/fog/aws/requests/storage/head_object_url.rb
index 346748d029..5af5986123 100644
--- a/lib/fog/aws/requests/storage/head_object_url.rb
+++ b/lib/fog/aws/requests/storage/head_object_url.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       module HeadObjectUrl
         def head_object_url(bucket_name, object_name, expires, options = {})
           unless bucket_name
diff --git a/lib/fog/aws/requests/storage/initiate_multipart_upload.rb b/lib/fog/aws/requests/storage/initiate_multipart_upload.rb
index 80973cad34..b30326b38e 100644
--- a/lib/fog/aws/requests/storage/initiate_multipart_upload.rb
+++ b/lib/fog/aws/requests/storage/initiate_multipart_upload.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/initiate_multipart_upload'
 
diff --git a/lib/fog/aws/requests/storage/list_multipart_uploads.rb b/lib/fog/aws/requests/storage/list_multipart_uploads.rb
index d6f51ea391..8fcb3bab64 100644
--- a/lib/fog/aws/requests/storage/list_multipart_uploads.rb
+++ b/lib/fog/aws/requests/storage/list_multipart_uploads.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/list_multipart_uploads'
 
diff --git a/lib/fog/aws/requests/storage/list_parts.rb b/lib/fog/aws/requests/storage/list_parts.rb
index 9b3e82b940..326f222f99 100644
--- a/lib/fog/aws/requests/storage/list_parts.rb
+++ b/lib/fog/aws/requests/storage/list_parts.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/parsers/storage/list_parts'
 
diff --git a/lib/fog/aws/requests/storage/post_object_hidden_fields.rb b/lib/fog/aws/requests/storage/post_object_hidden_fields.rb
index a3dfcf2a67..da7fded8e8 100644
--- a/lib/fog/aws/requests/storage/post_object_hidden_fields.rb
+++ b/lib/fog/aws/requests/storage/post_object_hidden_fields.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       module PostObjectHiddenFields
         # Get a hash of hidden fields for form uploading to S3, in the form {:field_name => :field_value}
         # Form should look like: <form action="http://#{bucket_name}.s3.amazonaws.com/" method="post" enctype="multipart/form-data">
diff --git a/lib/fog/aws/requests/storage/post_object_restore.rb b/lib/fog/aws/requests/storage/post_object_restore.rb
index eeffcbc93a..9b9b05d750 100644
--- a/lib/fog/aws/requests/storage/post_object_restore.rb
+++ b/lib/fog/aws/requests/storage/post_object_restore.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Restore an object from Glacier to its original S3 path
         #
diff --git a/lib/fog/aws/requests/storage/put_bucket.rb b/lib/fog/aws/requests/storage/put_bucket.rb
index de25e4754a..b5e7a8accc 100644
--- a/lib/fog/aws/requests/storage/put_bucket.rb
+++ b/lib/fog/aws/requests/storage/put_bucket.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Create an S3 bucket
         #
diff --git a/lib/fog/aws/requests/storage/put_bucket_acl.rb b/lib/fog/aws/requests/storage/put_bucket_acl.rb
index d25f6096b8..586e31fd4e 100644
--- a/lib/fog/aws/requests/storage/put_bucket_acl.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_acl.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/requests/storage/acl_utils'
 
diff --git a/lib/fog/aws/requests/storage/put_bucket_cors.rb b/lib/fog/aws/requests/storage/put_bucket_cors.rb
index 60da58675d..8541078379 100644
--- a/lib/fog/aws/requests/storage/put_bucket_cors.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_cors.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/requests/storage/cors_utils'
 
diff --git a/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb b/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb
index 025072e826..6da814b6d7 100644
--- a/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Change lifecycle configuration for an S3 bucket
         #
diff --git a/lib/fog/aws/requests/storage/put_bucket_logging.rb b/lib/fog/aws/requests/storage/put_bucket_logging.rb
index a6536d6fbc..0903555c7f 100644
--- a/lib/fog/aws/requests/storage/put_bucket_logging.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_logging.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Change logging status for an S3 bucket
         #
diff --git a/lib/fog/aws/requests/storage/put_bucket_notification.rb b/lib/fog/aws/requests/storage/put_bucket_notification.rb
index e34aa72f7c..70f6e99102 100644
--- a/lib/fog/aws/requests/storage/put_bucket_notification.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_notification.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Change notification configuration for an S3 bucket
         #
diff --git a/lib/fog/aws/requests/storage/put_bucket_policy.rb b/lib/fog/aws/requests/storage/put_bucket_policy.rb
index ac034ed6f8..7b6fe34d71 100644
--- a/lib/fog/aws/requests/storage/put_bucket_policy.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_policy.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Change bucket policy for an S3 bucket
         #
diff --git a/lib/fog/aws/requests/storage/put_bucket_tagging.rb b/lib/fog/aws/requests/storage/put_bucket_tagging.rb
index c0db76f067..83f8f582d3 100644
--- a/lib/fog/aws/requests/storage/put_bucket_tagging.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_tagging.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Change tag set for an S3 bucket
         #
diff --git a/lib/fog/aws/requests/storage/put_bucket_versioning.rb b/lib/fog/aws/requests/storage/put_bucket_versioning.rb
index c8dee0dcea..779e211bb0 100644
--- a/lib/fog/aws/requests/storage/put_bucket_versioning.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_versioning.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Change versioning status for an S3 bucket
         #
diff --git a/lib/fog/aws/requests/storage/put_bucket_website.rb b/lib/fog/aws/requests/storage/put_bucket_website.rb
index a18c9ba9b8..4d009d69a3 100644
--- a/lib/fog/aws/requests/storage/put_bucket_website.rb
+++ b/lib/fog/aws/requests/storage/put_bucket_website.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Change website configuration for an S3 bucket
         #
diff --git a/lib/fog/aws/requests/storage/put_object.rb b/lib/fog/aws/requests/storage/put_object.rb
index 997d14f22f..94c331a879 100644
--- a/lib/fog/aws/requests/storage/put_object.rb
+++ b/lib/fog/aws/requests/storage/put_object.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Create an object in an S3 bucket
         #
diff --git a/lib/fog/aws/requests/storage/put_object_acl.rb b/lib/fog/aws/requests/storage/put_object_acl.rb
index 23a7346a13..890e0c46b2 100644
--- a/lib/fog/aws/requests/storage/put_object_acl.rb
+++ b/lib/fog/aws/requests/storage/put_object_acl.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         require 'fog/aws/requests/storage/acl_utils'
 
diff --git a/lib/fog/aws/requests/storage/put_object_url.rb b/lib/fog/aws/requests/storage/put_object_url.rb
index 0275cb7ee5..de1bfb333a 100644
--- a/lib/fog/aws/requests/storage/put_object_url.rb
+++ b/lib/fog/aws/requests/storage/put_object_url.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       module PutObjectUrl
         def put_object_url(bucket_name, object_name, expires, headers = {}, options = {})
           unless bucket_name
diff --git a/lib/fog/aws/requests/storage/put_request_payment.rb b/lib/fog/aws/requests/storage/put_request_payment.rb
index fac4178669..d2837d1b6a 100644
--- a/lib/fog/aws/requests/storage/put_request_payment.rb
+++ b/lib/fog/aws/requests/storage/put_request_payment.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Change who pays for requests to an S3 bucket
         #
diff --git a/lib/fog/aws/requests/storage/shared_mock_methods.rb b/lib/fog/aws/requests/storage/shared_mock_methods.rb
index e4da701f39..077ef23c81 100644
--- a/lib/fog/aws/requests/storage/shared_mock_methods.rb
+++ b/lib/fog/aws/requests/storage/shared_mock_methods.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       module SharedMockMethods
         def define_mock_acl(bucket_name, object_name, options)
           acl = options['x-amz-acl'] || 'private'
diff --git a/lib/fog/aws/requests/storage/sync_clock.rb b/lib/fog/aws/requests/storage/sync_clock.rb
index 294e02ec93..aad5d3becd 100644
--- a/lib/fog/aws/requests/storage/sync_clock.rb
+++ b/lib/fog/aws/requests/storage/sync_clock.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Sync clock against S3 to avoid skew errors
         #
diff --git a/lib/fog/aws/requests/storage/upload_part.rb b/lib/fog/aws/requests/storage/upload_part.rb
index f175a57844..dfcb49af7f 100644
--- a/lib/fog/aws/requests/storage/upload_part.rb
+++ b/lib/fog/aws/requests/storage/upload_part.rb
@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    class AWS
+    class Storage
       class Real
         # Upload a part for a multipart upload
         #

From 44f7db83d4067b1741e60538f68ddb43b2cef60b Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:15:24 +0900
Subject: [PATCH 36/39] Deprecate Storage::AWS

---
 lib/fog/aws/storage.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/fog/aws/storage.rb b/lib/fog/aws/storage.rb
index a2bab86d4e..5e432de2eb 100644
--- a/lib/fog/aws/storage.rb
+++ b/lib/fog/aws/storage.rb
@@ -764,4 +764,17 @@ def stringify_query_keys(params)
       end
     end
   end
+
+  # @deprecated
+  module Storage
+    # @deprecated
+    class AWS < Fog::AWS::Storage
+      # @deprecated
+      # @overrides Fog::Service.new (from the fog-core gem)
+      def self.new(*)
+        Fog::Logger.deprecation 'Fog::Storage::AWS is deprecated, please use Fog::AWS::Storage.'
+        super
+      end
+    end
+  end
 end

From 681547418667a35413d8127824cfb2fb94d903f0 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 14 Sep 2018 23:53:52 +0900
Subject: [PATCH 37/39] Fixed: uninitialized constant Fog::AWS::DEFAULT_REGION
 (NameError)

---
 lib/fog/aws/models/storage/directory.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fog/aws/models/storage/directory.rb b/lib/fog/aws/models/storage/directory.rb
index 26ac1ee8f8..cc30672f79 100644
--- a/lib/fog/aws/models/storage/directory.rb
+++ b/lib/fog/aws/models/storage/directory.rb
@@ -31,7 +31,7 @@ def destroy
         end
 
         def location
-          @location ||= (bucket_location || AWS::DEFAULT_REGION)
+          @location ||= (bucket_location || Storage::DEFAULT_REGION)
         end
 
         # NOTE: you can't change the region once the bucket is created

From 89fd6ad18e8ab892ce3d061a17277e14cc857338 Mon Sep 17 00:00:00 2001
From: geemus <geemus@gmail.com>
Date: Mon, 17 Sep 2018 14:03:55 -0500
Subject: [PATCH 38/39] v3.1.0

---
 lib/fog/aws/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fog/aws/version.rb b/lib/fog/aws/version.rb
index bffc0aaaef..e440333666 100644
--- a/lib/fog/aws/version.rb
+++ b/lib/fog/aws/version.rb
@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "3.0.0"
+    VERSION = "3.1.0"
   end
 end

From cafb79c09f1aa363d9763da44d278f81322b1698 Mon Sep 17 00:00:00 2001
From: geemus <geemus@gmail.com>
Date: Mon, 17 Sep 2018 15:14:14 -0500
Subject: [PATCH 39/39] v3.2.0

---
 lib/fog/aws/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fog/aws/version.rb b/lib/fog/aws/version.rb
index e440333666..161a664ba6 100644
--- a/lib/fog/aws/version.rb
+++ b/lib/fog/aws/version.rb
@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "3.1.0"
+    VERSION = "3.2.0"
   end
 end