diff --git a/lib/fog/aws/requests/ec2/allocate_address.rb b/lib/fog/aws/requests/ec2/allocate_address.rb
index e88865975..fe80c0551 100644
--- a/lib/fog/aws/requests/ec2/allocate_address.rb
+++ b/lib/fog/aws/requests/ec2/allocate_address.rb
@@ -7,7 +7,7 @@ unless Fog.mocking?
         # Acquire an elastic IP address.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'publicIp'<~String> - The acquired address
         #     * 'requestId'<~String> - Id of the request
diff --git a/lib/fog/aws/requests/ec2/associate_address.rb b/lib/fog/aws/requests/ec2/associate_address.rb
index 1ae11453f..5a713b440 100644
--- a/lib/fog/aws/requests/ec2/associate_address.rb
+++ b/lib/fog/aws/requests/ec2/associate_address.rb
@@ -11,7 +11,7 @@ unless Fog.mocking?
         # * public_ip<~String> - Public ip to assign to instance
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
diff --git a/lib/fog/aws/requests/ec2/attach_volume.rb b/lib/fog/aws/requests/ec2/attach_volume.rb
index 90a1ae081..db4d5077f 100644
--- a/lib/fog/aws/requests/ec2/attach_volume.rb
+++ b/lib/fog/aws/requests/ec2/attach_volume.rb
@@ -12,7 +12,7 @@ unless Fog.mocking?
         # * device<~String> - Specifies how the device is exposed to the instance (e.g. "/dev/sdh")
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'attachTime'<~Time> - Time of attachment was initiated at
         #     * 'device'<~String> - Device as it is exposed to the instance
diff --git a/lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb b/lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb
index 471d3b8db..248b68064 100644
--- a/lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb
+++ b/lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb
@@ -19,7 +19,7 @@ unless Fog.mocking?
         #   * 'ToPort' - End of port range (or -1 for ICMP wildcard)
         #
         # === Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
diff --git a/lib/fog/aws/requests/ec2/create_key_pair.rb b/lib/fog/aws/requests/ec2/create_key_pair.rb
index 97202d42f..adf478b44 100644
--- a/lib/fog/aws/requests/ec2/create_key_pair.rb
+++ b/lib/fog/aws/requests/ec2/create_key_pair.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * key_name<~String> - Unique name for key pair.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'keyFingerprint'<~String> - SHA-1 digest of DER encoded private key
         #     * 'keyMaterial'<~String> - Unencrypted encoded PEM private key
diff --git a/lib/fog/aws/requests/ec2/create_security_group.rb b/lib/fog/aws/requests/ec2/create_security_group.rb
index b7e82ab1d..ca2417d9d 100644
--- a/lib/fog/aws/requests/ec2/create_security_group.rb
+++ b/lib/fog/aws/requests/ec2/create_security_group.rb
@@ -11,7 +11,7 @@ unless Fog.mocking?
         # * group_description<~String> - Description of group.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
diff --git a/lib/fog/aws/requests/ec2/create_snapshot.rb b/lib/fog/aws/requests/ec2/create_snapshot.rb
index ca38c31ed..8d55f4c8b 100644
--- a/lib/fog/aws/requests/ec2/create_snapshot.rb
+++ b/lib/fog/aws/requests/ec2/create_snapshot.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * volume_id<~String> - Id of EBS volume to snapshot
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'progress'<~String> - The percentage progress of the snapshot
         #     * 'requestId'<~String> - id of request
diff --git a/lib/fog/aws/requests/ec2/create_volume.rb b/lib/fog/aws/requests/ec2/create_volume.rb
index ef6c0e04f..a918e0d0f 100644
--- a/lib/fog/aws/requests/ec2/create_volume.rb
+++ b/lib/fog/aws/requests/ec2/create_volume.rb
@@ -12,7 +12,7 @@ unless Fog.mocking?
         # * snapshot_id<~String> - Optional, snapshot to create volume from
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'availabilityZone'<~String> - Availability zone for volume
         #     * 'createTime'<~Time> - Timestamp for creation
