working tests

.travis.yml

@@ -0,0 +1,47 @@
+language: ruby
+
+sudo: false
+
+script: bundle exec rake test
+
+matrix:
+  fast_finish: true
+  include:
+    - rvm: 1.8.7
+      gemfile: gemfiles/Gemfile-ruby-1.8.7
+    - rvm: 1.9.3
+      gemfile: Gemfile
+    - rvm: 2.0.0
+      gemfile: Gemfile
+    - rvm: 2.1.0
+      gemfile: Gemfile
+    - rvm: 2.1.1
+      gemfile: Gemfile
+    - rvm: 2.1.1
+      gemfile: gemfiles/Gemfile-edge
+    - rvm: 2.2.0
+      gemfile: Gemfile
+    - rvm: 2.2.0
+      gemfile: gemfiles/Gemfile-edge
+    - rvm: jruby-18mode
+      gemfile: gemfiles/Gemfile-ruby-1.8.7
+    - rvm: jruby-19mode
+      gemfile: Gemfile
+    - rvm: jruby-head
+      gemfile: Gemfile
+
+  allow_failures:
+    - rvm: jruby-head
+
+notifications:
+  email: false
+  irc:
+    channels:
+      - "irc.freenode.org#ruby-fog"
+    template:
+      - "[#%{build_number}] %{message} %{build_url}"
+      - "[#%{build_number}] %{commit} on %{branch} by %{author}"
+      - "[#%{build_number}] %{compare_url}"
+    on_success: always
+    on_failure: always
+    use_notice: false

Rakefile

@@ -1,2 +1,8 @@
 require "bundler/gem_tasks"
 
+task :default => :test
+
+mock = ENV['FOG_MOCK'] || 'true'
+task :test do
+  sh("export FOG_MOCK=#{mock} && bundle exec shindont")
+end

gemfiles/Gemfile-edge

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+# Shared components
+gem "fog-core", :github => "fog/fog-core"
+gem "fog-json", :github => "fog/fog-json"
+
+group :development, :test do
+  # This is here because gemspec doesn"t support require: false
+  gem "coveralls", :require => false
+  gem "netrc", :require => false
+  gem "octokit", :require => false
+end
+
+gemspec :path => "../"

gemfiles/Gemfile-ruby-1.8.7

@@ -0,0 +1,17 @@
+source "https://rubygems.org"
+
+gem 'activesupport', '~> 3.2'
+gem 'nokogiri', '~>1.5.11'
+gem 'mime-types', '~>1.16'
+gem 'rest-client', '~> 1.6.7'
+gem 'i18n', '~> 0.6.11'
+
+group :development, :test do
+  # This is here because gemspec doesn't support require: false
+  gem 'coveralls', :require => false
+  gem "netrc", :require => false
+  gem "octokit", '~> 2.7.2', :require => false
+  gem 'rake', '~> 10.1.0'
+end
+
+gemspec :path => "../"

lib/fog/aws.rb

@@ -2,6 +2,125 @@ require 'fog/aws/version'
 
 module Fog
   module AWS
+    class << self
+      def class_for(key)
+        case key
+        when :auto_scaling
+          Fog::AWS::AutoScaling
+        when :beanstalk
+          Fog::AWS::ElasticBeanstalk
+        when :cdn
+          Fog::CDN::AWS
+        when :cloud_formation
+          Fog::AWS::CloudFormation
+        when :cloud_watch
+          Fog::AWS::CloudWatch
+        when :compute
+          Fog::Compute::AWS
+        when :data_pipeline
+          Fog::AWS::DataPipeline
+        when :ddb, :dynamodb
+          Fog::AWS::DynamoDB
+        when :dns
+          Fog::DNS::AWS
+        when :elasticache
+          Fog::AWS::Elasticache
+        when :elb
+          Fog::AWS::ELB
+        when :emr
+          Fog::AWS::EMR
+        when :glacier
+          Fog::AWS::Glacier
+        when :iam
+          Fog::AWS::IAM
+        when :redshift
+          Fog::AWS::Redshift
+        when :sdb, :simpledb
+          Fog::AWS::SimpleDB
+        when :ses
+          Fog::AWS::SES
+        when :sqs
+          Fog::AWS::SQS
+        when :eu_storage, :storage
+          Fog::Storage::AWS
+        when :rds
+          Fog::AWS::RDS
+        when :sns
+          Fog::AWS::SNS
+        when :sts
+          Fog::AWS::STS
+        else
+          # @todo Replace most instances of ArgumentError with NotImplementedError
+          # @todo For a list of widely supported Exceptions, see:
+          # => http://www.zenspider.com/Languages/Ruby/QuickRef.html#35
+          raise ArgumentError, "Unsupported #{self} service: #{key}"
+        end
+      end
+
+      def [](service)
+        @@connections ||= Hash.new do |hash, key|
+          hash[key] = case key
+                      when :auto_scaling
+                        Fog::AWS::AutoScaling.new
+                      when :beanstalk
+                        Fog::AWS::ElasticBeanstalk.new
+                      when :cdn
+                        Fog::Logger.warning("Fog::AWS[:cdn] is not recommended, use CDN[:aws] for portability")
+                        Fog::CDN.new(:provider => 'AWS')
+                      when :cloud_formation
+                        Fog::AWS::CloudFormation.new
+                      when :cloud_watch
+                        Fog::AWS::CloudWatch.new
+                      when :compute
+                        Fog::Logger.warning("Fog::AWS[:compute] is not recommended, use Compute[:aws] for portability")
+                        Fog::Compute.new(:provider => 'AWS')
+                      when :data_pipeline
+                        Fog::AWS::DataPipeline
+                      when :ddb, :dynamodb
+                        Fog::AWS::DynamoDB.new
+                      when :dns
+                        Fog::Logger.warning("Fog::AWS[:dns] is not recommended, use DNS[:aws] for portability")
+                        Fog::DNS.new(:provider => 'AWS')
+                      when :elasticache
+                        Fog::AWS::Elasticache.new
+                      when :elb
+                        Fog::AWS::ELB.new
+                      when :emr
+                        Fog::AWS::EMR.new
+                      when :glacier
+                        Fog::AWS::Glacier.new
+                      when :iam
+                        Fog::AWS::IAM.new
+                      when :redshift
+                        Fog::AWS::Redshift.new
+                      when :rds
+                        Fog::AWS::RDS.new
+                      when :eu_storage
+                        Fog::Storage.new(:provider => 'AWS', :region => 'eu-west-1')
+                      when :sdb, :simpledb
+                        Fog::AWS::SimpleDB.new
+                      when :ses
+                        Fog::AWS::SES.new
+                      when :sqs
+                        Fog::AWS::SQS.new
+                      when :storage
+                        Fog::Logger.warning("Fog::AWS[:storage] is not recommended, use Storage[:aws] for portability")
+                        Fog::Storage.new(:provider => 'AWS')
+                      when :sns
+                        Fog::AWS::SNS.new
+                      when :sts
+                        Fog::AWS::STS.new
+                      else
+                        raise ArgumentError, "Unrecognized service: #{key.inspect}"
+                      end
+        end
+        @@connections[service]
+      end
+
+      def services
+        Fog::AWS.services
+      end
+    end
   end
 end
 

lib/fog/aws/auto_scaling.rb

@@ -83,7 +83,7 @@ module Fog
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
         #
         # ==== Returns