diff --git a/lib/fog/aws/requests/ec2/delete_key_pair.rb b/lib/fog/aws/requests/ec2/delete_key_pair.rb
index acca06a3b..d56cb5451 100644
--- a/lib/fog/aws/requests/ec2/delete_key_pair.rb
+++ b/lib/fog/aws/requests/ec2/delete_key_pair.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * key_name<~String> - Name of the key pair.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> id of request
         #     * 'return'<~Boolean> - success?
diff --git a/lib/fog/aws/requests/ec2/delete_security_group.rb b/lib/fog/aws/requests/ec2/delete_security_group.rb
index 4b18ad67d..c523e5193 100644
--- a/lib/fog/aws/requests/ec2/delete_security_group.rb
+++ b/lib/fog/aws/requests/ec2/delete_security_group.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * group_name<~String> - Name of the security group.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
diff --git a/lib/fog/aws/requests/ec2/delete_snapshot.rb b/lib/fog/aws/requests/ec2/delete_snapshot.rb
index d32f78aa6..a2d538f89 100644
--- a/lib/fog/aws/requests/ec2/delete_snapshot.rb
+++ b/lib/fog/aws/requests/ec2/delete_snapshot.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * snapshot_id<~String> - ID of snapshot to delete
         # ==== Returns
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
diff --git a/lib/fog/aws/requests/ec2/delete_volume.rb b/lib/fog/aws/requests/ec2/delete_volume.rb
index aca89911e..666bc1881 100644
--- a/lib/fog/aws/requests/ec2/delete_volume.rb
+++ b/lib/fog/aws/requests/ec2/delete_volume.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * volume_id<~String> - Id of volume to delete.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
diff --git a/lib/fog/aws/requests/ec2/describe_addresses.rb b/lib/fog/aws/requests/ec2/describe_addresses.rb
index 69f0b69db..1144fdd30 100644
--- a/lib/fog/aws/requests/ec2/describe_addresses.rb
+++ b/lib/fog/aws/requests/ec2/describe_addresses.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * public_ip<~Array> - List of ips to describe, defaults to all
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'addressesSet'<~Array>:
diff --git a/lib/fog/aws/requests/ec2/describe_availability_zones.rb b/lib/fog/aws/requests/ec2/describe_availability_zones.rb
index 198a40f09..ccc6e549f 100644
--- a/lib/fog/aws/requests/ec2/describe_availability_zones.rb
+++ b/lib/fog/aws/requests/ec2/describe_availability_zones.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * zone_name<~String> - List of availability zones to describe, defaults to all
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'availabilityZoneInfo'<~Array>:
diff --git a/lib/fog/aws/requests/ec2/describe_images.rb b/lib/fog/aws/requests/ec2/describe_images.rb
index 3262e9165..3f88a9f5a 100644
--- a/lib/fog/aws/requests/ec2/describe_images.rb
+++ b/lib/fog/aws/requests/ec2/describe_images.rb
@@ -14,7 +14,7 @@ unless Fog.mocking?
         #   * 'Owner'<~String> - Only return images belonging to owner.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'imagesSet'<~Array>:
diff --git a/lib/fog/aws/requests/ec2/describe_instances.rb b/lib/fog/aws/requests/ec2/describe_instances.rb
index 0feff8376..7034c3cad 100644
--- a/lib/fog/aws/requests/ec2/describe_instances.rb
+++ b/lib/fog/aws/requests/ec2/describe_instances.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * instance_id<~Array> - List of instance ids to describe, defaults to all
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'reservationSet'<~Array>:
diff --git a/lib/fog/aws/requests/ec2/describe_key_pairs.rb b/lib/fog/aws/requests/ec2/describe_key_pairs.rb
index 4d9058610..ebc7d77e4 100644
--- a/lib/fog/aws/requests/ec2/describe_key_pairs.rb
+++ b/lib/fog/aws/requests/ec2/describe_key_pairs.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * key_name<~Array>:: List of key names to describe, defaults to all
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'keySet'<~Array>:
diff --git a/lib/fog/aws/requests/ec2/describe_regions.rb b/lib/fog/aws/requests/ec2/describe_regions.rb
index 2c601a2e2..88ca951f6 100644
--- a/lib/fog/aws/requests/ec2/describe_regions.rb
+++ b/lib/fog/aws/requests/ec2/describe_regions.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * region_name<~String> - List of regions to describe, defaults to all
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'regionInfo'<~Array>:
diff --git a/lib/fog/aws/requests/ec2/describe_security_groups.rb b/lib/fog/aws/requests/ec2/describe_security_groups.rb
index e003b1345..00ed2559c 100644
--- a/lib/fog/aws/requests/ec2/describe_security_groups.rb
+++ b/lib/fog/aws/requests/ec2/describe_security_groups.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * group_name<~Array> - List of groups to describe, defaults to all
         #
         # === Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'securityGroupInfo'<~Array>:
diff --git a/lib/fog/aws/requests/ec2/describe_snapshots.rb b/lib/fog/aws/requests/ec2/describe_snapshots.rb
index 0a33aa33c..20ceeb5d9 100644
--- a/lib/fog/aws/requests/ec2/describe_snapshots.rb
+++ b/lib/fog/aws/requests/ec2/describe_snapshots.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * snapshot_id<~Array> - List of snapshots to describe, defaults to all
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'snapshotSet'<~Array>:
diff --git a/lib/fog/aws/requests/ec2/describe_volumes.rb b/lib/fog/aws/requests/ec2/describe_volumes.rb
index 7024c5681..0cd8a8241 100644
--- a/lib/fog/aws/requests/ec2/describe_volumes.rb
+++ b/lib/fog/aws/requests/ec2/describe_volumes.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * volume_id<~Array> - List of volumes to describe, defaults to all
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'volumeSet'<~Array>:
         #       * 'availabilityZone'<~String> - Availability zone for volume
diff --git a/lib/fog/aws/requests/ec2/detach_volume.rb b/lib/fog/aws/requests/ec2/detach_volume.rb
index ef5e39cf2..d46c1bd6c 100644
--- a/lib/fog/aws/requests/ec2/detach_volume.rb
+++ b/lib/fog/aws/requests/ec2/detach_volume.rb
@@ -14,7 +14,7 @@ unless Fog.mocking?
         #   * 'InstanceId'<~String> - Id of instance to associate volume with
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'attachTime'<~Time> - Time of attachment was initiated at
         #     * 'device'<~String> - Device as it is exposed to the instance
diff --git a/lib/fog/aws/requests/ec2/disassociate_address.rb b/lib/fog/aws/requests/ec2/disassociate_address.rb
index 1d779e9d9..c2d91dd33 100644
--- a/lib/fog/aws/requests/ec2/disassociate_address.rb
+++ b/lib/fog/aws/requests/ec2/disassociate_address.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * public_ip<~String> - Public ip to assign to instance
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
diff --git a/lib/fog/aws/requests/ec2/get_console_output.rb b/lib/fog/aws/requests/ec2/get_console_output.rb
index 29d77e0a5..eee50ceb0 100644
--- a/lib/fog/aws/requests/ec2/get_console_output.rb
+++ b/lib/fog/aws/requests/ec2/get_console_output.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * instance_id<~String> - Id of instance to get console output from
         #
         # ==== Returns
-        # # * response<~Fog::AWS::Response>:
+        # # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'instanceId'<~String> - Id of instance
         #     * 'output'<~String> - Console output
diff --git a/lib/fog/aws/requests/ec2/reboot_instances.rb b/lib/fog/aws/requests/ec2/reboot_instances.rb
index 39ae3cded..6633950fa 100644
--- a/lib/fog/aws/requests/ec2/reboot_instances.rb
+++ b/lib/fog/aws/requests/ec2/reboot_instances.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * instance_id<~Array> - Ids of instances to reboot
         #
         # ==== Returns
-        # # * response<~Fog::AWS::Response>:
+        # # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
diff --git a/lib/fog/aws/requests/ec2/release_address.rb b/lib/fog/aws/requests/ec2/release_address.rb
index b08a3ac60..7fb7d159b 100644
--- a/lib/fog/aws/requests/ec2/release_address.rb
+++ b/lib/fog/aws/requests/ec2/release_address.rb
@@ -7,7 +7,7 @@ unless Fog.mocking?
         # Release an elastic IP address.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
diff --git a/lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb b/lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb
index 2755c3b95..3a99ba2fb 100644
--- a/lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb
+++ b/lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb
@@ -19,7 +19,7 @@ unless Fog.mocking?
         #   * 'ToPort' - End of port range (or -1 for ICMP wildcard)
         #
         # === Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