-        # * AutoScaling object with connection to Aws.
+        # * AutoScaling object with connection to AWS.
 
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
@@ -118,7 +118,7 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body, headers = Aws.signed_params_v4(
+          body, headers = AWS.signed_params_v4(
             params,
             { 'Content-Type' => 'application/x-www-form-urlencoded' },
             {

lib/fog/aws/beanstalk.rb

@@ -108,7 +108,7 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body, headers = Aws.signed_params_v4(
+          body, headers = AWS.signed_params_v4(
               params,
               { 'Content-Type' => 'application/x-www-form-urlencoded' },
               {

lib/fog/aws/cdn.rb

@@ -2,7 +2,7 @@ require 'fog/aws/core'
 
 module Fog
   module CDN
-    class Aws < Fog::Service
+    class AWS < Fog::Service
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
@@ -178,7 +178,7 @@ EOF
           params[:headers] ||= {}
           params[:headers]['Date'] = Fog::Time.now.to_date_header
           params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
-          params[:headers]['Authorization'] = "Aws #{@aws_access_key_id}:#{signature(params)}"
+          params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature(params)}"
           params[:path] = "/#{@version}/#{params[:path]}"
 
           if @instrumentor

lib/fog/aws/cloud_formation.rb

@@ -44,7 +44,7 @@ module Fog
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
         #
         # ==== Returns
-        # * CloudFormation object with connection to Aws.
+        # * CloudFormation object with connection to AWS.
         def initialize(options={})
 
           @use_iam_profile = options[:use_iam_profile]

lib/fog/aws/cloud_watch.rb

@@ -87,7 +87,7 @@ module Fog
         #   * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1', etc.
         #
         # ==== Returns
-        # * CloudWatch object with connection to Aws.
+        # * CloudWatch object with connection to AWS.
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
 
@@ -128,7 +128,7 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body, headers = Aws.signed_params_v4(
+          body, headers = AWS.signed_params_v4(
             params,
             { 'Content-Type' => 'application/x-www-form-urlencoded' },
             {

lib/fog/aws/compute.rb

@@ -2,7 +2,7 @@ require 'fog/aws/core'
 
 module Fog
   module Compute
-    class Aws < Fog::Service
+    class AWS < Fog::Service
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
@@ -162,7 +162,7 @@ module Fog
           modify_image_attribute(*params)
         end
 
-        # http://docs.aws.amazon.com/AwsEC2/latest/UserGuide/ec2-supported-platforms.html
+        # http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html
         def supported_platforms
           describe_account_attributes.body["accountAttributeSet"].find{ |h| h["attributeName"] == "supported-platforms" }["values"]
         end

lib/fog/aws/core.rb

@@ -109,7 +109,7 @@ module Fog
         end
       end
       body.chop!
-
+      
       headers['Authorization'] = options[:signer].sign({:method => options[:method], :headers => headers, :body => body, :query => {}, :path => options[:path]}, date)
 
       return body, headers
@@ -117,7 +117,7 @@ module Fog
 
     def self.signed_params(params, options = {})
       params.merge!({
-        'AwsAccessKeyId'    => options[:aws_access_key_id],
+        'AWSAccessKeyId'    => options[:aws_access_key_id],
         'SignatureMethod'   => 'HmacSHA256',
         'SignatureVersion'  => '2',
         'Timestamp'         => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ"),

lib/fog/aws/data_pipeline.rb

@@ -50,7 +50,7 @@ module Fog
         #   * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1' and etc.
         #
         # ==== Returns
-        # * DataPipeline object with connection to Aws.
+        # * DataPipeline object with connection to AWS.
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
           @instrumentor       = options[:instrumentor]

lib/fog/aws/dns.rb

@@ -2,7 +2,7 @@ require 'fog/aws/core'
 
 module Fog
   module DNS
-    class Aws < Fog::Service
+    class AWS < Fog::Service
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
@@ -127,7 +127,7 @@ module Fog
           params[:headers] ||= {}
           params[:headers]['Date'] = Fog::Time.now.to_date_header
           params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
-          params[:headers]['X-Amzn-Authorization'] = "Aws3-HTTPS AwsAccessKeyId=#{@aws_access_key_id},Algorithm=HmacSHA1,Signature=#{signature(params)}"
+          params[:headers]['X-Amzn-Authorization'] = "AWS3-HTTPS AWSAccessKeyId=#{@aws_access_key_id},Algorithm=HmacSHA1,Signature=#{signature(params)}"
           params[:path] = "/#{@version}/#{params[:path]}"
 
           if @instrumentor

lib/fog/aws/elb.rb

@@ -129,7 +129,7 @@ module Fog
         #   * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1', etc.
         #
         # ==== Returns
-        # * ELB object with connection to Aws.
+        # * ELB object with connection to AWS.
         def initialize(options={})
 
           @use_iam_profile = options[:use_iam_profile]

lib/fog/aws/emr.rb

@@ -59,7 +59,7 @@ module Fog
         #   * region<~String> - optional region to use. For instance, in 'eu-west-1', 'us-east-1' and etc.
         #
         # ==== Returns
-        # * EMR object with connection to Aws.
+        # * EMR object with connection to AWS.
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
           @connection_options     = options[:connection_options] || {}

lib/fog/aws/glacier.rb

@@ -115,7 +115,7 @@ module Fog
         #   * region<~String> - optional region to use. For instance, 'us-east-1' and etc.
         #
         # ==== Returns
-        # * Glacier object with connection to Aws.
+        # * Glacier object with connection to AWS.
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
           @region = options[:region] || 'us-east-1'

lib/fog/aws/iam.rb

@@ -171,7 +171,7 @@ module Fog
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
         #
         # ==== Returns
-        # * IAM object with connection to Aws.
+        # * IAM object with connection to AWS.
         def initialize(options={})
 
           @use_iam_profile = options[:use_iam_profile]

lib/fog/aws/models/beanstalk/templates.rb

@@ -10,7 +10,7 @@ module Fog
         # Describes all configuration templates, may optionally pass an ApplicationName filter
         #
         # Note: This is currently an expensive operation requiring multiple API calls due to a lack of
-        # a describe configuration templates call in the Aws API.
+        # a describe configuration templates call in the AWS API.
         def all(options={})
           application_filter = []
           if options.key?('ApplicationName')

lib/fog/aws/models/cdn/distribution.rb

@@ -4,7 +4,7 @@ require 'fog/aws/models/cdn/distribution_helper'
 
 module Fog
   module CDN
-    class Aws
+    class AWS
       class Distribution < Fog::Model
         include Fog::CDN::AWS::DistributionHelper
 

lib/fog/aws/models/cdn/distribution_helper.rb

@@ -2,7 +2,7 @@ require 'fog/core/collection'
 
 module Fog
   module CDN
-    class Aws
+    class AWS
       module DistributionHelper
         def destroy
           requires :identity, :etag, :caller_reference

lib/fog/aws/models/cdn/distributions.rb

@@ -4,7 +4,7 @@ require 'fog/aws/models/cdn/distributions_helper'
 
 module Fog
   module CDN
-    class Aws
+    class AWS
       class Distributions < Fog::Collection
         include Fog::CDN::AWS::DistributionsHelper
 

lib/fog/aws/models/cdn/distributions_helper.rb

@@ -2,7 +2,7 @@ require 'fog/core/collection'
 
 module Fog
   module CDN
-    class Aws
+    class AWS
       module DistributionsHelper
 
         def all(options = {})

lib/fog/aws/models/cdn/invalidation.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module CDN
-    class Aws
+    class AWS
       class Invalidation < Fog::Model
         identity :id,                :aliases => 'Id'
 

lib/fog/aws/models/cdn/invalidations.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/cdn/invalidation'
 
 module Fog
   module CDN
-    class Aws
+    class AWS
       class Invalidations < Fog::Collection
         attribute :is_truncated,            :aliases => ['IsTruncated']
         attribute :max_items,               :aliases => ['MaxItems']

lib/fog/aws/models/cdn/streaming_distribution.rb

@@ -4,7 +4,7 @@ require 'fog/aws/models/cdn/distribution_helper'
 
 module Fog
   module CDN
-    class Aws
+    class AWS
       class StreamingDistribution < Fog::Model
         include Fog::CDN::AWS::DistributionHelper
 

lib/fog/aws/models/cdn/streaming_distributions.rb

@@ -4,7 +4,7 @@ require 'fog/aws/models/cdn/distributions_helper'
 
 module Fog
   module CDN
-    class Aws
+    class AWS
       class StreamingDistributions < Fog::Collection
         include Fog::CDN::AWS::DistributionsHelper
 

lib/fog/aws/models/cloud_watch/alarm.rb

@@ -29,7 +29,7 @@ module Fog
 
         def initialize(attributes)
           attributes['EvaluationPeriods'] ||= 1
-          attributes['Namespace']         ||= 'Aws/EC2'
+          attributes['Namespace']         ||= 'AWS/EC2'
           super
         end
 

lib/fog/aws/models/compute/address.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class Address < Fog::Model
         identity  :public_ip,                  :aliases => 'publicIp'
 

lib/fog/aws/models/compute/addresses.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/address'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class Addresses < Fog::Collection
         attribute :filters
         attribute :server
@@ -14,13 +14,13 @@ module Fog
         #
         # ==== Returns
         #
-        #>> Aws.addresses.create
+        #>> AWS.addresses.create
         #  <Fog::AWS::Compute::Address
         #    public_ip="4.88.524.95",
         #    server_id=nil
         #  >
         #
-        # The IP address can be retrieved by running Aws.addresses.get("test").  See get method below.
+        # The IP address can be retrieved by running AWS.addresses.get("test").  See get method below.
         #
 
         def initialize(attributes)
@@ -28,13 +28,13 @@ module Fog
           super
         end
 
-        # Aws.addresses.all
+        # AWS.addresses.all
         #
         # ==== Returns
         #
         # Returns an array of all IP addresses
         #
-        #>> Aws.addresses.all
+        #>> AWS.addresses.all
         #  <Fog::AWS::Compute::Addresses
         #    filters={},
         #    server=nil
@@ -75,7 +75,7 @@ module Fog
         # public_ip is required to get the associated IP information.
         #
         # You can run the following command to get the details:
-        # Aws.addresses.get("76.7.46.54")
+        # AWS.addresses.get("76.7.46.54")
 
         def get(public_ip)
           if public_ip

lib/fog/aws/models/compute/dhcp_option.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class DhcpOption < Fog::Model
         identity  :id,                          :aliases => 'dhcpOptionsId'
         attribute :dhcp_configuration_set,      :aliases => 'dhcpConfigurationSet'
@@ -43,7 +43,7 @@ module Fog
 
         # Create a dhcp configuration set
         #
-        #  >> g = Aws.dhcp_options.new()
+        #  >> g = AWS.dhcp_options.new()
         #  >> g.save
         #
         # == Returns:

lib/fog/aws/models/compute/dhcp_options.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/dhcp_option'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class DhcpOptions < Fog::Collection
         attribute :filters
 
@@ -11,13 +11,13 @@ module Fog
 
         # Creates a new dhcp option
         #
-        # Aws.dhcp_options.new
+        # AWS.dhcp_options.new
         #
         # ==== Returns
         #
         # Returns the details of the new DHCP options
         #
-        #>> Aws.dhcp_options.new
+        #>> AWS.dhcp_options.new
         #=>   <Fog::Compute::AWS::DhcpOption
         #id=nil,
         #dhcp_configuration_set=nil,
@@ -32,13 +32,13 @@ module Fog
 
         # Returns an array of all DhcpOptions that have been created
         #
-        # Aws.dhcp_options.all
+        # AWS.dhcp_options.all
         #
         # ==== Returns
         #
         # Returns an array of all DhcpOptions
         #
-        #>> Aws.dhcp_options.all
+        #>> AWS.dhcp_options.all
         #<Fog::Compute::AWS::DhcpOptions
         #filters={}
         #[
@@ -64,11 +64,11 @@ module Fog
         # Used to retrieve an DhcpOption
         #
         # You can run the following command to get the details:
-        # Aws.dhcp_options.get("dopt-12345678")
+        # AWS.dhcp_options.get("dopt-12345678")
         #
         # ==== Returns
         #
-        #>> Aws.dhcp_options.get("dopt-12345678")
+        #>> AWS.dhcp_options.get("dopt-12345678")
         #=>   <Fog::Compute::AWS::DhcpOption
         #id="dopt-12345678",
         #dhcp_configuration_set={"vpcId"=>"vpc-12345678", "state"=>"available"},

lib/fog/aws/models/compute/flavor.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class Flavor < Fog::Model
         identity :id
 

lib/fog/aws/models/compute/flavors.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/flavor'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       FLAVORS = [
         {
           :id                      => 't1.micro',
@@ -392,13 +392,13 @@ module Fog
 
         # Returns an array of all flavors that have been created
         #
-        # Aws.flavors.all
+        # AWS.flavors.all
         #
         # ==== Returns
         #
         # Returns an array of all available instances and their general information
         #
-        #>> Aws.flavors.all
+        #>> AWS.flavors.all
         #  <Fog::AWS::Compute::Flavors
         #    [
         #      <Fog::AWS::Compute::Flavor
@@ -580,11 +580,11 @@ module Fog
         # i2.xlarge, i2.2xlarge, i2.4xlarge, i2.8xlarge
         #
         # You can run the following command to get the details:
-        # Aws.flavors.get("t1.micro")
+        # AWS.flavors.get("t1.micro")
         #
         # ==== Returns
         #
-        #>> Aws.flavors.get("t1.micro")
+        #>> AWS.flavors.get("t1.micro")
         # <Fog::AWS::Compute::Flavor
         #  id="t1.micro",
         #  bits=0,

lib/fog/aws/models/compute/image.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class Image < Fog::Model
         identity :id,                     :aliases => 'imageId'
 

lib/fog/aws/models/compute/images.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/image'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class Images < Fog::Collection
         attribute :filters
 
@@ -11,13 +11,13 @@ module Fog
 
         # Creates a new Amazon machine image
         #
-        # Aws.images.new
+        # AWS.images.new
         #
         # ==== Returns
         #
         # Returns the details of the new image
         #
-        #>> Aws.images.new
+        #>> AWS.images.new
         #  <Fog::AWS::Compute::Image
         #    id=nil,
         #    architecture=nil,

lib/fog/aws/models/compute/internet_gateway.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class InternetGateway < Fog::Model
         identity  :id,                          :aliases => 'internetGatewayId'
         attribute :attachment_set,              :aliases => 'attachmentSet'
@@ -57,7 +57,7 @@ module Fog
 
         # Create an internet gateway
         #
-        #  >> g = Aws.internet_gateways.new()
+        #  >> g = AWS.internet_gateways.new()
         #  >> g.save
         #
         # == Returns:

lib/fog/aws/models/compute/internet_gateways.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/internet_gateway'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class InternetGateways < Fog::Collection
         attribute :filters
 
@@ -11,13 +11,13 @@ module Fog
 
         # Creates a new internet gateway
         #
-        # Aws.internet_gateways.new
+        # AWS.internet_gateways.new
         #
         # ==== Returns
         #
         # Returns the details of the new InternetGateway
         #
-        #>> Aws.internet_gateways.new
+        #>> AWS.internet_gateways.new
         #=>   <Fog::Compute::AWS::InternetGateway
         #id=nil,
         #attachment_set=nil,
@@ -32,13 +32,13 @@ module Fog
 
         # Returns an array of all InternetGateways that have been created
         #
-        # Aws.internet_gateways.all
+        # AWS.internet_gateways.all
         #
         # ==== Returns
         #
         # Returns an array of all InternetGateways
         #
-        #>> Aws.internet_gateways.all
+        #>> AWS.internet_gateways.all
         #<Fog::Compute::AWS::InternetGateways
         #filters={}
         #[
@@ -64,11 +64,11 @@ module Fog
         # Used to retrieve an InternetGateway
         #
         # You can run the following command to get the details:
-        # Aws.internet_gateways.get("igw-12345678")
+        # AWS.internet_gateways.get("igw-12345678")
         #
         # ==== Returns
         #
-        #>> Aws.internet_gateways.get("igw-12345678")
+        #>> AWS.internet_gateways.get("igw-12345678")
         #=>   <Fog::Compute::AWS::InternetGateway
         #id="igw-12345678",
         #attachment_set={"vpcId"=>"vpc-12345678", "state"=>"available"},

lib/fog/aws/models/compute/key_pair.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class KeyPair < Fog::Model
         identity  :name,        :aliases => 'keyName'
 

lib/fog/aws/models/compute/key_pairs.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/key_pair'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class KeyPairs < Fog::Collection
         attribute :filters
         attribute :key_name
@@ -11,7 +11,7 @@ module Fog
         model Fog::Compute::AWS::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')
+        # AWS.key_pairs.create(:name => "test", :fingerprint => "123", :private_key => '234234')
         #
         # ==== Returns
         #
@@ -21,7 +21,7 @@ module Fog
         #  private_key="-----BEGIN RSA PRIVATE KEY-----\nf/VtfXJ/ekTSlRS2GSItBSzMrEGoZ+EXeMOuiA7HFkDcgKt6aBiOX9Bysiyfc1rIrgWdFKqXBRJA\nrtvBPa3/32koMPV4FxG7RZrPuKLITmFoEV86M0DSLo+ErlOPuDChfrR9dk6eI17/o1VmSvYsIpDc\njvbgx+tt7ZEPvduoUag7YdnUI0f20fttsdXjMlyDg9pPOVF3/hqucqOb3t5y9lvVJJxdTnEDFSjb\nvodpaDT9+ssw4IsQsZEIvfL0hK+Lt4phbclUWfG7JVnYfdd2u4zU6Nqe0+3qoR0ZOH4/zaUko7z8\n7JMbJqs5bmdWfnQTrvbJ13545FRI/W48ZRJxqPcj0t2MzasbT4gMgtNJrSadq78RkRJjNTu4lZmK\nvJejkBZPicHvo5IRSEbDc90Rhdh0aZNifXn0d0DSV2N6Ywo2o1lwRAi3/l6XSjukyRpTPcMr14MP\ntGwS1Tvez41Oa7Y96VfsJB2xtKc6LGRFiPUg2ZAEHU15Q9bIISVzHXgdAcef1bsh8UN/fDBrTusm\nvJisQ+dLaPH7cZ03od+XTwJc+IyeL4RqWuASE0NNfEVJMS+qcpt0WeNzfG0C27SwIcfEKL0sC0kn\nCfX2WpZDg7T5xN+88ftKJaN9tymxTgvoJVS1/WKvWBAXVozKp4f6K8wKmwf7VdUt/FWbUi54LW02\nf1ONkaYEOVwDgWlGxVSx43MWqvVdT2MPFNEBL7OA1LPwCO2nyQQ9UM9gCE65S9Najf939Bq8xwqx\nGNFlLmaH6biZUyL8ewRJ8Y7rMQ5cXy/gHZywjkuoyLQ8vVpmVpb7r1FaM/AYSr5l6gJEWdqbJleN\ntnhjPeE6qXISzIUBvwKzzgFTyW8ZHQtgbP3bHEiPG2/OjKHnLUoOId/eetcE+ovIxWsBrTDbf2SV\nYUD91u+W9K35eX89ZaIiohLNg4z9+QHCs4rcWyOXEfprBKcP2QU5+Y9ysnXLAmZt6QhInaAsUpQZ\nyhImA24UqvqrK0yyGhf/quouK7q0QkVQR+f7nGClIaphJkxO/xylrnK/pYObr4s3B8kmksuHiYOu\n1yz6SeRkj8F9dxkRmzbBK/G0tLkxIElDbM7icI9gsEO7vvgaR/K8hSDi0RkFPG43I20tU8PqwHe7\nR4jFW+6sB2+9FDeLn+qkoDSaxzmAuIRW082z/r7rJVIpFEo14hNhQYkNXpH40+P/hA9RFgvhZe8M\nvK4rz/eu246Kij6kObieTfpZhgGHqvtU8x5cnqEZOz5Hc5m4B+gMaTA53kFSPOA0pn6gqgiuYEdI\nZUhO8P1PkNqkmLz7NJRnz3qpAo6RisAxPBVr2WdSg4bP0YpGS/0TE4OOJwGLldx6dCsX60++mn0q\n1fhNw8oyZiguYMAeEEDWP8x/bsRaFz5L8uQVnnnj8ei1oTmZ+Uw9/48snWYcurL2jsbuWhhE0NTt\nfe/cqov7ZaZHs+Tr20ZBEDEqUEWr/MMskj/ZSVxnza1G/hztFJMAThF9ZJoGQkHWHfXCGOLLGY+z\nqi0SC8EIeu8PUxjO2SRj9S9o/Dwg3iHyM3pj57kD7fDNnl3Ed6LMoCXoaQV8BdMX4xh=\n-----END RSA PRIVATE KEY-----"
         #>
         #
-        # The key_pair can be retrieved by running Aws.key_pairs.get("test").  See get method below.
+        # The key_pair can be retrieved by running AWS.key_pairs.get("test").  See get method below.
         #
 
         def initialize(attributes)
@@ -31,7 +31,7 @@ module Fog
 
         # Returns an array of all key pairs that have been created
         #
-        # Aws.key_pairs.all
+        # AWS.key_pairs.all
         #
         # ==== Returns
         #
@@ -57,15 +57,15 @@ module Fog
           load(data['keySet'])
         end
 
-        # Used to retrieve a key pair that was created with the Aws.key_pairs.create method.
+        # Used to retrieve a key pair that was created with the AWS.key_pairs.create method.
         # The name is required to get the associated key_pair information.
         #
         # You can run the following command to get the details:
-        # Aws.key_pairs.get("test")
+        # AWS.key_pairs.get("test")
         #
         # ==== Returns
         #
-        #>> Aws.key_pairs.get("test")
+        #>> AWS.key_pairs.get("test")
         #  <Fog::AWS::Compute::KeyPair
         #    name="test",
         #    fingerprint="1f:26:3d:83:e7:4f:48:74:c3:1c:e6:b3:c7:f6:ec:d8:cb:09:b3:7f",

lib/fog/aws/models/compute/network_acl.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class NetworkAcl < Fog::Model
         ICMP = 1
         TCP  = 6
@@ -155,7 +155,7 @@ module Fog
 
         # Create a network ACL
         #
-        #  >> g = Aws.network_acls.new(:vpc_id => 'vpc-abcdefgh')
+        #  >> g = AWS.network_acls.new(:vpc_id => 'vpc-abcdefgh')
         #  >> g.save
         def save
           requires :vpc_id

lib/fog/aws/models/compute/network_acls.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/network_acl'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class NetworkAcls < Fog::Collection
         attribute :filters
 
@@ -11,7 +11,7 @@ module Fog
 
         # Creates a new network ACL
         #
-        # Aws.network_acls.new
+        # AWS.network_acls.new
         #
         # ==== Returns
         #
@@ -33,13 +33,13 @@ module Fog
 
         # Returns an array of all network ACLs that have been created
         #
-        # Aws.network_acls.all
+        # AWS.network_acls.all
         #
         # ==== Returns
         #
         # Returns an array of all network ACLs
         #
-        #>> Aws.network_acls.all
+        #>> AWS.network_acls.all
         #  <Fog::AWS::Compute::NetworkAcls
         #    filters={}
         #    [
@@ -89,11 +89,11 @@ module Fog
         # network interface id is required to get any information
         #
         # You can run the following command to get the details:
-        # Aws.network_interfaces.get("eni-11223344")
+        # AWS.network_interfaces.get("eni-11223344")
         #
         # ==== Returns
         #
-        #>> Aws.network_acls.get("acl-abcdefgh")
+        #>> AWS.network_acls.get("acl-abcdefgh")
         #  <Fog::Compute::AWS::NetworkAcl
         #    network_acl_id="acl-abcdefgh",
         #    vpc_id="vpc-abcdefgh",

lib/fog/aws/models/compute/network_interface.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class NetworkInterface < Fog::Model
         identity  :network_interface_id,        :aliases => 'networkInterfaceId'
         attribute :state
@@ -44,7 +44,7 @@ module Fog
 
         # Create a network_interface
         #
-        #  >> g = Aws.network_interfaces.new(:subnet_id => "subnet-someId", options)
+        #  >> g = AWS.network_interfaces.new(:subnet_id => "subnet-someId", options)
         #  >> g.save
         #
         # options is an optional hash which may contain 'PrivateIpAddress', 'Description', 'GroupSet'

lib/fog/aws/models/compute/network_interfaces.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/network_interface'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class NetworkInterfaces < Fog::Collection
         attribute :filters
 
@@ -11,13 +11,13 @@ module Fog
 
         # Creates a new network interface
         #
-        # Aws.network_interfaces.new
+        # AWS.network_interfaces.new
         #
         # ==== Returns
         #
         # Returns the details of the new network interface
         #
-        #>> Aws.network_interfaces.new
+        #>> AWS.network_interfaces.new
         #  <Fog::AWS::Compute::NetworkInterface
         #    network_interface_id=nil
         #    state=nil
@@ -49,13 +49,13 @@ module Fog
 
         # Returns an array of all network interfaces that have been created
         #
-        # Aws.network_interfaces.all
+        # AWS.network_interfaces.all
         #
         # ==== Returns
         #
         # Returns an array of all network interfaces
         #
-        #>> Aws.network_interfaves.all
+        #>> AWS.network_interfaves.all
         #  <Fog::AWS::Compute::NetworkInterfaces
         #    filters={}
         #    [
@@ -94,11 +94,11 @@ module Fog
         # network interface id is required to get any information
         #
         # You can run the following command to get the details:
-        # Aws.network_interfaces.get("eni-11223344")
+        # AWS.network_interfaces.get("eni-11223344")
         #
         # ==== Returns
         #
-        #>> Aws.NetworkInterface.get("eni-11223344")
+        #>> AWS.NetworkInterface.get("eni-11223344")
         #  <Fog::AWS::Compute::NetworkInterface
         #    network_interface_id="eni-da5dc7ca",
         #    state=nil,

lib/fog/aws/models/compute/route_table.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class RouteTable < Fog::Model
         identity :id,                :aliases => 'routeTableId'
 

lib/fog/aws/models/compute/route_tables.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/route_table'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class RouteTables < Fog::Collection
         attribute :filters
 
@@ -11,13 +11,13 @@ module Fog
 
         # Creates a new route table
         #
-        # Aws.route_tables.new
+        # AWS.route_tables.new
         #
         # ==== Returns
         #
         # Returns the details of the new route table
         #
-        #>> Aws.route_tables.new
+        #>> AWS.route_tables.new
         # <Fog::Compute::AWS::RouteTable
         # id=nil,
         # vpc_id=nil,
@@ -34,13 +34,13 @@ module Fog
 
         # Returns an array of all route tables that have been created
         #
-        # Aws.route_tables.all
+        # AWS.route_tables.all
         #
         # ==== Returns
         #
         # Returns an array of all route tables
         #
-        #>> Aws.route_tables.all
+        #>> AWS.route_tables.all
         # <Fog::Compute::AWS::RouteTables
         # filters={}
         # [
@@ -66,11 +66,11 @@ module Fog
         # route_table_id is required to get the associated route table information.
         #
         # You can run the following command to get the details:
-        # Aws.route_tables.get("rtb-41e8552f")
+        # AWS.route_tables.get("rtb-41e8552f")
         #
         # ==== Returns
         #
-        #>> Aws.route_tables.get("rtb-41e8552f")
+        #>> AWS.route_tables.get("rtb-41e8552f")
         # <Fog::Compute::AWS::RouteTable
         # id="rtb-41e8552f",
         # TODO

lib/fog/aws/models/compute/security_group.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class SecurityGroup < Fog::Model
         identity  :name,            :aliases => 'groupName'
         attribute :description,     :aliases => 'groupDescription'
@@ -15,7 +15,7 @@ module Fog
 
         # Authorize access by another security group
         #
-        #  >> g = Aws.security_groups.all(:description => "something").first
+        #  >> g = AWS.security_groups.all(:description => "something").first
         #  >> g.authorize_group_and_owner("some_group_name", "1234567890")
         #
         # == Parameters:
@@ -54,7 +54,7 @@ module Fog
 
         # Authorize a new port range for a security group
         #
-        #  >> g = Aws.security_groups.all(:description => "something").first
+        #  >> g = AWS.security_groups.all(:description => "something").first
         #  >> g.authorize_port_range(20..21)
         #
         # == Parameters:
@@ -129,7 +129,7 @@ module Fog
 
         # Revoke access by another security group
         #
-        #  >> g = Aws.security_groups.all(:description => "something").first
+        #  >> g = AWS.security_groups.all(:description => "something").first
         #  >> g.revoke_group_and_owner("some_group_name", "1234567890")
         #
         # == Parameters:
@@ -168,7 +168,7 @@ module Fog
 
         # Revoke an existing port range for a security group
         #
-        #  >> g = Aws.security_groups.all(:description => "something").first
+        #  >> g = AWS.security_groups.all(:description => "something").first
         #  >> g.revoke_port_range(20..21)
         #
         # == Parameters:
@@ -223,7 +223,7 @@ module Fog
 
         # Reload a security group
         #
-        #  >> g = Aws.security_groups.get(:name => "some_name")
+        #  >> g = AWS.security_groups.get(:name => "some_name")
         #  >> g.reload
         #
         #  == Returns:
@@ -253,7 +253,7 @@ module Fog
 
         # Create a security group
         #
-        #  >> g = Aws.security_groups.new(:name => "some_name", :description => "something")
+        #  >> g = AWS.security_groups.new(:name => "some_name", :description => "something")
         #  >> g.save
         #
         # == Returns:

lib/fog/aws/models/compute/security_groups.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/security_group'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class SecurityGroups < Fog::Collection
         attribute :filters
 
@@ -11,13 +11,13 @@ module Fog
 
         # Creates a new security group
         #
-        # Aws.security_groups.new
+        # AWS.security_groups.new
         #
         # ==== Returns
         #
         # Returns the details of the new image
         #
-        #>> Aws.security_groups.new
+        #>> AWS.security_groups.new
         #  <Fog::AWS::Compute::SecurityGroup
         #    name=nil,
         #    description=nil,
@@ -34,13 +34,13 @@ module Fog
 
         # Returns an array of all security groups that have been created
         #
-        # Aws.security_groups.all
+        # AWS.security_groups.all
         #
         # ==== Returns
         #
         # Returns an array of all security groups
         #
-        #>> Aws.security_groups.all
+        #>> AWS.security_groups.all
         #  <Fog::AWS::Compute::SecurityGroups
         #    filters={}
         #    [
@@ -69,11 +69,11 @@ module Fog
         # group name is required to get the associated flavor information.
         #
         # You can run the following command to get the details:
-        # Aws.security_groups.get("default")
+        # AWS.security_groups.get("default")
         #
         # ==== Returns
         #
-        #>> Aws.security_groups.get("default")
+        #>> AWS.security_groups.get("default")
         #  <Fog::AWS::Compute::SecurityGroup
         #    name="default",
         #    description="default group",
@@ -93,11 +93,11 @@ module Fog
         # group id is required to get the associated flavor information.
         #
         # You can run the following command to get the details:
-        # Aws.security_groups.get_by_id("default")
+        # AWS.security_groups.get_by_id("default")
         #
         # ==== Returns
         #
-        #>> Aws.security_groups.get_by_id("sg-123456")
+        #>> AWS.security_groups.get_by_id("sg-123456")
         #  <Fog::AWS::Compute::SecurityGroup
         #    name="default",
         #    description="default group",

lib/fog/aws/models/compute/server.rb

@@ -2,7 +2,7 @@ require 'fog/compute/models/server'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class Server < Fog::Compute::Server
         extend Fog::Deprecation
         deprecate :ip_address, :public_ip_address

lib/fog/aws/models/compute/servers.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/server'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class Servers < Fog::Collection
         attribute :filters
 
@@ -11,13 +11,13 @@ module Fog
 
         # Creates a new server
         #
-        # Aws.servers.new
+        # AWS.servers.new
         #
         # ==== Returns
         #
         # Returns the details of the new server
         #
-        #>> Aws.servers.new
+        #>> AWS.servers.new
         #  <Fog::AWS::Compute::Server
         #    id=nil,
         #    ami_launch_index=nil,
@@ -75,7 +75,7 @@ module Fog
         #
         #    1.upto(n).map { create(new_attributes) }
         #
-        # See the Aws RunInstances API.
+        # See the AWS RunInstances API.
         def create_many(min_servers = 1, max_servers = nil, new_attributes = {})
           max_servers ||= min_servers
           template = new(new_attributes)
@@ -83,12 +83,12 @@ module Fog
         end
 
         # Bootstrap between m and n servers with the server options specified in
-        # new_attributes.  Equivalent to this loop, but happens in 1 Aws request
+        # new_attributes.  Equivalent to this loop, but happens in 1 AWS request
         # and the machines' spinup will happen in parallel:
         #
         #   1.upto(n).map { bootstrap(new_attributes) }
         #
-        # See the Aws RunInstances API.
+        # See the AWS RunInstances API.
         def bootstrap_many(min_servers = 1, max_servers = nil, new_attributes = {})
           template = service.servers.new(new_attributes)
           _setup_bootstrap(template)
@@ -110,11 +110,11 @@ module Fog
         # server_id is required to get the associated server information.
         #
         # You can run the following command to get the details:
-        # Aws.servers.get("i-5c973972")
+        # AWS.servers.get("i-5c973972")
         #
         # ==== Returns
         #
-        #>> Aws.servers.get("i-5c973972")
+        #>> AWS.servers.get("i-5c973972")
         #  <Fog::AWS::Compute::Server
         #    id="i-5c973972",
         #    ami_launch_index=0,
@@ -153,11 +153,11 @@ module Fog
           nil
         end
 
-        # From a template, create between m-n servers (see the Aws RunInstances API)
+        # From a template, create between m-n servers (see the AWS RunInstances API)
         def save_many(template, min_servers = 1, max_servers = nil)
           max_servers ||= min_servers
           data = service.run_instances(template.image_id, min_servers, max_servers, template.run_instance_options)
-          # For some reason, Aws sometimes returns empty results alongside the real ones.  Thus the select
+          # For some reason, AWS sometimes returns empty results alongside the real ones.  Thus the select
           data.body['instancesSet'].select { |instance_set| instance_set['instanceId'] }.map do |instance_set|
             server = template.dup
             server.merge_attributes(instance_set)

lib/fog/aws/models/compute/snapshot.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class Snapshot < Fog::Model
         identity  :id,          :aliases => 'snapshotId'
 

lib/fog/aws/models/compute/snapshots.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/snapshot'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class Snapshots < Fog::Collection
         attribute :filters
         attribute :volume

lib/fog/aws/models/compute/spot_request.rb

@@ -2,7 +2,7 @@ require 'fog/compute/models/server'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class SpotRequest < Fog::Compute::Server
         identity :id,                          :aliases => 'spotInstanceRequestId'
 

lib/fog/aws/models/compute/spot_requests.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/spot_request'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class SpotRequests < Fog::Collection
         attribute :filters
 

lib/fog/aws/models/compute/subnet.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class Subnet < Fog::Model
         identity  :subnet_id,                   :aliases => 'subnetId'
         attribute :state
@@ -36,7 +36,7 @@ module Fog
 
         # Create a subnet
         #
-        #  >> g = Aws.subnets.new(:vpc_id => "vpc-someId", :cidr_block => "10.0.0.0/24")
+        #  >> g = AWS.subnets.new(:vpc_id => "vpc-someId", :cidr_block => "10.0.0.0/24")
         #  >> g.save
         #
         # == Returns:

lib/fog/aws/models/compute/subnets.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/subnet'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class Subnets < Fog::Collection
         attribute :filters
 
@@ -11,13 +11,13 @@ module Fog
 
         # Creates a new subnet
         #
-        # Aws.subnets.new
+        # AWS.subnets.new
         #
         # ==== Returns
         #
         # Returns the details of the new Subnet
         #
-        #>> Aws.subnets.new
+        #>> AWS.subnets.new
         # <Fog::AWS::Compute::Subnet
         # subnet_id=subnet-someId,
         # state=[pending|available],
@@ -35,13 +35,13 @@ module Fog
 
         # Returns an array of all Subnets that have been created
         #
-        # Aws.subnets.all
+        # AWS.subnets.all
         #
         # ==== Returns
         #
         # Returns an array of all VPCs
         #
-        #>> Aws.subnets.all
+        #>> AWS.subnets.all
         # <Fog::AWS::Compute::Subnet
         # filters={}
         # [
@@ -69,11 +69,11 @@ module Fog
         # subnet-id is required to get the associated VPC information.
         #
         # You can run the following command to get the details:
-        # Aws.subnets.get("subnet-12345678")
+        # AWS.subnets.get("subnet-12345678")
         #
         # ==== Returns
         #
-        #>> Aws.subnets.get("subnet-12345678")
+        #>> AWS.subnets.get("subnet-12345678")
         # <Fog::AWS::Compute::Subnet
         # subnet_id=subnet-someId,
         # state=[pending|available],

lib/fog/aws/models/compute/tag.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class Tag < Fog::Model
         identity  :key
 

lib/fog/aws/models/compute/tags.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/tag'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class Tags < Fog::Collection
         attribute :filters
 

lib/fog/aws/models/compute/volume.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class Volume < Fog::Model
         identity  :id,                    :aliases => 'volumeId'
 

lib/fog/aws/models/compute/volumes.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/volume'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class Volumes < Fog::Collection
         attribute :filters
         attribute :server
@@ -11,7 +11,7 @@ module Fog
         model Fog::Compute::AWS::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)
+        # AWS.volumes.create(:availability_zone => 'us-east-1a', :size => 10)
         #
         # ==== Returns
         #
@@ -29,7 +29,7 @@ module Fog
         #  tags=nil
         #>
         #
-        # The volume can be retrieved by running Aws.volumes.get("vol-1e2028b9").  See get method below.
+        # The volume can be retrieved by running AWS.volumes.get("vol-1e2028b9").  See get method below.
         #
 
         def initialize(attributes)
@@ -38,11 +38,11 @@ module Fog
         end
 
         # Used to return all volumes.
-        # Aws.volumes.all
+        # AWS.volumes.all
         #
         # ==== Returns
         #
-        #>>Aws.volumes.all
+        #>>AWS.volumes.all
         #<Fog::AWS::Compute::Volume
         #  id="vol-1e2028b9",
         #  attached_at=nil,
@@ -57,7 +57,7 @@ module Fog
         #  tags=nil
         #>
         #
-        # The volume can be retrieved by running Aws.volumes.get("vol-1e2028b9").  See get method below.
+        # The volume can be retrieved by running AWS.volumes.get("vol-1e2028b9").  See get method below.
         #
 
         def all(filters_arg = filters)
@@ -78,11 +78,11 @@ module Fog
         # volume_id is required to get the associated volume information.
         #
         # You can run the following command to get the details:
-        # Aws.volumes.get("vol-1e2028b9")
+        # AWS.volumes.get("vol-1e2028b9")
         #
         # ==== Returns
         #
-        #>> Aws.volumes.get("vol-1e2028b9")
+        #>> AWS.volumes.get("vol-1e2028b9")
         # <Fog::AWS::Compute::Volume
         #    id="vol-1e2028b9",
         #    attached_at=nil,

lib/fog/aws/models/compute/vpc.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class VPC < Fog::Model
         identity :id,                :aliases => 'vpcId'
 
@@ -41,7 +41,7 @@ module Fog
 
         # Create a vpc
         #
-        # >> g = Aws.vpcs.new(:cidr_block => "10.1.2.0/24")
+        # >> g = AWS.vpcs.new(:cidr_block => "10.1.2.0/24")
         # >> g.save
         #
         # == Returns:

lib/fog/aws/models/compute/vpcs.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/compute/vpc'
 
 module Fog
   module Compute
-    class Aws
+    class AWS
       class Vpcs < Fog::Collection
         attribute :filters
 
@@ -11,13 +11,13 @@ module Fog
 
         # Creates a new VPC
         #
-        # Aws.vpcs.new
+        # AWS.vpcs.new
         #
         # ==== Returns
         #
         # Returns the details of the new VPC
         #
-        #>> Aws.vpcs.new
+        #>> AWS.vpcs.new
         # <Fog::AWS::VPC::VPC
         # id=nil,
         # state=nil,
@@ -35,13 +35,13 @@ module Fog
 
         # Returns an array of all VPCs that have been created
         #
-        # Aws.vpcs.all
+        # AWS.vpcs.all
         #
         # ==== Returns
         #
         # Returns an array of all VPCs
         #
-        #>> Aws.vpcs.all
+        #>> AWS.vpcs.all
         # <Fog::AWS::VPC::VPCs
         # filters={}
         # [
@@ -67,11 +67,11 @@ module Fog
         # vpc_id is required to get the associated VPC information.
         #
         # You can run the following command to get the details:
-        # Aws.vpcs.get("vpc-12345678")
+        # AWS.vpcs.get("vpc-12345678")
         #
         # ==== Returns
         #
-        #>> Aws.vpcs.get("vpc-12345678")
+        #>> AWS.vpcs.get("vpc-12345678")
         # <Fog::AWS::Compute::VPC
         # id="vpc-12345678",
         # TODO

lib/fog/aws/models/dns/record.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module DNS
-    class Aws
+    class AWS
       class Record < Fog::Model
         extend Fog::Deprecation
         deprecate :ip, :value

lib/fog/aws/models/dns/records.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/dns/record'
 
 module Fog
   module DNS
-    class Aws
+    class AWS
       class Records < Fog::Collection
         attribute :is_truncated,            :aliases => ['IsTruncated']
         attribute :max_items,               :aliases => ['MaxItems']
@@ -66,7 +66,7 @@ module Fog
         end
 
         #
-        # Aws Route 53 records are uniquely identified by a compound key of name, type, and identifier.
+        # AWS Route 53 records are uniquely identified by a compound key of name, type, and identifier.
         # #get allows one to retrieve a record using one or more of those key components.
         #
         # ==== Parameters

lib/fog/aws/models/dns/zone.rb

@@ -3,7 +3,7 @@ require 'fog/core/model'
 
 module Fog
   module DNS
-    class Aws
+    class AWS
       class Zone < Fog::Model
         identity :id,                 :aliases => 'Id'
 

lib/fog/aws/models/dns/zones.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/dns/zone'
 
 module Fog
   module DNS
-    class Aws
+    class AWS
       class Zones < Fog::Collection
         attribute :marker,    :aliases => 'Marker'
         attribute :max_items, :aliases => 'MaxItems'

lib/fog/aws/models/iam/access_keys.rb

@@ -14,7 +14,7 @@ module Fog
 
         def all
           data = service.list_access_keys('UserName'=> @username).body['AccessKeys']
-          # Aws response doesn't contain the UserName, this injects it
+          # AWS response doesn't contain the UserName, this injects it
           data.each {|access_key| access_key['UserName'] = @username }
           load(data)
         end

lib/fog/aws/models/iam/policies.rb

@@ -14,7 +14,7 @@ module Fog
         end
 
         def all
-          # Aws method get_user_policy only returns an array of policy names, this is kind of useless,
+          # AWS method get_user_policy only returns an array of policy names, this is kind of useless,
           # that's why it has to loop through the list to get the details of each element. I don't like it because it makes this method slow
           policy_names = service.list_user_policies(@username).body['PolicyNames'] # it returns an array
           policies = []

lib/fog/aws/models/storage/directories.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/storage/directory'
 
 module Fog
   module Storage
-    class Aws
+    class AWS
       class Directories < Fog::Collection
         model Fog::Storage::AWS::Directory
 

lib/fog/aws/models/storage/directory.rb

@@ -4,7 +4,7 @@ require 'fog/aws/models/storage/versions'
 
 module Fog
   module Storage
-    class Aws
+    class AWS
       class Directory < Fog::Model
         VALID_ACLS = ['private', 'public-read', 'public-read-write', 'authenticated-read']
 

lib/fog/aws/models/storage/file.rb

@@ -3,9 +3,9 @@ require 'fog/aws/models/storage/versions'
 
 module Fog
   module Storage
-    class Aws
+    class AWS
       class File < Fog::Model
-        # @see Aws Object docs http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectOps.html
+        # @see AWS Object docs http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectOps.html
 
         identity  :key,             :aliases => 'Key'
 
@@ -180,7 +180,7 @@ module Fog
         # @option options [String] content_encoding sets Content-Encoding HTTP header. For example, 'x-gzip'
         # @option options [String] content_md5 sets Content-MD5. For example, '79054025255fb1a26e4bc422aef54eb4'
         # @option options [String] content_type Content-Type. For example, 'text/plain'
-        # @option options [String] expires sets number of seconds before Aws Object expires.
+        # @option options [String] expires sets number of seconds before AWS Object expires.
         # @option options [String] storage_class sets x-amz-storage-class HTTP header. Defaults to 'STANDARD'. Or, 'REDUCED_REDUNDANCY'
         # @option options [String] encryption sets HTTP encryption header. Set to 'AES256' to encrypt files at rest on S3
         # @return [Boolean] true if no errors

lib/fog/aws/models/storage/files.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/storage/file'
 
 module Fog
   module Storage
-    class Aws
+    class AWS
       class Files < Fog::Collection
         extend Fog::Deprecation
         deprecate :get_url, :get_https_url

lib/fog/aws/models/storage/version.rb

@@ -2,7 +2,7 @@ require 'fog/core/model'
 
 module Fog
   module Storage
-    class Aws
+    class AWS
       class Version < Fog::Model
         identity  :version,             :aliases => 'VersionId'
 

lib/fog/aws/models/storage/versions.rb

@@ -3,7 +3,7 @@ require 'fog/aws/models/storage/version'
 
 module Fog
   module Storage
-    class Aws
+    class AWS
       class Versions < Fog::Collection
         attribute :file
         attribute :directory

lib/fog/aws/parsers/elb/tag_list_parser.rb

@@ -2,7 +2,7 @@ module Fog
   module Parsers
     module AWS
       module ELB
-        # parses an XML-formatted list of resource tags from Aws
+        # parses an XML-formatted list of resource tags from AWS
         class TagListParser < Fog::Parsers::Base
 
           # each tag is modeled as a String pair (2-element Array)

lib/fog/aws/parsers/rds/tag_list_parser.rb

@@ -2,7 +2,7 @@ module Fog
   module Parsers
     module AWS
       module RDS
-        # parses an XML-formatted list of resource tags from Aws
+        # parses an XML-formatted list of resource tags from AWS
         class TagListParser < Fog::Parsers::Base
           # each tag is modeled as a String pair (2-element Array)
           def reset

lib/fog/aws/rds.rb

@@ -165,7 +165,7 @@ module Fog
         #   * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1' and etc.
         #
         # ==== Returns
-        # * ELB object with connection to Aws.
+        # * ELB object with connection to AWS.
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
           @instrumentor       = options[:instrumentor]

lib/fog/aws/redshift.rb

@@ -71,7 +71,7 @@ module Fog
         #   * region<~String> - optional region to use. For instance, 'us-east-1' and etc.
         #
         # ==== Returns
-        # * Redshift object with connection to Aws.
+        # * Redshift object with connection to AWS.
 
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]

lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb

@@ -65,10 +65,10 @@ module Fog
         ExpectedOptions[:create_auto_scaling_group] = %w[DefaultCooldown DesiredCapacity HealthCheckGracePeriod HealthCheckType LoadBalancerNames PlacementGroup Tags TerminationPolicies VPCZoneIdentifier]
 
         def create_auto_scaling_group(auto_scaling_group_name, availability_zones, launch_configuration_name, max_size, min_size, options = {})
-          options.merge!(Aws.indexed_param('AvailabilityZones.member.%d', [*availability_zones]))
+          options.merge!(AWS.indexed_param('AvailabilityZones.member.%d', [*availability_zones]))
           options.delete('AvailabilityZones')
           if load_balancer_names = options.delete('LoadBalancerNames')
-            options.merge!(Aws.indexed_param('LoadBalancerNames.member.%d', [*load_balancer_names]))
+            options.merge!(AWS.indexed_param('LoadBalancerNames.member.%d', [*load_balancer_names]))
           end
 
           if tags = options.delete('Tags')
@@ -78,7 +78,7 @@ module Fog
             end
           end
           if termination_policies = options.delete('TerminationPolicies')
-            options.merge!(Aws.indexed_param('TerminationPolicies.member.%d', [*termination_policies]))
+            options.merge!(AWS.indexed_param('TerminationPolicies.member.%d', [*termination_policies]))
           end
 
           request({

lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb

@@ -62,7 +62,7 @@ module Fog
             end
           end
           if security_groups = options.delete('SecurityGroups')
-             options.merge!(Aws.indexed_param('SecurityGroups.member.%d', [*security_groups]))
+             options.merge!(AWS.indexed_param('SecurityGroups.member.%d', [*security_groups]))
           end
           if options['UserData']
             options['UserData'] = Base64.encode64(options['UserData'])

lib/fog/aws/requests/auto_scaling/describe_auto_scaling_groups.rb

@@ -95,7 +95,7 @@ module Fog
         #
         def describe_auto_scaling_groups(options = {})
           if auto_scaling_group_names = options.delete('AutoScalingGroupNames')
-            options.merge!(Aws.indexed_param('AutoScalingGroupNames.member.%d', [*auto_scaling_group_names]))
+            options.merge!(AWS.indexed_param('AutoScalingGroupNames.member.%d', [*auto_scaling_group_names]))
           end
           request({
             'Action' => 'DescribeAutoScalingGroups',

lib/fog/aws/requests/auto_scaling/describe_auto_scaling_instances.rb

@@ -56,7 +56,7 @@ module Fog
         #
         def describe_auto_scaling_instances(options = {})
           if instance_ids = options.delete('InstanceIds')
-            options.merge!(Aws.indexed_param('InstanceIds.member.%d', [*instance_ids]))
+            options.merge!(AWS.indexed_param('InstanceIds.member.%d', [*instance_ids]))
           end
           request({
             'Action' => 'DescribeAutoScalingInstances',

lib/fog/aws/requests/auto_scaling/describe_launch_configurations.rb

@@ -72,7 +72,7 @@ module Fog
         #
         def describe_launch_configurations(options = {})
           if launch_configuration_names = options.delete('LaunchConfigurationNames')
-            options.merge!(Aws.indexed_param('LaunchConfigurationNames.member.%d', [*launch_configuration_names]))
+            options.merge!(AWS.indexed_param('LaunchConfigurationNames.member.%d', [*launch_configuration_names]))
           end
           request({
             'Action' => 'DescribeLaunchConfigurations',

lib/fog/aws/requests/auto_scaling/describe_notification_configurations.rb

@@ -35,7 +35,7 @@ module Fog
         #
         def describe_notification_configurations(options = {})
           if auto_scaling_group_names = options.delete('AutoScalingGroupNames')
-            options.merge!(Aws.indexed_param('AutoScalingGroupNames.member.%d', [*auto_scaling_group_names]))
+            options.merge!(AWS.indexed_param('AutoScalingGroupNames.member.%d', [*auto_scaling_group_names]))
           end
           request({
             'Action' => 'DescribeNotificationConfigurations',

lib/fog/aws/requests/auto_scaling/describe_policies.rb

@@ -60,7 +60,7 @@ module Fog
         #
         def describe_policies(options = {})
           if policy_names = options.delete('PolicyNames')
-            options.merge!(Aws.indexed_param('PolicyNames.member.%d', [*policy_names]))
+            options.merge!(AWS.indexed_param('PolicyNames.member.%d', [*policy_names]))
           end
           request({
             'Action' => 'DescribePolicies',

lib/fog/aws/requests/auto_scaling/describe_scaling_activities.rb

@@ -63,7 +63,7 @@ module Fog
         #
         def describe_scaling_activities(options = {})
           if activity_ids = options.delete('ActivityIds')
-            options.merge!(Aws.indexed_param('ActivityIds.member.%d', [*activity_ids]))
+            options.merge!(AWS.indexed_param('ActivityIds.member.%d', [*activity_ids]))
           end
           request({
             'Action' => 'DescribeScalingActivities',

lib/fog/aws/requests/auto_scaling/describe_scheduled_actions.rb

@@ -63,7 +63,7 @@ module Fog
         #
         def describe_scheduled_actions(options = {})
           if scheduled_action_names = options.delete('ScheduledActionNames')
-            options.merge!(Aws.indexed_param('ScheduledActionNames.member.%d', [*scheduled_action_names]))
+            options.merge!(AWS.indexed_param('ScheduledActionNames.member.%d', [*scheduled_action_names]))
           end
           request({
             'Action' => 'DescribeScheduledActions',

lib/fog/aws/requests/auto_scaling/disable_metrics_collection.rb

@@ -26,7 +26,7 @@ module Fog
         #
         def disable_metrics_collection(auto_scaling_group_name, options = {})
           if metrics = options.delete('Metrics')
-            options.merge!(Aws.indexed_param('Metrics.member.%d', [*metrics]))
+            options.merge!(AWS.indexed_param('Metrics.member.%d', [*metrics]))
           end
           request({
             'Action'               => 'DisableMetricsCollection',

lib/fog/aws/requests/auto_scaling/enable_metrics_collection.rb

@@ -32,7 +32,7 @@ module Fog
         #
         def enable_metrics_collection(auto_scaling_group_name, granularity, options = {})
           if metrics = options.delete('Metrics')
-            options.merge!(Aws.indexed_param('Metrics.member.%d', [*metrics]))
+            options.merge!(AWS.indexed_param('Metrics.member.%d', [*metrics]))
           end
           request({
             'Action'               => 'EnableMetricsCollection',

lib/fog/aws/requests/auto_scaling/put_notification_configuration.rb

@@ -25,7 +25,7 @@ module Fog
         # http://docs.amazonwebservices.com/AutoScaling/latest/APIReference/API_PutNotificationConfiguration.html
         #
         def put_notification_configuration(auto_scaling_group_name, notification_types, topic_arn)
-          params = Aws.indexed_param('NotificationTypes.member.%d', [*notification_types])
+          params = AWS.indexed_param('NotificationTypes.member.%d', [*notification_types])
           request({
             'Action'               => 'PutNotificationConfiguration',
             'AutoScalingGroupName' => auto_scaling_group_name,

lib/fog/aws/requests/auto_scaling/resume_processes.rb

@@ -24,7 +24,7 @@ module Fog
         #
         def resume_processes(auto_scaling_group_name, options = {})
           if scaling_processes = options.delete('ScalingProcesses')
-            options.merge!(Aws.indexed_param('ScalingProcesses.member.%d', [*scaling_processes]))
+            options.merge!(AWS.indexed_param('ScalingProcesses.member.%d', [*scaling_processes]))
           end
           request({
             'Action'               => 'ResumeProcesses',

lib/fog/aws/requests/auto_scaling/suspend_processes.rb

@@ -27,7 +27,7 @@ module Fog
         #
         def suspend_processes(auto_scaling_group_name, options = {})
           if scaling_processes = options.delete('ScalingProcesses')
-            options.merge!(Aws.indexed_param('ScalingProcesses.member.%d', [*scaling_processes]))
+            options.merge!(AWS.indexed_param('ScalingProcesses.member.%d', [*scaling_processes]))
           end
           request({
             'Action'               => 'SuspendProcesses',

lib/fog/aws/requests/auto_scaling/update_auto_scaling_group.rb

@@ -55,10 +55,10 @@ module Fog
 
         def update_auto_scaling_group(auto_scaling_group_name, options = {})
           if availability_zones = options.delete('AvailabilityZones')
-            options.merge!(Aws.indexed_param('AvailabilityZones.member.%d', [*availability_zones]))
+            options.merge!(AWS.indexed_param('AvailabilityZones.member.%d', [*availability_zones]))
           end
           if termination_policies = options.delete('TerminationPolicies')
-            options.merge!(Aws.indexed_param('TerminationPolicies.member.%d', [*termination_policies]))
+            options.merge!(AWS.indexed_param('TerminationPolicies.member.%d', [*termination_policies]))
           end
           request({
             'Action'               => 'UpdateAutoScalingGroup',

lib/fog/aws/requests/beanstalk/create_configuration_template.rb

@@ -9,16 +9,16 @@ module Fog
         #
         # ==== Options
         # * ApplicationName<~String>: The name of the application to associate with this configuration template.
-        #   If no application is found with this name, Aws Elastic Beanstalk returns an InvalidParameterValue error.
+        #   If no application is found with this name, AWS Elastic Beanstalk returns an InvalidParameterValue error.
         # * Description<~String>: Describes this configuration.
         # * EnvironmentId<~String>: The ID of the environment used with this configuration template.
-        # * OptionSettings<~Hash>: If specified, Aws Elastic Beanstalk sets the specified configuration option
+        # * OptionSettings<~Hash>: If specified, AWS Elastic Beanstalk sets the specified configuration option
         #     to the requested value. The new value overrides the value obtained from the solution stack or the
         #     source configuration template.
         # * SolutionStackName<~String>: The name of the solution stack used by this configuration. The solution
         #     stack specifies the operating system, architecture, and application server for a configuration template.
         #     It determines the set of configuration options as well as the possible and default values.
-        # * SourceConfiguration<~String>: If specified, Aws Elastic Beanstalk uses the configuration values from the
+        # * SourceConfiguration<~String>: If specified, AWS Elastic Beanstalk uses the configuration values from the
         #     specified configuration template to create a new configuration.
         # * TemplateName<~String>: The name of the configuration template.
         #
@@ -30,10 +30,10 @@ module Fog
         #
         def create_configuration_template(options={})
           if option_settings = options.delete('OptionSettings')
-            options.merge!(Aws.indexed_param('OptionSettings.member.%d', [*option_settings]))
+            options.merge!(AWS.indexed_param('OptionSettings.member.%d', [*option_settings]))
           end
           if option_settings = options.delete('SourceConfiguration')
-            options.merge!(Aws.serialize_keys('SourceConfiguration', option_settings))
+            options.merge!(AWS.serialize_keys('SourceConfiguration', option_settings))
           end
           request({
                       'Operation'    => 'CreateConfigurationTemplate',

lib/fog/aws/requests/beanstalk/create_environment.rb

@@ -7,22 +7,22 @@ module Fog
         # Launches an environment for the specified application using the specified configuration.
         #
         # ==== Options
-        # * ApplicationName<~String>: If specified, Aws Elastic Beanstalk restricts the returned descriptions
+        # * ApplicationName<~String>: If specified, AWS Elastic Beanstalk restricts the returned descriptions
         #     to include only those that are associated with this application.
         # * CNAMEPrefix<~String>: If specified, the environment attempts to use this value as the prefix for the CNAME.
         #     If not specified, the environment uses the environment name.
         # * Description<~String>: Describes this environment.
         # * EnvironmentName<~String>: A unique name for the deployment environment. Used in the application URL.
-        # * OptionSettings<~Array>: If specified, Aws Elastic Beanstalk sets the specified configuration options to
+        # * OptionSettings<~Array>: If specified, AWS Elastic Beanstalk sets the specified configuration options to
         #     the requested value in the configuration set for the new environment. These override the values obtained
         #     from the solution stack or the configuration template.
         # * OptionsToRemove<~Array>: A list of custom user-defined configuration options to remove from the
         #     configuration set for this new environment.
         # * SolutionStackName<~String>: This is an alternative to specifying a configuration name. If specified,
-        #     Aws Elastic Beanstalk sets the configuration values to the default values associated with the
+        #     AWS Elastic Beanstalk sets the configuration values to the default values associated with the
         #     specified solution stack.
         # * TemplateName<~String>: The name of the configuration template to use in deployment. If no configuration
-        #     template is found with this name, Aws Elastic Beanstalk returns an InvalidParameterValue error.
+        #     template is found with this name, AWS Elastic Beanstalk returns an InvalidParameterValue error.
         # * VersionLabel<~String>: The name of the application version to deploy.
         #
         # ==== Returns
@@ -33,10 +33,10 @@ module Fog
         #
         def create_environment(options={})
           if option_settings = options.delete('OptionSettings')
-            options.merge!(Aws.indexed_param('OptionSettings.member.%d', [*option_settings]))
+            options.merge!(AWS.indexed_param('OptionSettings.member.%d', [*option_settings]))
           end
           if options_to_remove = options.delete('OptionsToRemove')
-            options.merge!(Aws.indexed_param('OptionsToRemove.member.%d', [*options_to_remove]))
+            options.merge!(AWS.indexed_param('OptionsToRemove.member.%d', [*options_to_remove]))
           end
           request({
                       'Operation'    => 'CreateEnvironment',

lib/fog/aws/requests/beanstalk/describe_application_versions.rb

@@ -7,7 +7,7 @@ module Fog
         # Returns descriptions for existing application versions.
         #
         # ==== Options
-        # * ApplicationName<~String>: If specified, Aws Elastic Beanstalk restricts the returned descriptions to
+        # * ApplicationName<~String>: If specified, AWS Elastic Beanstalk restricts the returned descriptions to
         #     only include ones that are associated with the specified application.
         # * VersionLabels<~Array>: If specified, restricts the returned descriptions to only include ones that have
         #     the specified version labels.
@@ -20,7 +20,7 @@ module Fog
         #
         def describe_application_versions(options={})
           if version_labels = options.delete('VersionLabels')
-            options.merge!(Aws.indexed_param('VersionLabels.member.%d', [*version_labels]))
+            options.merge!(AWS.indexed_param('VersionLabels.member.%d', [*version_labels]))
           end
           request({
                       'Operation'    => 'DescribeApplicationVersions',

lib/fog/aws/requests/beanstalk/describe_applications.rb

@@ -7,7 +7,7 @@ module Fog
         # Returns the descriptions of existing applications.
         #
         # ==== Options
-        # * application_names<~Array>: If specified, Aws Elastic Beanstalk restricts the returned descriptions
+        # * application_names<~Array>: If specified, AWS Elastic Beanstalk restricts the returned descriptions
         #                               to only include those with the specified names.
         # ==== Returns
         # * response<~Excon::Response>:
@@ -17,7 +17,7 @@ module Fog
         #
         def describe_applications(application_names=[])
           options = {}
-          options.merge!(Aws.indexed_param('ApplicationNames.member.%d', [*application_names]))
+          options.merge!(AWS.indexed_param('ApplicationNames.member.%d', [*application_names]))
           request({
                       'Operation'    => 'DescribeApplications',
                       :parser     => Fog::Parsers::AWS::ElasticBeanstalk::DescribeApplications.new

lib/fog/aws/requests/beanstalk/describe_configuration_options.rb

@@ -26,7 +26,7 @@ module Fog
         #
         def describe_configuration_options(options={})
           if option_filters = options.delete('Options')
-            options.merge!(Aws.indexed_param('Options.member.%d', [*option_filters]))
+            options.merge!(AWS.indexed_param('Options.member.%d', [*option_filters]))
           end
           request({
                       'Operation'    => 'DescribeConfigurationOptions',

lib/fog/aws/requests/beanstalk/describe_environment_resources.rb

@@ -4,7 +4,7 @@ module Fog
       class Real
         require 'fog/aws/parsers/beanstalk/describe_environment_resources'
 
-        # Returns Aws resources for this environment.
+        # Returns AWS resources for this environment.
         #
         # ==== Options
         # * EnvironmentId

lib/fog/aws/requests/beanstalk/describe_environments.rb

@@ -7,7 +7,7 @@ module Fog
         # Returns descriptions for existing environments.
         #
         # ==== Options
-        # * ApplicationName<~String>: If specified, Aws Elastic Beanstalk restricts the returned descriptions
+        # * ApplicationName<~String>: If specified, AWS Elastic Beanstalk restricts the returned descriptions
         #   to include only those that are associated with this application.
         # * EnvironmentIds
         # * EnvironmentNames
@@ -23,10 +23,10 @@ module Fog
         #
         def describe_environments(options={})
           if environment_ids = options.delete('EnvironmentIds')
-            options.merge!(Aws.indexed_param('EnvironmentIds.member.%d', [*environment_ids]))
+            options.merge!(AWS.indexed_param('EnvironmentIds.member.%d', [*environment_ids]))
           end
           if environment_names = options.delete('EnvironmentNames')
-            options.merge!(Aws.indexed_param('EnvironmentNames.member.%d', [*environment_names]))
+            options.merge!(AWS.indexed_param('EnvironmentNames.member.%d', [*environment_names]))
           end
           request({
                       'Operation'    => 'DescribeEnvironments',