diff --git a/lib/fog/aws/requests/ec2/run_instances.rb b/lib/fog/aws/requests/ec2/run_instances.rb
index a43edc058..ef5cbc2f8 100644
--- a/lib/fog/aws/requests/ec2/run_instances.rb
+++ b/lib/fog/aws/requests/ec2/run_instances.rb
@@ -35,7 +35,7 @@ unless Fog.mocking?
         #   * 'VirtualName'<~String> - ?
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'groupSet'<~Array>: groups the instances are members in
         #       * 'groupName'<~String> - Name of group
diff --git a/lib/fog/aws/requests/ec2/terminate_instances.rb b/lib/fog/aws/requests/ec2/terminate_instances.rb
index 39d60ad96..d590b4ef3 100644
--- a/lib/fog/aws/requests/ec2/terminate_instances.rb
+++ b/lib/fog/aws/requests/ec2/terminate_instances.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * instance_id<~Array> - Ids of instances to terminates
         #
         # ==== Returns
-        # # * response<~Fog::AWS::Response>:
+        # # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'instancesSet'<~Array>:
diff --git a/lib/fog/aws/requests/s3/copy_object.rb b/lib/fog/aws/requests/s3/copy_object.rb
index 8bf3953a9..e819f145c 100644
--- a/lib/fog/aws/requests/s3/copy_object.rb
+++ b/lib/fog/aws/requests/s3/copy_object.rb
@@ -19,7 +19,7 @@ unless Fog.mocking?
         #   * 'x-amz-copy_source-if-unmodified-since'<~Time> - Copies object it it has not been modified since this time
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'ETag'<~String> - etag of new object
         #     * 'LastModified'<~Time> - date object was last modified
diff --git a/lib/fog/aws/requests/s3/delete_bucket.rb b/lib/fog/aws/requests/s3/delete_bucket.rb
index 6b872e7ee..ece2873db 100644
--- a/lib/fog/aws/requests/s3/delete_bucket.rb
+++ b/lib/fog/aws/requests/s3/delete_bucket.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * bucket_name<~String> - name of bucket to delete
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * status<~Integer> - 204
         def delete_bucket(bucket_name)
           request({
diff --git a/lib/fog/aws/requests/s3/delete_object.rb b/lib/fog/aws/requests/s3/delete_object.rb
index 30111bb88..bb1617808 100644
--- a/lib/fog/aws/requests/s3/delete_object.rb
+++ b/lib/fog/aws/requests/s3/delete_object.rb
@@ -11,7 +11,7 @@ unless Fog.mocking?
         # * object_name<~String> - Name of object to delete
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * status<~Integer> - 204
         def delete_object(bucket_name, object_name)
           request({
diff --git a/lib/fog/aws/requests/s3/get_bucket.rb b/lib/fog/aws/requests/s3/get_bucket.rb
index 1b6615544..bd48aaec0 100644
--- a/lib/fog/aws/requests/s3/get_bucket.rb
+++ b/lib/fog/aws/requests/s3/get_bucket.rb
@@ -17,7 +17,7 @@ unless Fog.mocking?
         #     value and the first occurence of delimiter to be rolled up
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'Delimeter'<~String> - Delimiter specified for query
         #     * 'Marker'<~String> - Marker specified for query
diff --git a/lib/fog/aws/requests/s3/get_bucket_location.rb b/lib/fog/aws/requests/s3/get_bucket_location.rb
index 697f174fb..ad0be55ec 100644
--- a/lib/fog/aws/requests/s3/get_bucket_location.rb
+++ b/lib/fog/aws/requests/s3/get_bucket_location.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * bucket_name<~String> - name of bucket to get location constraint for
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'LocationConstraint'<~String> - Location constraint of the bucket
         def get_bucket_location(bucket_name)
diff --git a/lib/fog/aws/requests/s3/get_object.rb b/lib/fog/aws/requests/s3/get_object.rb
index 3996b5e39..518ddd132 100644
--- a/lib/fog/aws/requests/s3/get_object.rb
+++ b/lib/fog/aws/requests/s3/get_object.rb
@@ -16,7 +16,7 @@ unless Fog.mocking?
         #   * 'If-Unmodified-Since'<~Time> - Returns object only if it has not been modified since this time, otherwise returns 412 (Precodition Failed).
         #   * 'Range'<~String> - Range of object to download
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~String> - Contents of object
         #   * headers<~Hash>:
         #     * 'Content-Length'<~String> - Size of object contents
diff --git a/lib/fog/aws/requests/s3/get_request_payment.rb b/lib/fog/aws/requests/s3/get_request_payment.rb
index 5797ac81d..d7fa5af6e 100644
--- a/lib/fog/aws/requests/s3/get_request_payment.rb
+++ b/lib/fog/aws/requests/s3/get_request_payment.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * bucket_name<~String> - name of bucket to get payer for
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'Payer'<~String> - Specifies who pays for download and requests
         def get_request_payment(bucket_name)
diff --git a/lib/fog/aws/requests/s3/get_service.rb b/lib/fog/aws/requests/s3/get_service.rb
index 3d3cdd692..cb2909534 100644
--- a/lib/fog/aws/requests/s3/get_service.rb
+++ b/lib/fog/aws/requests/s3/get_service.rb
@@ -7,7 +7,7 @@ unless Fog.mocking?
         # List information about S3 buckets for authorized user
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'Buckets'<~Hash>:
         #       * 'Name'<~String> - Name of bucket
diff --git a/lib/fog/aws/requests/s3/head_object.rb b/lib/fog/aws/requests/s3/head_object.rb
index b6538df02..6c3a92685 100644
--- a/lib/fog/aws/requests/s3/head_object.rb
+++ b/lib/fog/aws/requests/s3/head_object.rb
@@ -17,7 +17,7 @@ unless Fog.mocking?
         #   * 'Range'<~String> - Range of object to download
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~String> - Contents of object
         #   * headers<~Hash>:
         #     * 'Content-Length'<~String> - Size of object contents
diff --git a/lib/fog/aws/requests/s3/put_bucket.rb b/lib/fog/aws/requests/s3/put_bucket.rb
index c07c48e48..c1daa5485 100644
--- a/lib/fog/aws/requests/s3/put_bucket.rb
+++ b/lib/fog/aws/requests/s3/put_bucket.rb
@@ -12,7 +12,7 @@ unless Fog.mocking?
         #   * :location_constraint<~Symbol> - sets the location for the bucket
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * status<~Integer> - 200
         def put_bucket(bucket_name, options = {})
           if options['LocationConstraint']
diff --git a/lib/fog/aws/requests/s3/put_object.rb b/lib/fog/aws/requests/s3/put_object.rb
index 0d6e054d7..ea941c953 100644
--- a/lib/fog/aws/requests/s3/put_object.rb
+++ b/lib/fog/aws/requests/s3/put_object.rb
@@ -21,7 +21,7 @@ unless Fog.mocking?
         #   * "x-amz-meta-#{name}" - Headers to be returned with object, note total size of request without body must be less than 8 KB.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * headers<~Hash>:
         #     * 'ETag'<~String> - etag of new object
         def put_object(bucket_name, object_name, data, options = {})
diff --git a/lib/fog/aws/requests/simpledb/batch_put_attributes.rb b/lib/fog/aws/requests/simpledb/batch_put_attributes.rb
index 69f784360..e460f98fd 100644
--- a/lib/fog/aws/requests/simpledb/batch_put_attributes.rb
+++ b/lib/fog/aws/requests/simpledb/batch_put_attributes.rb
@@ -17,7 +17,7 @@ unless Fog.mocking?
         #   not valid.  Each name and value can be up to 1024 bytes long.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'BoxUsage'
         #     * 'RequestId'
diff --git a/lib/fog/aws/requests/simpledb/create_domain.rb b/lib/fog/aws/requests/simpledb/create_domain.rb
index d090fecbe..7984e160e 100644
--- a/lib/fog/aws/requests/simpledb/create_domain.rb
+++ b/lib/fog/aws/requests/simpledb/create_domain.rb
@@ -11,7 +11,7 @@ unless Fog.mocking?
         # following characters: a-z, A-Z, 0-9, '_', '-' and '.'.
         # 
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'BoxUsage'
         #     * 'RequestId'
diff --git a/lib/fog/aws/requests/simpledb/delete_attributes.rb b/lib/fog/aws/requests/simpledb/delete_attributes.rb
index e5eb29dca..76ab675b6 100644
--- a/lib/fog/aws/requests/simpledb/delete_attributes.rb
+++ b/lib/fog/aws/requests/simpledb/delete_attributes.rb
@@ -19,7 +19,7 @@ unless Fog.mocking?
         #   bytes long.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'BoxUsage'
         #     * 'RequestId'
diff --git a/lib/fog/aws/requests/simpledb/delete_domain.rb b/lib/fog/aws/requests/simpledb/delete_domain.rb
index 13f856a70..1f8f751a2 100644
--- a/lib/fog/aws/requests/simpledb/delete_domain.rb
+++ b/lib/fog/aws/requests/simpledb/delete_domain.rb
@@ -11,7 +11,7 @@ unless Fog.mocking?
         # following characters: a-z, A-Z, 0-9, '_', '-' and '.'.
         # 
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'BoxUsage'
         #     * 'RequestId'
diff --git a/lib/fog/aws/requests/simpledb/domain_metadata.rb b/lib/fog/aws/requests/simpledb/domain_metadata.rb
index af8e08b5f..b04515302 100644
--- a/lib/fog/aws/requests/simpledb/domain_metadata.rb
+++ b/lib/fog/aws/requests/simpledb/domain_metadata.rb
@@ -11,7 +11,7 @@ unless Fog.mocking?
         # following characters: a-z, A-Z, 0-9, '_', '-' and '.'.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'AttributeNameCount' - number of unique attribute names in domain
         #     * 'AttributeNamesSizeBytes' - total size of unique attribute names, in bytes
diff --git a/lib/fog/aws/requests/simpledb/get_attributes.rb b/lib/fog/aws/requests/simpledb/get_attributes.rb
index 6031374e3..5c8f29f8a 100644
--- a/lib/fog/aws/requests/simpledb/get_attributes.rb
+++ b/lib/fog/aws/requests/simpledb/get_attributes.rb
@@ -19,7 +19,7 @@ unless Fog.mocking?
         #   bytes long.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'Attributes' - list of attribute name/values for the item
         #     * 'BoxUsage'
diff --git a/lib/fog/aws/requests/simpledb/list_domains.rb b/lib/fog/aws/requests/simpledb/list_domains.rb
index 02c3b5d73..e24b27bee 100644
--- a/lib/fog/aws/requests/simpledb/list_domains.rb
+++ b/lib/fog/aws/requests/simpledb/list_domains.rb
@@ -13,7 +13,7 @@ unless Fog.mocking?
         #   * 'NextToken'<~String> - Offset token to start listing, defaults to nil
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'BoxUsage'
         #     * 'Domains' - array of domain names.
diff --git a/lib/fog/aws/requests/simpledb/put_attributes.rb b/lib/fog/aws/requests/simpledb/put_attributes.rb
index 800e15667..9a0e6453e 100644
--- a/lib/fog/aws/requests/simpledb/put_attributes.rb
+++ b/lib/fog/aws/requests/simpledb/put_attributes.rb
@@ -18,7 +18,7 @@ unless Fog.mocking?
         #   be up to 1024 bytes long.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'BoxUsage'
         #     * 'RequestId'
diff --git a/lib/fog/aws/requests/simpledb/select.rb b/lib/fog/aws/requests/simpledb/select.rb
index 02f7abd96..37cda744c 100644
--- a/lib/fog/aws/requests/simpledb/select.rb
+++ b/lib/fog/aws/requests/simpledb/select.rb
@@ -9,7 +9,7 @@ module Fog
       # * next_token<~String> - Offset token to start list, defaults to nil.
       #
       # ==== Returns
-      # * response<~Fog::AWS::Response>:
+      # * response<~Excon::Response>:
       #   * body<~Hash>:
       #     * 'BoxUsage'<~Float>
       #     * 'RequestId'<~String>
diff --git a/lib/fog/rackspace/requests/files/get_container.rb b/lib/fog/rackspace/requests/files/get_container.rb
index 0b889d140..bbc040579 100644
--- a/lib/fog/rackspace/requests/files/get_container.rb
+++ b/lib/fog/rackspace/requests/files/get_container.rb
@@ -15,7 +15,7 @@ unless Fog.mocking?
         #   * 'path'<~String> - Return objects nested in the pseudo path
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * headers<~Hash>:
         #     * 'X-Account-Container-Count'<~String> - Count of containers
         #     * 'X-Account-Bytes-Used'<~String> - Bytes used
diff --git a/lib/fog/rackspace/requests/files/get_containers.rb b/lib/fog/rackspace/requests/files/get_containers.rb
index d7ff5dd9b..56d433224 100644
--- a/lib/fog/rackspace/requests/files/get_containers.rb
+++ b/lib/fog/rackspace/requests/files/get_containers.rb
@@ -12,7 +12,7 @@ unless Fog.mocking?
         #   * 'marker'<~String> - Only return objects with name greater than this value
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Array>:
         #     * container<~Hash>:
         #       * 'bytes'<~Integer>: - Number of bytes used by container
diff --git a/lib/fog/rackspace/requests/files/head_container.rb b/lib/fog/rackspace/requests/files/head_container.rb
index 5c8474d8e..9e93f771f 100644
--- a/lib/fog/rackspace/requests/files/head_container.rb
+++ b/lib/fog/rackspace/requests/files/head_container.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * container<~String> - Name of container to retrieve info for
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * headers<~Hash>:
         #     * 'X-Container-Object-Count'<~String> - Count of containers
         #     * 'X-Container-Bytes-Used'<~String>   - Bytes used
diff --git a/lib/fog/rackspace/requests/files/head_containers.rb b/lib/fog/rackspace/requests/files/head_containers.rb
index 45ff15f38..4a92a539c 100644
--- a/lib/fog/rackspace/requests/files/head_containers.rb
+++ b/lib/fog/rackspace/requests/files/head_containers.rb
@@ -7,7 +7,7 @@ unless Fog.mocking?
         # List number of containers and total bytes stored
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * headers<~Hash>:
         #     * 'X-Account-Container-Count'<~String> - Count of containers
         #     * 'X-Account-Bytes-Used'<~String> - Bytes used
diff --git a/lib/fog/rackspace/requests/servers/create_image.rb b/lib/fog/rackspace/requests/servers/create_image.rb
index 6f2061257..ef471673d 100644
--- a/lib/fog/rackspace/requests/servers/create_image.rb
+++ b/lib/fog/rackspace/requests/servers/create_image.rb
@@ -11,7 +11,7 @@ unless Fog.mocking?
         # * options<~Hash> - Name
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * 'image'<~Hash>:
         #     * 'created'<~Time> - Creation time
         #     * 'id'<~Integer> - Id of image
diff --git a/lib/fog/rackspace/requests/servers/create_server.rb b/lib/fog/rackspace/requests/servers/create_server.rb
index fb5a8c670..d14b9b30c 100644
--- a/lib/fog/rackspace/requests/servers/create_server.rb
+++ b/lib/fog/rackspace/requests/servers/create_server.rb
@@ -19,7 +19,7 @@ unless Fog.mocking?
         #       * 'path'<~String> - Path to file (255 bytes total of path strings)
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #   * 'server'<~Hash>:
         #     * 'addresses'<~Hash>:
diff --git a/lib/fog/rackspace/requests/servers/get_server_details.rb b/lib/fog/rackspace/requests/servers/get_server_details.rb
index 1a96d57cc..408c02308 100644
--- a/lib/fog/rackspace/requests/servers/get_server_details.rb
+++ b/lib/fog/rackspace/requests/servers/get_server_details.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * server_id<~Integer> - Id of server to get details for
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #   * 'server'<~Hash>:
         #     * 'addresses'<~Hash>:
diff --git a/lib/fog/rackspace/requests/servers/list_addresses.rb b/lib/fog/rackspace/requests/servers/list_addresses.rb
index dbf342d46..098a42ab2 100644
--- a/lib/fog/rackspace/requests/servers/list_addresses.rb
+++ b/lib/fog/rackspace/requests/servers/list_addresses.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * server_id<~Integer> - Id of server to list addresses for
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #   * 'addresses'<~Array>:
         #     * 'public'<~Array> - Public ip addresses
diff --git a/lib/fog/rackspace/requests/servers/list_flavors.rb b/lib/fog/rackspace/requests/servers/list_flavors.rb
index 7eec33bcb..6a61b9bf1 100644
--- a/lib/fog/rackspace/requests/servers/list_flavors.rb
+++ b/lib/fog/rackspace/requests/servers/list_flavors.rb
@@ -7,7 +7,7 @@ unless Fog.mocking?
         # List all images (IDs and names only)
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'id'<~Integer> - Id of the flavor
         #     * 'name'<~String> - Name of the flavor
diff --git a/lib/fog/rackspace/requests/servers/list_flavors_detail.rb b/lib/fog/rackspace/requests/servers/list_flavors_detail.rb
index 04b459364..a021b8f7a 100644
--- a/lib/fog/rackspace/requests/servers/list_flavors_detail.rb
+++ b/lib/fog/rackspace/requests/servers/list_flavors_detail.rb
@@ -7,7 +7,7 @@ unless Fog.mocking?
         # List all images (IDs and names only)
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'id'<~Integer> - Id of the flavor
         #     * 'name'<~String> - Name of the flavor
diff --git a/lib/fog/rackspace/requests/servers/list_images.rb b/lib/fog/rackspace/requests/servers/list_images.rb
index 61122edde..4f9c1d995 100644
--- a/lib/fog/rackspace/requests/servers/list_images.rb
+++ b/lib/fog/rackspace/requests/servers/list_images.rb
@@ -7,7 +7,7 @@ unless Fog.mocking?
         # List all images (IDs and names only)
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'id'<~Integer> - Id of the image
         #     * 'name'<~String> - Name of the image
diff --git a/lib/fog/rackspace/requests/servers/list_images_detail.rb b/lib/fog/rackspace/requests/servers/list_images_detail.rb
index ffc3ff1cf..2bd8151fd 100644
--- a/lib/fog/rackspace/requests/servers/list_images_detail.rb
+++ b/lib/fog/rackspace/requests/servers/list_images_detail.rb
@@ -7,7 +7,7 @@ unless Fog.mocking?
         # List all images
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'id'<~Integer> - Id of the image
         #     * 'name'<~String> - Name of the image
diff --git a/lib/fog/rackspace/requests/servers/list_private_addresses.rb b/lib/fog/rackspace/requests/servers/list_private_addresses.rb
index 49170ed96..79a7caf0f 100644
--- a/lib/fog/rackspace/requests/servers/list_private_addresses.rb
+++ b/lib/fog/rackspace/requests/servers/list_private_addresses.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * server_id<~Integer> - Id of server to list addresses for
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'private'<~Array> - Public ip addresses
         def list_private_addresses
diff --git a/lib/fog/rackspace/requests/servers/list_public_addresses.rb b/lib/fog/rackspace/requests/servers/list_public_addresses.rb
index ccbe63050..b2966d132 100644
--- a/lib/fog/rackspace/requests/servers/list_public_addresses.rb
+++ b/lib/fog/rackspace/requests/servers/list_public_addresses.rb
@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * server_id<~Integer> - Id of server to list addresses for
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'public'<~Array> - Public ip addresses
         def list_public_addresses
diff --git a/lib/fog/rackspace/requests/servers/list_servers.rb b/lib/fog/rackspace/requests/servers/list_servers.rb
index 66df55f65..ed671ef5e 100644
--- a/lib/fog/rackspace/requests/servers/list_servers.rb
+++ b/lib/fog/rackspace/requests/servers/list_servers.rb
@@ -7,7 +7,7 @@ unless Fog.mocking?
         # List all servers (IDs and names only)
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #   * 'servers'<~Array>:
         #     * 'id'<~Integer> - Id of server
diff --git a/lib/fog/rackspace/requests/servers/list_servers_detail.rb b/lib/fog/rackspace/requests/servers/list_servers_detail.rb
index 9d67f8e26..f2f2fd0c3 100644
--- a/lib/fog/rackspace/requests/servers/list_servers_detail.rb
+++ b/lib/fog/rackspace/requests/servers/list_servers_detail.rb
@@ -7,7 +7,7 @@ unless Fog.mocking?
         # List all servers details
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #   * 'servers'<~Array>:
         #     * 'id'<~Integer> - Id of server