diff --git a/RELEASE.md b/RELEASE.md
new file mode 100644
index 000000000..9829bcf49
--- /dev/null
+++ b/RELEASE.md
@@ -0,0 +1,39 @@
+# Release process
+
+This is fog's current release process, documented so people know what is
+currently done.
+
+## Versioning
+
+fog uses semantic versioning (http://semver.org/)
+
+## When we release
+
+Releases occur monthly and are manually handled by fog's Benevolent
+Dictator Wes (@geemus).
+
+To request a new release please raise an issue.
+
+## Prepare the release
+
+* Ensure the code is passing on the CI server [![Build Status](https://secure.travis-ci.org/fog/fog.png?branch=master)](http://travis-ci.org/fog/fog)
+* Ensure the code is passing for live tests (Requires Credentials for all
+services)
+* Ensure working on **master**
+* Update the version number (`lib/fog/version.rb`)
+* Run `rake changelog` to update `changelog.txt`
+* Run `rake release` to prepare the release which does:
+  * Prepares the release (`rake release:prepare`)
+    * Builds the gem
+    * Tags the commit
+    * Creates commits for version
+  * Publishes the release (`rake release:publish`)
+    * Pushes commit and tag to Github (Requires Credentials)
+    * Pushes gem to Rubygems (Requires Credentials)
+
+## Announce the release
+
+Once the release is prepared and uploaded it needs to be announced.
+
+* Send an email to https://groups.google.com/forum/?fromgroups#!forum/ruby-fog
+* Tweet as @fog on Twitter (Requires Credentials)
diff --git a/Rakefile b/Rakefile
index cff8882d2..6990b11e2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -95,16 +95,43 @@ end
 #
 #############################################################################
 
-task :release => :build do
-  unless `git branch` =~ /^\* master$/
-    puts "You must be on the master branch to release!"
-    exit!
+task :release => ["release:prepare", "release:publish"]
+
+namespace :release do
+  task :preflight do
+    unless `git branch` =~ /^\* master$/
+      puts "You must be on the master branch to release!"
+      exit!
+    end
+    if `git tag` =~ /^\* v#{version}$/
+      puts "Tag v#{version} already exists!"
+      exit!
+    end
   end
-  sh "gem install pkg/#{name}-#{version}.gem"
+
+  task :prepare => :preflight do
+    Rake::Task[:build].invoke
+    sh "gem install pkg/#{name}-#{version}.gem"
+    Rake::Task[:git_mark_release].invoke
+  end
+
+  task :publish do
+    Rake::Task[:git_push_release].invoke
+    Rake::Task[:gem_push].invoke
+  end
+end
+
+task :git_mark_release do
   sh "git commit --allow-empty -a -m 'Release #{version}'"
   sh "git tag v#{version}"
+end
+
+task :git_push_release do
   sh "git push origin master"
   sh "git push origin v#{version}"
+end
+
+task :gem_push do
   sh "gem push pkg/#{name}-#{version}.gem"
 end
 
diff --git a/lib/fog/atmos/models/storage/directories.rb b/lib/fog/atmos/models/storage/directories.rb
index 568fbe9c8..a7f22d1af 100644
--- a/lib/fog/atmos/models/storage/directories.rb
+++ b/lib/fog/atmos/models/storage/directories.rb
@@ -14,7 +14,7 @@ module Fog
         def all
           directory ? ns = directory.key : ns = ''
           ns = ns + '/' unless ns =~ /\/$/
-          data = connection.get_namespace(ns).body[:DirectoryList]
+          data = service.get_namespace(ns).body[:DirectoryList]
           data = {:DirectoryEntry => []} if data.kind_of? String
           data[:DirectoryEntry] = [data[:DirectoryEntry]] if data[:DirectoryEntry].kind_of? Hash
           dirs = data[:DirectoryEntry].select {|de| de[:FileType] == 'directory'}
@@ -28,7 +28,7 @@ module Fog
         def get(key, options = {})
           return nil if key == '' # Root dir shouldn't be retrieved like this.
           key =~ /\/$/ ? ns = key : ns = key + '/'
-          res = connection.get_namespace ns
+          res = service.get_namespace ns
           emc_meta = res.headers['x-emc-meta']
           obj_id = emc_meta.scan(/objectid=(\w+),/).flatten[0]
           new(:objectid => obj_id, :key => ns)
diff --git a/lib/fog/atmos/models/storage/directory.rb b/lib/fog/atmos/models/storage/directory.rb
index 5a30a2cfd..e26a5ba04 100644
--- a/lib/fog/atmos/models/storage/directory.rb
+++ b/lib/fog/atmos/models/storage/directory.rb
@@ -12,25 +12,25 @@ module Fog
         def files
           @files ||= begin
                        Fog::Storage::Atmos::Files.new(
-                                                          :directory    => self,
-                                                          :connection   => connection
-                                                          )
-          end
+                         :directory => self,
+                         :service   => service
+                       )
+                     end
         end
 
         def directories
           @directories ||= begin
-                       Fog::Storage::Atmos::Directories.new(
-                                                               :directory    => self,
-                                                               :connection   => connection
-                                                               )
-          end
+                             Fog::Storage::Atmos::Directories.new(
+                               :directory => self,
+                               :service   => service
+                             )
+                           end
         end
 
         def save
           self.key = attributes[:directory].key + key if attributes[:directory]
           self.key = key + '/' unless key =~ /\/$/
-          res = connection.post_namespace key
+          res = service.post_namespace key
           reload
         end
 
@@ -42,7 +42,7 @@ module Fog
               d.destroy(opts)
             end
           end
-          connection.delete_namespace key
+          service.delete_namespace key
         end
 
 
diff --git a/lib/fog/atmos/models/storage/file.rb b/lib/fog/atmos/models/storage/file.rb
index 1a09a7a4b..71938e565 100644
--- a/lib/fog/atmos/models/storage/file.rb
+++ b/lib/fog/atmos/models/storage/file.rb
@@ -29,7 +29,7 @@ module Fog
         end
 
         def copy(target_directory_key, target_file_key, options={})
-          target_directory = connection.directories.new(:key => target_directory_key)
+          target_directory = service.directories.new(:key => target_directory_key)
           target_directory.files.create(
             :key => target_file_key,
             :body => body
@@ -38,7 +38,7 @@ module Fog
 
         def destroy
           requires :directory, :key
-          connection.delete_namespace([directory.key, key].join('/'))
+          service.delete_namespace([directory.key, key].join('/'))
           true
         end
 
@@ -60,15 +60,15 @@ module Fog
           file = directory.files.head(key)
           self.objectid = if file.present? then file.attributes['x-emc-meta'].scan(/objectid=(\w+),/).flatten[0] else nil end
           if self.objectid.present?
-            uri = URI::HTTP.build(:scheme => connection.ssl? ? "http" : "https" , :host => connection.host, :port => connection.port.to_i, :path => "/rest/objects/#{self.objectid}" )
+            uri = URI::HTTP.build(:scheme => service.ssl? ? "http" : "https" , :host => service.host, :port => service.port.to_i, :path => "/rest/objects/#{self.objectid}" )
 
             sb = "GET\n"
             sb += uri.path.downcase + "\n"
-            sb += connection.uid + "\n"
+            sb += service.uid + "\n"
             sb += String(expires.to_i())
 
-            signature = connection.sign( sb )
-            uri.query = "uid=#{CGI::escape(connection.uid)}&expires=#{expires.to_i()}&signature=#{CGI::escape(signature)}"
+            signature = service.sign( sb )
+            uri.query = "uid=#{CGI::escape(service.uid)}&expires=#{expires.to_i()}&signature=#{CGI::escape(signature)}"
             uri.to_s
           else
             nil
@@ -83,11 +83,11 @@ module Fog
           options[:headers]['Content-Type'] = content_type if content_type
           options[:body] = body
           begin
-            data = connection.post_namespace(ns, options)
+            data = service.post_namespace(ns, options)
             self.objectid = data.headers['location'].split('/')[-1]
           rescue => error
             if error.message =~ /The resource you are trying to create already exists./
-              data = connection.put_namespace(ns, options)
+              data = service.put_namespace(ns, options)
             else
               raise error
             end
diff --git a/lib/fog/atmos/models/storage/files.rb b/lib/fog/atmos/models/storage/files.rb
index 40c234148..ea0044f40 100644
--- a/lib/fog/atmos/models/storage/files.rb
+++ b/lib/fog/atmos/models/storage/files.rb
@@ -19,7 +19,7 @@ module Fog
           requires :directory
           directory ? ns = directory.key : ns = ''
           ns = ns + '/' unless ns =~ /\/$/
-          data = connection.get_namespace(ns).body[:DirectoryList]
+          data = service.get_namespace(ns).body[:DirectoryList]
           data = {:DirectoryEntry => []} if data.kind_of? String
           data[:DirectoryEntry] = [data[:DirectoryEntry]] if data[:DirectoryEntry].kind_of? Hash
           files = data[:DirectoryEntry].select {|de| de[:FileType] == 'regular'}
@@ -32,7 +32,7 @@ module Fog
 
         def get(key, &block)
           requires :directory
-          data = connection.get_namespace(directory.key + key, :parse => false)#, &block)
+          data = service.get_namespace(directory.key + key, :parse => false)#, &block)
           file_data = data.headers.merge({
             :body => data.body,
             :key  => key
@@ -51,7 +51,7 @@ module Fog
 
         def head(key, options = {})
           requires :directory
-          data = connection.head_namespace(directory.key + key, :parse => false)
+          data = service.head_namespace(directory.key + key, :parse => false)
           file_data = data.headers.merge({
             :body => data.body,
             :key => key
diff --git a/lib/fog/aws/models/auto_scaling/activities.rb b/lib/fog/aws/models/auto_scaling/activities.rb
index afff256c9..7aae69e72 100644
--- a/lib/fog/aws/models/auto_scaling/activities.rb
+++ b/lib/fog/aws/models/auto_scaling/activities.rb
@@ -11,7 +11,7 @@ module Fog
           data = []
           next_token = nil
           loop do
-            result = connection.describe_scaling_activities('NextToken' => next_token).body['DescribeScalingActivitiesResult']
+            result = service.describe_scaling_activities('NextToken' => next_token).body['DescribeScalingActivitiesResult']
             data += result['Activities']
             next_token = result['NextToken']
             break if next_token.nil?
@@ -20,7 +20,7 @@ module Fog
         end
 
         def get(identity)
-          data = connection.describe_scaling_activities('ActivityId' => identity).body['DescribeScalingActivitiesResult']['Activities'].first
+          data = service.describe_scaling_activities('ActivityId' => identity).body['DescribeScalingActivitiesResult']['Activities'].first
           new(data) unless data.nil?
         end
 
diff --git a/lib/fog/aws/models/auto_scaling/activity.rb b/lib/fog/aws/models/auto_scaling/activity.rb
index c382e64e2..1316475f8 100644
--- a/lib/fog/aws/models/auto_scaling/activity.rb
+++ b/lib/fog/aws/models/auto_scaling/activity.rb
@@ -16,7 +16,7 @@ module Fog
         attribute :status_message,          :aliases => 'StatusMessage'
 
         def group
-          connection.groups.get(attributes['AutoScalingGroupName'])
+          service.groups.get(attributes['AutoScalingGroupName'])
         end
 
         def save
diff --git a/lib/fog/aws/models/auto_scaling/configuration.rb b/lib/fog/aws/models/auto_scaling/configuration.rb
index ca8671a42..434f428c1 100644
--- a/lib/fog/aws/models/auto_scaling/configuration.rb
+++ b/lib/fog/aws/models/auto_scaling/configuration.rb
@@ -41,7 +41,7 @@ module Fog
 
           options = Hash[self.class.aliases.map { |key, value| [key, send(value)] }]
           options.delete_if { |key, value| value.nil? }
-          connection.create_launch_configuration(image_id, instance_type, id, options) #, listeners.map{|l| l.to_params})
+          service.create_launch_configuration(image_id, instance_type, id, options) #, listeners.map{|l| l.to_params})
 
           # reload instead of merge attributes b/c some attrs (like HealthCheck)
           # may be set, but only the DNS name is returned in the create_load_balance
@@ -56,7 +56,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_launch_configuration(id)
+          service.delete_launch_configuration(id)
         end
 
       end
diff --git a/lib/fog/aws/models/auto_scaling/configurations.rb b/lib/fog/aws/models/auto_scaling/configurations.rb
index d5d104fc1..2f95669de 100644
--- a/lib/fog/aws/models/auto_scaling/configurations.rb
+++ b/lib/fog/aws/models/auto_scaling/configurations.rb
@@ -16,7 +16,7 @@ module Fog
           data = []
           next_token = nil
           loop do
-            result = connection.describe_launch_configurations('NextToken' => next_token).body['DescribeLaunchConfigurationsResult']
+            result = service.describe_launch_configurations('NextToken' => next_token).body['DescribeLaunchConfigurationsResult']
             data += result['LaunchConfigurations']
             next_token = result['NextToken']
             break if next_token.nil?
@@ -25,7 +25,7 @@ module Fog
         end
 
         def get(identity)
-          data = connection.describe_launch_configurations('LaunchConfigurationNames' => identity).body['DescribeLaunchConfigurationsResult']['LaunchConfigurations'].first
+          data = service.describe_launch_configurations('LaunchConfigurationNames' => identity).body['DescribeLaunchConfigurationsResult']['LaunchConfigurations'].first
 	  new(data) unless data.nil?
         end
 
diff --git a/lib/fog/aws/models/auto_scaling/group.rb b/lib/fog/aws/models/auto_scaling/group.rb
index fc6701e9f..97843dcc7 100644
--- a/lib/fog/aws/models/auto_scaling/group.rb
+++ b/lib/fog/aws/models/auto_scaling/group.rb
@@ -45,37 +45,37 @@ module Fog
           data = []
           next_token = nil
           loop do
-            result = connection.describe_scaling_activities('AutoScalingGroupName' => id, 'NextToken' => next_token).body['DescribeScalingActivitiesResult']
+            result = service.describe_scaling_activities('AutoScalingGroupName' => id, 'NextToken' => next_token).body['DescribeScalingActivitiesResult']
             data += result['Activities']
             next_token = result['NextToken']
             break if next_token.nil?
           end
           Fog::AWS::AutoScaling::Activities.new({
             :data => data,
-            :connection => connection,
+            :service => service,
             #:load_balancer => self
           })
         end
 
         def configuration
           requires :launch_configuration_name
-          connection.configurations.get(launch_configuration_name)
+          service.configurations.get(launch_configuration_name)
         end
 
         def disable_metrics_collection(metrics = {})
           requires :id
-          connection.disable_metrics_collection(id, 'Metrics' => metrics)
+          service.disable_metrics_collection(id, 'Metrics' => metrics)
           reload
         end
 
         def enable_metrics_collection(granularity = '1Minute', metrics = {})
           requires :id
-          connection.enable_metrics_collection(id, granularity, 'Metrics' => metrics)
+          service.enable_metrics_collection(id, granularity, 'Metrics' => metrics)
           reload
         end
 
         def instances
-          Fog::AWS::AutoScaling::Instances.new(:connection => connection).load(attributes[:instances])
+          Fog::AWS::AutoScaling::Instances.new(:service => service).load(attributes[:instances])
         end
 
         def instances_in_service
@@ -88,13 +88,13 @@ module Fog
 
         def resume_processes(processes = [])
           requires :id
-          connection.resume_processes(id, 'ScalingProcesses' => processes)
+          service.resume_processes(id, 'ScalingProcesses' => processes)
           reload
         end
 
         def suspend_processes(processes = [])
           requires :id
-          connection.suspend_processes(id, 'ScalingProcesses' => processes)
+          service.suspend_processes(id, 'ScalingProcesses' => processes)
           reload
         end
 
@@ -112,7 +112,7 @@ module Fog
           requires :max_size
           requires :min_size
 
-          connection.create_auto_scaling_group(id, availability_zones, launch_configuration_name, max_size, min_size, options)
+          service.create_auto_scaling_group(id, availability_zones, launch_configuration_name, max_size, min_size, options)
           reload
         end
 
@@ -126,13 +126,13 @@ module Fog
 
           opts = {}
           opts.merge!({'ForceDelete' => true}) if options[:force]
-          
-          connection.delete_auto_scaling_group(id, opts)
+
+          service.delete_auto_scaling_group(id, opts)
         end
 
         def update
           requires :id
-          connection.update_auto_scaling_group(id, options)
+          service.update_auto_scaling_group(id, options)
           reload
         end
 
diff --git a/lib/fog/aws/models/auto_scaling/groups.rb b/lib/fog/aws/models/auto_scaling/groups.rb
index cb7d06e0e..7fa696523 100644
--- a/lib/fog/aws/models/auto_scaling/groups.rb
+++ b/lib/fog/aws/models/auto_scaling/groups.rb
@@ -16,7 +16,7 @@ module Fog
           data = []
           next_token = nil
           loop do
-            result = connection.describe_auto_scaling_groups('NextToken' => next_token).body['DescribeAutoScalingGroupsResult']
+            result = service.describe_auto_scaling_groups('NextToken' => next_token).body['DescribeAutoScalingGroupsResult']
             data += result['AutoScalingGroups']
             next_token = result['NextToken']
             break if next_token.nil?
@@ -25,7 +25,7 @@ module Fog
         end
 
         def get(identity)
-          data = connection.describe_auto_scaling_groups('AutoScalingGroupNames' => identity).body['DescribeAutoScalingGroupsResult']['AutoScalingGroups'].first
+          data = service.describe_auto_scaling_groups('AutoScalingGroupNames' => identity).body['DescribeAutoScalingGroupsResult']['AutoScalingGroups'].first
           new(data) unless data.nil?
         end
 
diff --git a/lib/fog/aws/models/auto_scaling/instance.rb b/lib/fog/aws/models/auto_scaling/instance.rb
index 600dff885..d2f9894eb 100644
--- a/lib/fog/aws/models/auto_scaling/instance.rb
+++ b/lib/fog/aws/models/auto_scaling/instance.rb
@@ -17,22 +17,22 @@ module Fog
         end
 
         def group
-          connection.groups.get(attributes['AutoScalingGroupName'])
+          service.groups.get(attributes['AutoScalingGroupName'])
         end
 
         def configuration
-          connection.configurations.get(attributes['LaunchConfigurationName'])
+          service.configurations.get(attributes['LaunchConfigurationName'])
         end
 
         def set_health(health_status, options)
           requires :id
-          connection.set_instance_health(health_status, id, options)
+          service.set_instance_health(health_status, id, options)
           reload
         end
 
         def terminate(should_decrement_desired_capacity)
           requires :id
-          connection.terminate_instance_in_auto_scaling_group(id, should_decrement_desired_capacity)
+          service.terminate_instance_in_auto_scaling_group(id, should_decrement_desired_capacity)
           reload
         end
 
@@ -51,7 +51,7 @@ module Fog
 
         #def destroy
         #  requires :id
-        #  connection.delete_auto_scaling_group(id)
+        #  service.delete_auto_scaling_group(id)
         #end
 
       end
diff --git a/lib/fog/aws/models/auto_scaling/instances.rb b/lib/fog/aws/models/auto_scaling/instances.rb
index bf76ae386..b19485bda 100644
--- a/lib/fog/aws/models/auto_scaling/instances.rb
+++ b/lib/fog/aws/models/auto_scaling/instances.rb
@@ -11,7 +11,7 @@ module Fog
           data = []
           next_token = nil
           loop do
-            result = connection.describe_auto_scaling_instances('NextToken' => next_token).body['DescribeAutoScalingInstancesResult']
+            result = service.describe_auto_scaling_instances('NextToken' => next_token).body['DescribeAutoScalingInstancesResult']
             data += result['AutoScalingInstances']
             next_token = result['NextToken']
             break if next_token.nil?
@@ -20,7 +20,7 @@ module Fog
         end
 
         def get(identity)
-          data = connection.describe_auto_scaling_instances('InstanceIds' => identity).body['DescribeAutoScalingInstancesResult']['AutoScalingInstances'].first
+          data = service.describe_auto_scaling_instances('InstanceIds' => identity).body['DescribeAutoScalingInstancesResult']['AutoScalingInstances'].first
           new(data) unless data.nil?
         end
 
diff --git a/lib/fog/aws/models/auto_scaling/policies.rb b/lib/fog/aws/models/auto_scaling/policies.rb
index 27aa0dc1e..12868317c 100644
--- a/lib/fog/aws/models/auto_scaling/policies.rb
+++ b/lib/fog/aws/models/auto_scaling/policies.rb
@@ -15,7 +15,7 @@ module Fog
           data = []
           next_token = nil
           loop do
-            result = connection.describe_policies('NextToken' => next_token).body['DescribePoliciesResult']
+            result = service.describe_policies('NextToken' => next_token).body['DescribePoliciesResult']
             data += result['ScalingPolicies']
             next_token = result['NextToken']
             break if next_token.nil?
@@ -24,7 +24,7 @@ module Fog
         end
 
         def get(identity, auto_scaling_group = nil)
-          data = connection.describe_policies('PolicyNames' => identity, 'AutoScalingGroupName' => auto_scaling_group).body['DescribePoliciesResult']['ScalingPolicies'].first
+          data = service.describe_policies('PolicyNames' => identity, 'AutoScalingGroupName' => auto_scaling_group).body['DescribePoliciesResult']['ScalingPolicies'].first
           new(data) unless data.nil?
         end
       end
diff --git a/lib/fog/aws/models/auto_scaling/policy.rb b/lib/fog/aws/models/auto_scaling/policy.rb
index 1204cd2c3..780eb71de 100644
--- a/lib/fog/aws/models/auto_scaling/policy.rb
+++ b/lib/fog/aws/models/auto_scaling/policy.rb
@@ -31,14 +31,14 @@ module Fog
           options = Hash[self.class.aliases.map { |key, value| [key, send(value)] }]
           options.delete_if { |key, value| value.nil? }
 
-          connection.put_scaling_policy(adjustment_type, auto_scaling_group_name, id, scaling_adjustment, options)
+          service.put_scaling_policy(adjustment_type, auto_scaling_group_name, id, scaling_adjustment, options)
           reload
         end
 
         def destroy
           requires :id
           requires :auto_scaling_group_name
-          connection.delete_policy(auto_scaling_group_name, id)
+          service.delete_policy(auto_scaling_group_name, id)
         end
       end
     end
diff --git a/lib/fog/aws/models/beanstalk/application.rb b/lib/fog/aws/models/beanstalk/application.rb
index 84f80ceef..296603bdc 100644
--- a/lib/fog/aws/models/beanstalk/application.rb
+++ b/lib/fog/aws/models/beanstalk/application.rb
@@ -18,27 +18,27 @@ module Fog
 
         def environments
           requires :name
-          connection.environments.all({'ApplicationName' => name})
+          service.environments.all({'ApplicationName' => name})
         end
 
         def events
           requires :name
-          connection.events.all({'ApplicationName' => name})
+          service.events.all({'ApplicationName' => name})
         end
 
         def templates
           requires :name
-          connection.templates.all({'ApplicationName' => name})
+          service.templates.all({'ApplicationName' => name})
         end
 
         def versions
           requires :name
-          connection.versions.all({'ApplicationName' => name})
+          service.versions.all({'ApplicationName' => name})
         end
 
         def destroy
           requires :name
-          connection.delete_application(name)
+          service.delete_application(name)
           true
         end
 
@@ -50,7 +50,7 @@ module Fog
           }
           options['Description'] = description unless description.nil?
 
-          data = connection.create_application(options).body['CreateApplicationResult']['Application']
+          data = service.create_application(options).body['CreateApplicationResult']['Application']
           merge_attributes(data)
           true
         end
@@ -59,4 +59,4 @@ module Fog
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/aws/models/beanstalk/applications.rb b/lib/fog/aws/models/beanstalk/applications.rb
index 9685315b2..e465ab4fc 100644
--- a/lib/fog/aws/models/beanstalk/applications.rb
+++ b/lib/fog/aws/models/beanstalk/applications.rb
@@ -9,12 +9,12 @@ module Fog
         model Fog::AWS::ElasticBeanstalk::Application
 
         def all(application_names=[])
-          data = connection.describe_applications(application_names).body['DescribeApplicationsResult']['Applications']
+          data = service.describe_applications(application_names).body['DescribeApplicationsResult']['Applications']
           load(data) # data is an array of attribute hashes
         end
 
         def get(application_name)
-          if data = connection.describe_applications([application_name]).body['DescribeApplicationsResult']['Applications'].first
+          if data = service.describe_applications([application_name]).body['DescribeApplicationsResult']['Applications'].first
             new(data)
           end
         end
diff --git a/lib/fog/aws/models/beanstalk/environment.rb b/lib/fog/aws/models/beanstalk/environment.rb
index 7e84cfc3e..eef6b427d 100644
--- a/lib/fog/aws/models/beanstalk/environment.rb
+++ b/lib/fog/aws/models/beanstalk/environment.rb
@@ -40,7 +40,7 @@ module Fog
         # Returns the current live resources for this environment
         def live_resources
           requires :id
-          data = connection.describe_environment_resources({'EnvironmentId' => id}).body['DescribeEnvironmentResourcesResult']['EnvironmentResources']
+          data = service.describe_environment_resources({'EnvironmentId' => id}).body['DescribeEnvironmentResourcesResult']['EnvironmentResources']
           data.delete('EnvironmentName') # Delete the environment name from the result, only return actual resources
           data
         end
@@ -54,26 +54,26 @@ module Fog
         # Return events related to this version
         def events
           requires :id
-          connection.events.all({'EnvironmentId' => id})
+          service.events.all({'EnvironmentId' => id})
         end
 
         # Restarts the app servers in this environment
         def restart_app_server
           requires :id
-          connection.restart_app_server({'EnvironmentId' => id})
+          service.restart_app_server({'EnvironmentId' => id})
           reload
         end
 
         # Rebuilds the environment
         def rebuild
           requires :id
-          connection.rebuild_environment({'EnvironmentId' => id})
+          service.rebuild_environment({'EnvironmentId' => id})
           reload
         end
 
         def swap_cnames(source)
           requires :name
-          connection.swap_environment_cnames({
+          service.swap_environment_cnames({
               'SourceEnvironmentName' => source.name,
               'DestinationEnvironmentName' => name
                                              })
@@ -84,7 +84,7 @@ module Fog
         # Return the version object for this environment
         def version
           requires :application_name, :version_label
-          connection.versions.get(application_name, version_label)
+          service.versions.get(application_name, version_label)
         end
 
         # Update the running version of this environment
@@ -102,7 +102,7 @@ module Fog
             raise "Version label not specified."
           end
 
-          data = connection.update_environment({
+          data = service.update_environment({
               'EnvironmentId' => id,
               'VersionLabel' => new_version_label
                                         }).body['UpdateEnvironmentResult']
@@ -112,7 +112,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.terminate_environment({'EnvironmentId' => id})
+          service.terminate_environment({'EnvironmentId' => id})
           true
         end
 
@@ -133,7 +133,7 @@ module Fog
           }
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.create_environment(options).body['CreateEnvironmentResult']
+          data = service.create_environment(options).body['CreateEnvironmentResult']
           merge_attributes(data)
           true
         end
@@ -142,4 +142,4 @@ module Fog
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/aws/models/beanstalk/environments.rb b/lib/fog/aws/models/beanstalk/environments.rb
index 657b8d8be..5bac15e7b 100644
--- a/lib/fog/aws/models/beanstalk/environments.rb
+++ b/lib/fog/aws/models/beanstalk/environments.rb
@@ -9,7 +9,7 @@ module Fog
         model Fog::AWS::ElasticBeanstalk::Environment
 
         def all(options={})
-          data = connection.describe_environments(options).body['DescribeEnvironmentsResult']['Environments']
+          data = service.describe_environments(options).body['DescribeEnvironmentsResult']['Environments']
           load(data) # data is an array of attribute hashes
         end
 
@@ -18,7 +18,7 @@ module Fog
         def get(environment_name)
           options = { 'EnvironmentNames' => [environment_name] }
 
-          if data = connection.describe_environments(options).body['DescribeEnvironmentsResult']['Environments'].first
+          if data = service.describe_environments(options).body['DescribeEnvironmentsResult']['Environments'].first
             new(data)
           end
         end
diff --git a/lib/fog/aws/models/beanstalk/events.rb b/lib/fog/aws/models/beanstalk/events.rb
index f15ec2544..a1a4dfaab 100644
--- a/lib/fog/aws/models/beanstalk/events.rb
+++ b/lib/fog/aws/models/beanstalk/events.rb
@@ -9,7 +9,7 @@ module Fog
         model Fog::AWS::ElasticBeanstalk::Event
 
         def all(options={})
-          data = connection.describe_events(options).body['DescribeEventsResult']['Events']
+          data = service.describe_events(options).body['DescribeEventsResult']['Events']
           load(data) # data is an array of attribute hashes
         end
 
diff --git a/lib/fog/aws/models/beanstalk/template.rb b/lib/fog/aws/models/beanstalk/template.rb
index d395a6337..0d56b89c5 100644
--- a/lib/fog/aws/models/beanstalk/template.rb
+++ b/lib/fog/aws/models/beanstalk/template.rb
@@ -24,7 +24,7 @@ module Fog
         # Returns an array of options that may be set on this template
         def options
           requires :name, :application_name
-          data = connection.describe_configuration_options({
+          data = service.describe_configuration_options({
               'ApplicationName' => application_name,
               'TemplateName' => name
                                                     })
@@ -33,7 +33,7 @@ module Fog
 
         def destroy
           requires :name, :application_name
-          connection.delete_configuration_template(application_name, name)
+          service.delete_configuration_template(application_name, name)
           true
         end
 
@@ -51,7 +51,7 @@ module Fog
           }
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.create_configuration_template(options).body['CreateConfigurationTemplateResult']
+          data = service.create_configuration_template(options).body['CreateConfigurationTemplateResult']
           merge_attributes(data)
           true
         end
@@ -67,7 +67,7 @@ module Fog
           }
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.update_configuration_template(options).body['UpdateConfigurationTemplateResult']
+          data = service.update_configuration_template(options).body['UpdateConfigurationTemplateResult']
           merge_attributes(data)
           true
         end
@@ -75,4 +75,4 @@ module Fog
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/aws/models/beanstalk/templates.rb b/lib/fog/aws/models/beanstalk/templates.rb
index 45f942945..8e26e7d18 100644
--- a/lib/fog/aws/models/beanstalk/templates.rb
+++ b/lib/fog/aws/models/beanstalk/templates.rb
@@ -21,7 +21,7 @@ module Fog
           # Initialize with empty array
           data = []
 
-          applications = connection.describe_applications(application_filter).body['DescribeApplicationsResult']['Applications']
+          applications = service.describe_applications(application_filter).body['DescribeApplicationsResult']['Applications']
           applications.each { |application|
             application['ConfigurationTemplates'].each { |template_name|
               begin
@@ -29,7 +29,7 @@ module Fog
                     'ApplicationName' => application['ApplicationName'],
                     'TemplateName' => template_name
                 }
-                settings = connection.describe_configuration_settings(options).body['DescribeConfigurationSettingsResult']['ConfigurationSettings']
+                settings = service.describe_configuration_settings(options).body['DescribeConfigurationSettingsResult']['ConfigurationSettings']
                 if settings.length == 1
                   # Add to data
                   data << settings.first
@@ -54,7 +54,7 @@ module Fog
           # There is no describe call for templates, so we must use describe_configuration_settings.  Unfortunately,
           # it throws an exception if template name doesn't exist, which is inconsistent, catch and return nil
           begin
-            data = connection.describe_configuration_settings(options).body['DescribeConfigurationSettingsResult']['ConfigurationSettings']
+            data = service.describe_configuration_settings(options).body['DescribeConfigurationSettingsResult']['ConfigurationSettings']
             if data.length == 1
               result = new(data.first)
             end
diff --git a/lib/fog/aws/models/beanstalk/version.rb b/lib/fog/aws/models/beanstalk/version.rb
index a8a927f96..c67cf5a6d 100644
--- a/lib/fog/aws/models/beanstalk/version.rb
+++ b/lib/fog/aws/models/beanstalk/version.rb
@@ -20,7 +20,7 @@ module Fog
         # Return events related to this version
         def events
           requires :label, :application_name
-          connection.events.all({
+          service.events.all({
                                     'ApplicationName' => application_name,
                                     'VersionLabel' => label
                                 })
@@ -29,7 +29,7 @@ module Fog
         # Returns environments running this version
         def environments
           requires :label, :application_name
-          connection.environments.all({
+          service.environments.all({
                                     'ApplicationName' => application_name,
                                     'VersionLabel' => label
                                 })
@@ -37,7 +37,7 @@ module Fog
 
         def destroy(delete_source_bundle = nil)
           requires :label, :application_name
-          connection.delete_application_version(application_name, label, delete_source_bundle)
+          service.delete_application_version(application_name, label, delete_source_bundle)
           true
         end
 
@@ -53,7 +53,7 @@ module Fog
           }
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.create_application_version(options).body['CreateApplicationVersionResult']['ApplicationVersion']
+          data = service.create_application_version(options).body['CreateApplicationVersionResult']['ApplicationVersion']
           merge_attributes(data)
           true
         end
@@ -69,11 +69,11 @@ module Fog
           }
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.update_application_version(options).body['UpdateApplicationVersionResult']['ApplicationVersion']
+          data = service.update_application_version(options).body['UpdateApplicationVersionResult']['ApplicationVersion']
           merge_attributes(data)
         end
       end
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/aws/models/beanstalk/versions.rb b/lib/fog/aws/models/beanstalk/versions.rb
index 5f1f57467..c13daf7c8 100644
--- a/lib/fog/aws/models/beanstalk/versions.rb
+++ b/lib/fog/aws/models/beanstalk/versions.rb
@@ -9,12 +9,12 @@ module Fog
         model Fog::AWS::ElasticBeanstalk::Version
 
         def all(options={})
-          data = connection.describe_application_versions(options).body['DescribeApplicationVersionsResult']['ApplicationVersions']
+          data = service.describe_application_versions(options).body['DescribeApplicationVersionsResult']['ApplicationVersions']
           load(data) # data is an array of attribute hashes
         end
 
         def get(application_name, version_label)
-          if data = connection.describe_application_versions({
+          if data = service.describe_application_versions({
                                                                  'ApplicationName' => application_name,
                                                                  'VersionLabels' => [version_label]
                                                              }).body['DescribeApplicationVersionsResult']['ApplicationVersions']
diff --git a/lib/fog/aws/models/cdn/distribution.rb b/lib/fog/aws/models/cdn/distribution.rb
index 875ac4f0c..76e8218b8 100644
--- a/lib/fog/aws/models/cdn/distribution.rb
+++ b/lib/fog/aws/models/cdn/distribution.rb
@@ -37,7 +37,7 @@ module Fog
           @invalidations ||= begin
             Fog::CDN::AWS::Invalidations.new(
               :distribution => self,
-              :connection => connection
+              :service => service
             )
           end
         end
@@ -54,15 +54,15 @@ module Fog
         private
 
         def delete_distribution(identity, etag)
-          connection.delete_distribution(identity, etag)
+          service.delete_distribution(identity, etag)
         end
 
         def put_distribution_config(identity, etag, options)
-          connection.put_distribution_config(identity, etag, options)
+          service.put_distribution_config(identity, etag, options)
         end
 
         def post_distribution(options = {})
-          connection.post_distribution(options)
+          service.post_distribution(options)
         end
 
         def attributes_to_options
diff --git a/lib/fog/aws/models/cdn/distributions.rb b/lib/fog/aws/models/cdn/distributions.rb
index f92cedea4..d18e00a41 100644
--- a/lib/fog/aws/models/cdn/distributions.rb
+++ b/lib/fog/aws/models/cdn/distributions.rb
@@ -16,11 +16,11 @@ module Fog
         attribute :is_truncated,    :aliases => 'IsTruncated'
 
         def get_distribution(dist_id)
-          connection.get_distribution(dist_id)
+          service.get_distribution(dist_id)
         end
 
         def list_distributions(options = {})
-          connection.get_distribution_list(options)
+          service.get_distribution_list(options)
         end
 
         alias :each_distribution_this_page :each
diff --git a/lib/fog/aws/models/cdn/invalidation.rb b/lib/fog/aws/models/cdn/invalidation.rb
index b9d3757dd..faa65e039 100644
--- a/lib/fog/aws/models/cdn/invalidation.rb
+++ b/lib/fog/aws/models/cdn/invalidation.rb
@@ -30,7 +30,7 @@ module Fog
         def save
           requires :paths, :caller_reference
           raise "Submitted invalidation cannot be submitted again" if persisted?
-          response = connection.post_invalidation(distribution.identity, paths, caller_reference)
+          response = service.post_invalidation(distribution.identity, paths, caller_reference)
           merge_attributes(invalidation_to_attributes(response.body))
           true
         end
diff --git a/lib/fog/aws/models/cdn/invalidations.rb b/lib/fog/aws/models/cdn/invalidations.rb
index cab9246dc..050b8dccf 100644
--- a/lib/fog/aws/models/cdn/invalidations.rb
+++ b/lib/fog/aws/models/cdn/invalidations.rb
@@ -21,7 +21,7 @@ module Fog
           options[:max_items]  ||= max_items
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.get_invalidation_list(distribution.identity, options).body
+          data = service.get_invalidation_list(distribution.identity, options).body
 
           merge_attributes(data.reject {|key, value| !['IsTruncated', 'MaxItems', 'NextMarker', 'Marker'].include?(key)})
 
@@ -31,7 +31,7 @@ module Fog
         def get(invalidation_id)
           requires :distribution
 
-          data = connection.get_invalidation(distribution.identity, invalidation_id).body
+          data = service.get_invalidation(distribution.identity, invalidation_id).body
 
           if data
             invalidation = new(data)
diff --git a/lib/fog/aws/models/cdn/streaming_distribution.rb b/lib/fog/aws/models/cdn/streaming_distribution.rb
index f3732e3ae..7008d64b9 100644
--- a/lib/fog/aws/models/cdn/streaming_distribution.rb
+++ b/lib/fog/aws/models/cdn/streaming_distribution.rb
@@ -41,15 +41,15 @@ module Fog
         private
 
         def delete_distribution(identity, etag)
-          connection.delete_streaming_distribution(identity, etag)
+          service.delete_streaming_distribution(identity, etag)
         end
 
         def put_distribution_config(identity, etag, options)
-          connection.put_streaming_distribution_config(identity, etag, options)
+          service.put_streaming_distribution_config(identity, etag, options)
         end
 
         def post_distribution(options = {})
-          connection.post_streaming_distribution(options)
+          service.post_streaming_distribution(options)
         end
 
         def attributes_to_options
diff --git a/lib/fog/aws/models/cdn/streaming_distributions.rb b/lib/fog/aws/models/cdn/streaming_distributions.rb
index d4fcb8839..b084c102a 100644
--- a/lib/fog/aws/models/cdn/streaming_distributions.rb
+++ b/lib/fog/aws/models/cdn/streaming_distributions.rb
@@ -16,11 +16,11 @@ module Fog
         attribute :is_truncated,    :aliases => 'IsTruncated'
 
         def get_distribution(dist_id)
-          connection.get_streaming_distribution(dist_id)
+          service.get_streaming_distribution(dist_id)
         end
 
         def list_distributions(options = {})
-          connection.get_streaming_distribution_list(options)
+          service.get_streaming_distribution_list(options)
         end
 
         alias :each_distribution_this_page :each
diff --git a/lib/fog/aws/models/cloud_watch/alarm.rb b/lib/fog/aws/models/cloud_watch/alarm.rb
index fd9c90dc2..c301bc1d0 100644
--- a/lib/fog/aws/models/cloud_watch/alarm.rb
+++ b/lib/fog/aws/models/cloud_watch/alarm.rb
@@ -46,13 +46,13 @@ module Fog
           options = Hash[self.class.aliases.map { |key, value| [key, send(value)] }]
           options.delete_if { |key, value| value.nil? }
 
-          connection.put_metric_alarm(options)
+          service.put_metric_alarm(options)
           reload
         end
 
         def destroy
           requires :id
-          connection.delete_alarms(id)
+          service.delete_alarms(id)
         end
       end
     end
diff --git a/lib/fog/aws/models/cloud_watch/alarm_data.rb b/lib/fog/aws/models/cloud_watch/alarm_data.rb
index 269452093..add59bf60 100644
--- a/lib/fog/aws/models/cloud_watch/alarm_data.rb
+++ b/lib/fog/aws/models/cloud_watch/alarm_data.rb
@@ -6,33 +6,33 @@ module Fog
     class CloudWatch
       class AlarmData < Fog::Collection
         model Fog::AWS::CloudWatch::AlarmDatum
-        
+
         def all(conditions={})
-          data = connection.describe_alarms(conditions).body['DescribeAlarmsResult']['MetricAlarms']
+          data = service.describe_alarms(conditions).body['DescribeAlarmsResult']['MetricAlarms']
           load(data) # data is an array of attribute hashes
         end
-        
+
         def get(namespace, metric_name, dimensions=nil, period=nil, statistic=nil, unit=nil)
           list_opts = {'Namespace' => namespace, 'MetricName' => metric_name}
           if dimensions
             dimensions_array = dimensions.collect do |name, value|
               {'Name' => name, 'Value' => value}
             end
-            list_opts.merge!('Dimensions' => dimensions_array) 
+            list_opts.merge!('Dimensions' => dimensions_array)
           end
           if period
-            list_opts.merge!('Period' => period) 
+            list_opts.merge!('Period' => period)
           end
           if statistic
-          list_opts.merge!('Statistic' => statistic) 
+          list_opts.merge!('Statistic' => statistic)
           end
           if unit
-            list_opts.merge!('Unit' => unit) 
+            list_opts.merge!('Unit' => unit)
           end
-          data = connection.describe_alarms_for_metric(list_opts).body['DescribeAlarmsForMetricResult']['MetricAlarms']
+          data = service.describe_alarms_for_metric(list_opts).body['DescribeAlarmsForMetricResult']['MetricAlarms']
           load(data)
         end
-        
+
       end
     end
   end
diff --git a/lib/fog/aws/models/cloud_watch/alarm_datum.rb b/lib/fog/aws/models/cloud_watch/alarm_datum.rb
index ea773e010..76ca09f18 100644
--- a/lib/fog/aws/models/cloud_watch/alarm_datum.rb
+++ b/lib/fog/aws/models/cloud_watch/alarm_datum.rb
@@ -16,7 +16,7 @@ module Fog
         attribute :comparison_operator, :aliases => 'ComparisonOperator'
         attribute :state_reason, :aliases => 'StateReason'
         attribute :action_enabled, :aliases => 'ActionsEnabled'
-        attribute :period, :aliases => 'Period' 
+        attribute :period, :aliases => 'Period'
         attribute :evaluation_periods, :aliases => 'EvaluationPeriods'
         attribute :threshold, :aliases => 'Threshold'
         attribute :alarm_actions, :aliases => 'AlarmActions'
@@ -40,7 +40,7 @@ module Fog
               'AlarmName' => alarm_name,
               'ComparisonOperator' => comparison_operator,
               'EvaluationPeriods' => evaluation_periods,
-              'MetricName' => metric_name, 
+              'MetricName' => metric_name,
               'Namespace' => namespace,
               'Period' => period,
               'Statistic' => statistic,
@@ -57,7 +57,7 @@ module Fog
           alarm_definition.merge!('OKActions' => ok_actions) if ok_actions
           alarm_definition.merge!('Unit' => unit) if unit
 
-          connection.put_metric_alarm(alarm_definition)
+          service.put_metric_alarm(alarm_definition)
           true
         end
       end
diff --git a/lib/fog/aws/models/cloud_watch/alarm_histories.rb b/lib/fog/aws/models/cloud_watch/alarm_histories.rb
index 7e4a76f95..93d357d4e 100644
--- a/lib/fog/aws/models/cloud_watch/alarm_histories.rb
+++ b/lib/fog/aws/models/cloud_watch/alarm_histories.rb
@@ -8,7 +8,7 @@ module Fog
         model Fog::AWS::CloudWatch::AlarmHistory
 
         def all(conditions={})
-          data = connection.describe_alarm_history(conditions).body['DescribeAlarmHistoryResult']['AlarmHistoryItems']
+          data = service.describe_alarm_history(conditions).body['DescribeAlarmHistoryResult']['AlarmHistoryItems']
           load(data) # data is an array of attribute hashes
         end
 
diff --git a/lib/fog/aws/models/cloud_watch/alarms.rb b/lib/fog/aws/models/cloud_watch/alarms.rb
index 57e4df30b..834bfaf4a 100644
--- a/lib/fog/aws/models/cloud_watch/alarms.rb
+++ b/lib/fog/aws/models/cloud_watch/alarms.rb
@@ -12,7 +12,7 @@ module Fog
           data = []
           next_token = nil
           loop do
-            result = connection.describe_alarms('NextToken' => next_token).body['DescribeAlarmsResult']
+            result = service.describe_alarms('NextToken' => next_token).body['DescribeAlarmsResult']
             data += result['MetricAlarms']
             next_token = result['NextToken']
             break if next_token.nil?
@@ -21,23 +21,23 @@ module Fog
         end
 
         def get(identity)
-          data = connection.describe_alarms('AlarmNames' => identity).body['DescribeAlarmsResult']['MetricAlarms'].first
+          data = service.describe_alarms('AlarmNames' => identity).body['DescribeAlarmsResult']['MetricAlarms'].first
           new(data) unless data.nil?
         end
 
         #alarm_names is an array of alarm names
         def delete(alarm_names)
-          connection.delete_alarms(alarm_names)
+          service.delete_alarms(alarm_names)
           true
         end
 
         def disable(alarm_names)
-          connection.disable_alarm_actions(alarm_names)
+          service.disable_alarm_actions(alarm_names)
           true
         end
 
         def enable(alarm_names)
-          connection.enable_alarm_actions(alarm_names)
+          service.enable_alarm_actions(alarm_names)
           true
         end
 
diff --git a/lib/fog/aws/models/cloud_watch/metric_statistic.rb b/lib/fog/aws/models/cloud_watch/metric_statistic.rb
index 6c9850893..5e304567d 100644
--- a/lib/fog/aws/models/cloud_watch/metric_statistic.rb
+++ b/lib/fog/aws/models/cloud_watch/metric_statistic.rb
@@ -17,7 +17,7 @@ module Fog
         attribute :namespace, :aliases => 'Namespace'
         attribute :dimensions, :aliases => 'Dimensions'
         attribute :value
-        
+
         def save
           requires :metric_name
           requires :namespace
@@ -36,7 +36,7 @@ module Fog
               'SampleCount' => sample_count
             })
           end
-          connection.put_metric_data(namespace, [put_opts])
+          service.put_metric_data(namespace, [put_opts])
           true
         end
       end
diff --git a/lib/fog/aws/models/cloud_watch/metric_statistics.rb b/lib/fog/aws/models/cloud_watch/metric_statistics.rb
index 46ff60c2a..fc0bc95e1 100644
--- a/lib/fog/aws/models/cloud_watch/metric_statistics.rb
+++ b/lib/fog/aws/models/cloud_watch/metric_statistics.rb
@@ -6,17 +6,17 @@ module Fog
     class CloudWatch
       class MetricStatistics < Fog::Collection
         model Fog::AWS::CloudWatch::MetricStatistic
-        
+
         def all(conditions)
           metricName = conditions['MetricName']
           namespace = conditions['Namespace']
           dimensions = conditions['Dimensions']
           get_metric_opts = {"StartTime" => (Time.now-3600).iso8601, "EndTime" => Time.now.iso8601, "Period" => 300}.merge(conditions)
-          data = connection.get_metric_statistics(get_metric_opts).body['GetMetricStatisticsResult']['Datapoints']
+          data = service.get_metric_statistics(get_metric_opts).body['GetMetricStatisticsResult']['Datapoints']
           data.collect! { |datum| datum.merge('MetricName' => metricName, 'Namespace' => namespace, 'Dimensions' => dimensions) }
           load(data) # data is an array of attribute hashes
         end
-        
+
       end
     end
   end
diff --git a/lib/fog/aws/models/cloud_watch/metrics.rb b/lib/fog/aws/models/cloud_watch/metrics.rb
index 6dc907960..9df9780f1 100644
--- a/lib/fog/aws/models/cloud_watch/metrics.rb
+++ b/lib/fog/aws/models/cloud_watch/metrics.rb
@@ -11,7 +11,7 @@ module Fog
         model Fog::AWS::CloudWatch::Metric
 
         def all(conditions={})
-          result = connection.list_metrics(conditions).body['ListMetricsResult']
+          result = service.list_metrics(conditions).body['ListMetricsResult']
           merge_attributes("NextToken" => result["NextToken"])
           load(result['Metrics']) # an array of attribute hashes
         end
@@ -28,7 +28,7 @@ module Fog
               subset = subset.all("NextToken" => next_token)
               subset.each_metric_this_page {|m| yield m }
             end
-            
+
             self
           end
         end
@@ -41,7 +41,7 @@ module Fog
             end
             # list_opts.merge!('Dimensions' => dimensions_array)
           end
-          if data = connection.list_metrics(list_opts).body['ListMetricsResult']['Metrics'].first
+          if data = service.list_metrics(list_opts).body['ListMetricsResult']['Metrics'].first
             new(data)
           end
         end
diff --git a/lib/fog/aws/models/compute/address.rb b/lib/fog/aws/models/compute/address.rb
index 39c45bd08..cfac804eb 100644
--- a/lib/fog/aws/models/compute/address.rb
+++ b/lib/fog/aws/models/compute/address.rb
@@ -22,7 +22,7 @@ module Fog
         def destroy
           requires :public_ip
 
-          connection.release_address(allocation_id || public_ip)
+          service.release_address(allocation_id || public_ip)
           true
         end
 
@@ -35,12 +35,12 @@ module Fog
         end
 
         def server
-          connection.servers.get(server_id)
+          service.servers.get(server_id)
         end
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
-          data = connection.allocate_address(domain).body
+          data = service.allocate_address(domain).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           if @server
@@ -57,7 +57,7 @@ module Fog
           else
             @server = nil
             self.server_id = new_server.id
-            connection.associate_address(server_id, public_ip, network_interface_id, allocation_id)
+            service.associate_address(server_id, public_ip, network_interface_id, allocation_id)
           end
         end
 
@@ -65,7 +65,7 @@ module Fog
           @server = nil
           self.server_id = nil
           if persisted?
-            connection.disassociate_address(public_ip)
+            service.disassociate_address(public_ip)
           end
         end
 
diff --git a/lib/fog/aws/models/compute/addresses.rb b/lib/fog/aws/models/compute/addresses.rb
index 9af58bd04..5563aa956 100644
--- a/lib/fog/aws/models/compute/addresses.rb
+++ b/lib/fog/aws/models/compute/addresses.rb
@@ -60,7 +60,7 @@ module Fog
             filters = {'public-ip' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_addresses(filters).body
+          data = service.describe_addresses(filters).body
           load(
             data['addressesSet'].map do |address|
               address.reject {|key, value| value.nil? || value.empty? }
@@ -81,7 +81,7 @@ module Fog
 
         def get(public_ip)
           if public_ip
-            self.class.new(:connection => connection).all('public-ip' => public_ip).first
+            self.class.new(:service => service).all('public-ip' => public_ip).first
           end
         end
 
diff --git a/lib/fog/aws/models/compute/dhcp_option.rb b/lib/fog/aws/models/compute/dhcp_option.rb
index 90d777a0c..d3ec4473c 100644
--- a/lib/fog/aws/models/compute/dhcp_option.rb
+++ b/lib/fog/aws/models/compute/dhcp_option.rb
@@ -24,7 +24,7 @@ module Fog
         #
         def associate(vpc_id)
           requires :id
-          connection.attach_dhcp_option(id, vpc_id)
+          service.attach_dhcp_option(id, vpc_id)
           #reload
         end
 
@@ -39,7 +39,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_dhcp_options(id)
+          service.delete_dhcp_options(id)
           true
         end
 
@@ -55,7 +55,7 @@ module Fog
 
         def save
           requires :dhcp_configuration_set
-          data = connection.create_dhcp_options(dhcp_configuration_set).body['dhcpOptionsSet'].first
+          data = service.create_dhcp_options(dhcp_configuration_set).body['dhcpOptionsSet'].first
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true
diff --git a/lib/fog/aws/models/compute/dhcp_options.rb b/lib/fog/aws/models/compute/dhcp_options.rb
index 418341499..5e67f8b45 100644
--- a/lib/fog/aws/models/compute/dhcp_options.rb
+++ b/lib/fog/aws/models/compute/dhcp_options.rb
@@ -59,7 +59,7 @@ module Fog
             filters = {'dhcp-options-id' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_dhcp_options(filters).body
+          data = service.describe_dhcp_options(filters).body
           load(data['dhcpOptionsSet'])
         end
 
@@ -80,7 +80,7 @@ module Fog
 
         def get(dhcp_options_id)
           if dhcp_options_id
-            self.class.new(:connection => connection).all('dhcp-options-id' => dhcp_options_id).first
+            self.class.new(:service => service).all('dhcp-options-id' => dhcp_options_id).first
           end
         end
 
diff --git a/lib/fog/aws/models/compute/flavors.rb b/lib/fog/aws/models/compute/flavors.rb
index 17d36d0a2..d909bea02 100644
--- a/lib/fog/aws/models/compute/flavors.rb
+++ b/lib/fog/aws/models/compute/flavors.rb
@@ -177,7 +177,7 @@ module Fog
         #
 
         def get(flavor_id)
-          self.class.new(:connection => connection).all.detect {|flavor| flavor.id == flavor_id}
+          self.class.new(:service => service).all.detect {|flavor| flavor.id == flavor_id}
         end
 
       end
diff --git a/lib/fog/aws/models/compute/image.rb b/lib/fog/aws/models/compute/image.rb
index 7bd2b5908..783a4d71e 100644
--- a/lib/fog/aws/models/compute/image.rb
+++ b/lib/fog/aws/models/compute/image.rb
@@ -27,11 +27,11 @@ module Fog
         attribute :name
 
         def deregister(delete_snapshot = false)
-          connection.deregister_image(id)
+          service.deregister_image(id)
 
           if(delete_snapshot && root_device_type == "ebs")
             block_device = block_device_mapping.detect {|block_device| block_device['deviceName'] == root_device_name}
-            @connection.snapshots.new(:id => block_device['snapshotId']).destroy
+            service.snapshots.new(:id => block_device['snapshotId']).destroy
           else
             true
           end
diff --git a/lib/fog/aws/models/compute/images.rb b/lib/fog/aws/models/compute/images.rb
index cba592266..ece512e8a 100644
--- a/lib/fog/aws/models/compute/images.rb
+++ b/lib/fog/aws/models/compute/images.rb
@@ -10,7 +10,7 @@ module Fog
         attribute :filters
 
         model Fog::Compute::AWS::Image
-        
+
         # Creates a new Amazon machine image
         #
         # AWS.images.new
@@ -38,7 +38,7 @@ module Fog
         #    tags=nil
         #  >
         #
-        
+
         def initialize(attributes)
           self.filters ||= {}
           super
@@ -46,13 +46,13 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          data = connection.describe_images(filters).body
+          data = service.describe_images(filters).body
           load(data['imagesSet'])
         end
-        
+
         def get(image_id)
           if image_id
-            self.class.new(:connection => connection).all('image-id' => image_id).first
+            self.class.new(:service => service).all('image-id' => image_id).first
           end
         end
       end
diff --git a/lib/fog/aws/models/compute/internet_gateway.rb b/lib/fog/aws/models/compute/internet_gateway.rb
index 0627f7cd0..3dc416d47 100644
--- a/lib/fog/aws/models/compute/internet_gateway.rb
+++ b/lib/fog/aws/models/compute/internet_gateway.rb
@@ -24,7 +24,7 @@ module Fog
         #
         def attach(vpc_id)
           requires :id
-          connection.attach_internet_gateway(id, vpc_id)
+          service.attach_internet_gateway(id, vpc_id)
           reload
         end
 
@@ -38,7 +38,7 @@ module Fog
         #
         def detach(vpc_id)
           requires :id
-          connection.detach_internet_gateway(id, vpc_id)
+          service.detach_internet_gateway(id, vpc_id)
           reload
         end
 
@@ -54,7 +54,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.delete_internet_gateway(id)
+          service.delete_internet_gateway(id)
           true
         end
 
@@ -68,7 +68,7 @@ module Fog
         # requestId and a internetGateway object
         #
         def save
-          data = connection.create_internet_gateway.body['internetGatewaySet'].first
+          data = service.create_internet_gateway.body['internetGatewaySet'].first
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true
diff --git a/lib/fog/aws/models/compute/internet_gateways.rb b/lib/fog/aws/models/compute/internet_gateways.rb
index 50602a189..cc687f3d9 100644
--- a/lib/fog/aws/models/compute/internet_gateways.rb
+++ b/lib/fog/aws/models/compute/internet_gateways.rb
@@ -59,7 +59,7 @@ module Fog
             filters = {'internet-gateway-id' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_internet_gateways(filters).body
+          data = service.describe_internet_gateways(filters).body
           load(data['internetGatewaySet'])
         end
 
@@ -80,7 +80,7 @@ module Fog
 
         def get(internet_gateway_id)
           if internet_gateway_id
-            self.class.new(:connection => connection).all('internet-gateway-id' => internet_gateway_id).first
+            self.class.new(:service => service).all('internet-gateway-id' => internet_gateway_id).first
           end
         end
 
diff --git a/lib/fog/aws/models/compute/key_pair.rb b/lib/fog/aws/models/compute/key_pair.rb
index 144118bab..3cc35d39b 100644
--- a/lib/fog/aws/models/compute/key_pair.rb
+++ b/lib/fog/aws/models/compute/key_pair.rb
@@ -16,7 +16,7 @@ module Fog
         def destroy
           requires :name
 
-          connection.delete_key_pair(name)
+          service.delete_key_pair(name)
           true
         end
 
@@ -24,9 +24,9 @@ module Fog
           requires :name
 
           data = if public_key
-            connection.import_key_pair(name, public_key).body
+            service.import_key_pair(name, public_key).body
           else
-            connection.create_key_pair(name).body
+            service.create_key_pair(name).body
           end
           new_attributes = data.reject {|key,value| !['keyFingerprint', 'keyMaterial', 'keyName'].include?(key)}
           merge_attributes(new_attributes)
@@ -35,7 +35,7 @@ module Fog
         end
 
         def write(path="#{ENV['HOME']}/.ssh/fog_#{Fog.credential.to_s}_#{name}.pem")
-          
+
           if writable?
             split_private_key = private_key.split(/\n/)
             File.open(path, "w") do |f|
diff --git a/lib/fog/aws/models/compute/key_pairs.rb b/lib/fog/aws/models/compute/key_pairs.rb
index 25e885ab7..2e326606c 100644
--- a/lib/fog/aws/models/compute/key_pairs.rb
+++ b/lib/fog/aws/models/compute/key_pairs.rb
@@ -55,7 +55,7 @@ module Fog
             filters = {'key-name' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_key_pairs(filters).body
+          data = service.describe_key_pairs(filters).body
           load(data['keySet'])
         end
 
@@ -77,7 +77,7 @@ module Fog
 
         def get(key_name)
           if key_name
-            self.class.new(:connection => connection).all('key-name' => key_name).first
+            self.class.new(:service => service).all('key-name' => key_name).first
           end
         end
 
diff --git a/lib/fog/aws/models/compute/network_interface.rb b/lib/fog/aws/models/compute/network_interface.rb
index 93a79800c..225607fe0 100644
--- a/lib/fog/aws/models/compute/network_interface.rb
+++ b/lib/fog/aws/models/compute/network_interface.rb
@@ -7,7 +7,7 @@ module Fog
       class NetworkInterface < Fog::Model
 
         identity  :network_interface_id,        :aliases => 'networkInterfaceId'
-        attribute :state     
+        attribute :state
         attribute :request_id,                  :aliases => 'requestId'
         attribute :network_interface_id,        :aliases => 'networkInterfaceId'
         attribute :subnet_id,                   :aliases => 'subnetId'
@@ -40,7 +40,7 @@ module Fog
         def destroy
           requires :network_interface_id
 
-          connection.delete_network_interface(network_interface_id)
+          service.delete_network_interface(network_interface_id)
           true
         end
 
@@ -58,7 +58,7 @@ module Fog
 
         def save
           requires :subnet_id
-          data = connection.create_network_interface(subnet_id).body['networkInterface']
+          data = service.create_network_interface(subnet_id).body['networkInterface']
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true
diff --git a/lib/fog/aws/models/compute/network_interfaces.rb b/lib/fog/aws/models/compute/network_interfaces.rb
index f76934155..8e022dc7a 100644
--- a/lib/fog/aws/models/compute/network_interfaces.rb
+++ b/lib/fog/aws/models/compute/network_interfaces.rb
@@ -88,7 +88,7 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          data = connection.describe_network_interfaces(filters).body
+          data = service.describe_network_interfaces(filters).body
           load(data['networkInterfaceSet'])
         end
 
@@ -126,7 +126,7 @@ module Fog
 
         def get(nic_id)
           if nic_id
-            self.class.new(:connection => connection).all('network-interface-id' => nic_id).first
+            self.class.new(:service => service).all('network-interface-id' => nic_id).first
           end
         end
       end
diff --git a/lib/fog/aws/models/compute/security_group.rb b/lib/fog/aws/models/compute/security_group.rb
index a2202930d..94043dde4 100644
--- a/lib/fog/aws/models/compute/security_group.rb
+++ b/lib/fog/aws/models/compute/security_group.rb
@@ -45,7 +45,7 @@ module Fog
 
           requires_one :name, :group_id
 
-          connection.authorize_security_group_ingress(
+          service.authorize_security_group_ingress(
             name,
             'GroupId'                    => group_id,
             'SourceSecurityGroupName'    => group,
@@ -101,7 +101,7 @@ module Fog
             ]
           end
 
-          connection.authorize_security_group_ingress(
+          service.authorize_security_group_ingress(
             name,
             'GroupId'       => group_id,
             'IpPermissions' => [ ip_permission ]
@@ -121,9 +121,9 @@ module Fog
           requires_one :name, :group_id
 
           if group_id.nil?
-            connection.delete_security_group(name)
+            service.delete_security_group(name)
           else
-            connection.delete_security_group(nil, group_id)
+            service.delete_security_group(nil, group_id)
           end
           true
         end
@@ -159,7 +159,7 @@ module Fog
 
           requires_one :name, :group_id
 
-          connection.revoke_security_group_ingress(
+          service.revoke_security_group_ingress(
             name,
             'GroupId'                    => group_id,
             'SourceSecurityGroupName'    => group,
@@ -215,7 +215,7 @@ module Fog
             ]
           end
 
-          connection.revoke_security_group_ingress(
+          service.revoke_security_group_ingress(
             name,
             'GroupId'       => group_id,
             'IpPermissions' => [ ip_permission ]
@@ -235,7 +235,7 @@ module Fog
 
         def save
           requires :description, :name
-          data = connection.create_security_group(name, description, vpc_id).body
+          data = service.create_security_group(name, description, vpc_id).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true
diff --git a/lib/fog/aws/models/compute/security_groups.rb b/lib/fog/aws/models/compute/security_groups.rb
index 53ec48286..263ecc81a 100644
--- a/lib/fog/aws/models/compute/security_groups.rb
+++ b/lib/fog/aws/models/compute/security_groups.rb
@@ -63,7 +63,7 @@ module Fog
             filters = {'group-name' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_security_groups(filters).body
+          data = service.describe_security_groups(filters).body
           load(data['securityGroupInfo'])
         end
 
@@ -87,7 +87,7 @@ module Fog
 
         def get(group_name)
           if group_name
-            self.class.new(:connection => connection).all('group-name' => group_name).first
+            self.class.new(:service => service).all('group-name' => group_name).first
           end
         end
 
@@ -110,7 +110,7 @@ module Fog
 
         def get_by_id(group_id)
           if group_id
-            self.class.new(:connection => connection).all('group-id' => group_id).first
+            self.class.new(:service => service).all('group-id' => group_id).first
           end
         end
       end
diff --git a/lib/fog/aws/models/compute/server.rb b/lib/fog/aws/models/compute/server.rb
index e77d03505..4d68be397 100644
--- a/lib/fog/aws/models/compute/server.rb
+++ b/lib/fog/aws/models/compute/server.rb
@@ -53,9 +53,13 @@ module Fog
         def initialize(attributes={})
           self.groups     ||= ["default"] unless (attributes[:subnet_id] || attributes[:security_group_ids])
           self.flavor_id  ||= 't1.micro'
+
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
+
           self.image_id   ||= begin
             self.username = 'ubuntu'
-            case attributes[:connection].instance_variable_get(:@region) # Ubuntu 10.04 LTS 64bit (EBS)
+            case @service.instance_variable_get(:@region) # Ubuntu 10.04 LTS 64bit (EBS)
             when 'ap-northeast-1'
               'ami-5e0fa45f'
             when 'ap-southeast-1'
@@ -80,19 +84,19 @@ module Fog
         def addresses
           requires :id
 
-          connection.addresses(:server => self)
+          service.addresses(:server => self)
         end
 
         def console_output
           requires :id
 
-          connection.get_console_output(id)
+          service.get_console_output(id)
         end
 
         def destroy
           requires :id
 
-          connection.terminate_instances(id)
+          service.terminate_instances(id)
           true
         end
 
@@ -106,13 +110,13 @@ module Fog
         end
 
         def flavor
-          @flavor ||= connection.flavors.all.detect {|flavor| flavor.id == flavor_id}
+          @flavor ||= service.flavors.all.detect {|flavor| flavor.id == flavor_id}
         end
 
         def key_pair
           requires :key_name
 
-          connection.key_pairs.all(key_name).first
+          service.key_pairs.all(key_name).first
         end
 
         def key_pair=(new_keypair)
@@ -125,7 +129,7 @@ module Fog
 
         def reboot
           requires :id
-          connection.reboot_instances(id)
+          service.reboot_instances(id)
           true
         end
 
@@ -166,14 +170,14 @@ module Fog
             options.delete('SubnetId')
           end
 
-          data = connection.run_instances(image_id, 1, 1, options)
+          data = service.run_instances(image_id, 1, 1, options)
           merge_attributes(data.body['instancesSet'].first)
 
           if tags = self.tags
             # expect eventual consistency
             Fog.wait_for { self.reload rescue nil }
             for key, value in (self.tags = tags)
-              connection.tags.create(
+              service.tags.create(
                 :key          => key,
                 :resource_id  => self.identity,
                 :value        => value
@@ -205,19 +209,19 @@ module Fog
 
         def start
           requires :id
-          connection.start_instances(id)
+          service.start_instances(id)
           true
         end
 
         def stop(force = false)
           requires :id
-          connection.stop_instances(id, force)
+          service.stop_instances(id, force)
           true
         end
 
         def volumes
           requires :id
-          connection.volumes(:server => self)
+          service.volumes(:server => self)
         end
 
         #I tried to call it monitoring= and be smart with attributes[]
@@ -227,9 +231,9 @@ module Fog
           if persisted?
             case new_monitor
             when true
-              response = connection.monitor_instances(identity)
+              response = service.monitor_instances(identity)
             when false
-              response = connection.unmonitor_instances(identity)
+              response = service.unmonitor_instances(identity)
             else
               raise ArgumentError.new("only Boolean allowed here")
             end
diff --git a/lib/fog/aws/models/compute/servers.rb b/lib/fog/aws/models/compute/servers.rb
index ee93c7e5c..fe71ff555 100644
--- a/lib/fog/aws/models/compute/servers.rb
+++ b/lib/fog/aws/models/compute/servers.rb
@@ -61,7 +61,7 @@ module Fog
             filters = {'instance-id' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_instances(filters).body
+          data = service.describe_instances(filters).body
           load(
             data['reservationSet'].map do |reservation|
               reservation['instancesSet'].map do |instance|
@@ -72,13 +72,13 @@ module Fog
         end
 
         def bootstrap(new_attributes = {})
-          server = connection.servers.new(new_attributes)
+          server = service.servers.new(new_attributes)
 
           unless new_attributes[:key_name]
             # first or create fog_#{credential} keypair
             name = Fog.respond_to?(:credential) && Fog.credential || :default
-            unless server.key_pair = connection.key_pairs.get("fog_#{name}")
-              server.key_pair = connection.key_pairs.create(
+            unless server.key_pair = service.key_pairs.get("fog_#{name}")
+              server.key_pair = service.key_pairs.create(
                 :name => "fog_#{name}",
                 :public_key => server.public_key
               )
@@ -86,7 +86,7 @@ module Fog
           end
 
           # make sure port 22 is open in the first security group
-          security_group = connection.security_groups.get(server.groups.first)
+          security_group = service.security_groups.get(server.groups.first)
           authorized = security_group.ip_permissions.detect do |ip_permission|
             ip_permission['ipRanges'].first && ip_permission['ipRanges'].first['cidrIp'] == '0.0.0.0/0' &&
             ip_permission['fromPort'] == 22 &&
@@ -145,7 +145,7 @@ module Fog
 
         def get(server_id)
           if server_id
-            self.class.new(:connection => connection).all('instance-id' => server_id).first
+            self.class.new(:service => service).all('instance-id' => server_id).first
           end
         rescue Fog::Errors::NotFound
           nil
diff --git a/lib/fog/aws/models/compute/snapshot.rb b/lib/fog/aws/models/compute/snapshot.rb
index 21d1078a9..be0a45af1 100644
--- a/lib/fog/aws/models/compute/snapshot.rb
+++ b/lib/fog/aws/models/compute/snapshot.rb
@@ -20,7 +20,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.delete_snapshot(id)
+          service.delete_snapshot(id)
           true
         end
 
@@ -32,7 +32,7 @@ module Fog
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :volume_id
 
-          data = connection.create_snapshot(volume_id, description).body
+          data = service.create_snapshot(volume_id, description).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true
@@ -40,7 +40,7 @@ module Fog
 
         def volume
           requires :id
-          connection.describe_volumes(volume_id)
+          service.describe_volumes(volume_id)
         end
 
         private
diff --git a/lib/fog/aws/models/compute/snapshots.rb b/lib/fog/aws/models/compute/snapshots.rb
index 5e751a9f1..0b97dbba4 100644
--- a/lib/fog/aws/models/compute/snapshots.rb
+++ b/lib/fog/aws/models/compute/snapshots.rb
@@ -23,17 +23,17 @@ module Fog
             filters = {'snapshot-id' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_snapshots(filters.merge!(options)).body
+          data = service.describe_snapshots(filters.merge!(options)).body
           load(data['snapshotSet'])
           if volume
             self.replace(self.select {|snapshot| snapshot.volume_id == volume.id})
           end
           self
         end
-        
+
         def get(snapshot_id)
           if snapshot_id
-            self.class.new(:connection => connection).all('snapshot-id' => snapshot_id).first
+            self.class.new(:service => service).all('snapshot-id' => snapshot_id).first
           end
         end
 
diff --git a/lib/fog/aws/models/compute/spot_request.rb b/lib/fog/aws/models/compute/spot_request.rb
index 35b6250d2..afd73fb2c 100644
--- a/lib/fog/aws/models/compute/spot_request.rb
+++ b/lib/fog/aws/models/compute/spot_request.rb
@@ -3,7 +3,7 @@ require 'fog/compute/models/server'
 module Fog
   module Compute
     class AWS
-      
+
       class SpotRequest < Fog::Compute::Server
 
         identity :id,                          :aliases => 'spotInstanceRequestId'
@@ -37,13 +37,16 @@ module Fog
 
         attr_writer   :iam_instance_profile_name, :iam_instance_profile_arn
 
-        
         def initialize(attributes={})
           self.groups ||= ["default"]
           self.flavor_id ||= 't1.micro'
           self.image_id   ||= begin
             self.username = 'ubuntu'
-            case attributes[:connection].instance_variable_get(:@region) # Ubuntu 10.04 LTS 64bit (EBS)
+
+            # Old 'connection' is renamed as service and should be used instead
+            prepare_service_value(attributes)
+
+            case @service.instance_variable_get(:@region) # Ubuntu 10.04 LTS 64bit (EBS)
             when 'ap-northeast-1'
               'ami-5e0fa45f'
             when 'ap-southeast-1'
@@ -62,14 +65,14 @@ module Fog
         def destroy
           requires :id
 
-          connection.cancel_spot_instance_requests(id)
+          service.cancel_spot_instance_requests(id)
           true
         end
 
         def key_pair
           requires :key_name
 
-          connection.key_pairs.all(key_name).first
+          service.key_pairs.all(key_name).first
         end
 
         def key_pair=(new_keypair)
@@ -100,7 +103,7 @@ module Fog
             'ValidFrom'                                      => valid_from,
             'ValidUntil'                                     => valid_until }
           options.delete_if {|key, value| value.nil?}
-          
+
           # If subnet is defined then this is a Virtual Private Cloud.
           # subnet & security group cannot co-exist. Attempting to specify
           # both subnet and groups will cause an error.  Instead please make
@@ -111,7 +114,7 @@ module Fog
             options.delete('LaunchSpecification.SubnetId')
           end
 
-          data = connection.request_spot_instances(image_id, flavor_id, price, options).body
+          data = service.request_spot_instances(image_id, flavor_id, price, options).body
           spot_instance_request = data['spotInstanceRequestSet'].first
           spot_instance_request['launchSpecification'].each do |name,value|
             spot_instance_request['LaunchSpecification.' + name[0,1].upcase + name[1..-1]] = value
@@ -124,4 +127,4 @@ module Fog
       end
     end
   end
-end     
+end
diff --git a/lib/fog/aws/models/compute/spot_requests.rb b/lib/fog/aws/models/compute/spot_requests.rb
index 248ee43eb..ff9d07eb7 100644
--- a/lib/fog/aws/models/compute/spot_requests.rb
+++ b/lib/fog/aws/models/compute/spot_requests.rb
@@ -5,9 +5,9 @@ module Fog
   module Compute
     class AWS
       class SpotRequests < Fog::Collection
-      
+
         attribute :filters
-        
+
         model Fog::Compute::AWS::SpotRequest
 
         def initialize(attributes)
@@ -21,7 +21,7 @@ module Fog
             filters = {'spot-instance-request-id' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_spot_instance_requests(filters).body
+          data = service.describe_spot_instance_requests(filters).body
           load(
             data['spotInstanceRequestSet'].map do |spot_instance_request|
               spot_instance_request['LaunchSpecification.Placement.AvailabilityZone'] = spot_instance_request['launchedAvailabilityZone']
@@ -29,19 +29,19 @@ module Fog
                 spot_instance_request['LaunchSpecification.' + name[0,1].upcase + name[1..-1]] = value
               end
               spot_instance_request.merge(:groups => spot_instance_request['LaunchSpecification.GroupSet'])
-              spot_instance_request 
+              spot_instance_request
             end.flatten
           )
         end
 
         def bootstrap(new_attributes = {})
-          spot_request = connection.spot_requests.new(new_attributes)
+          spot_request = service.spot_requests.new(new_attributes)
 
           unless new_attributes[:key_name]
             # first or create fog_#{credential} keypair
             name = Fog.respond_to?(:credential) && Fog.credential || :default
-            unless spot_request.key_pair = connection.key_pairs.get("fog_#{name}")
-              spot_request.key_pair = connection.key_pairs.create(
+            unless spot_request.key_pair = service.key_pairs.get("fog_#{name}")
+              spot_request.key_pair = service.key_pairs.create(
                 :name => "fog_#{name}",
                 :public_key => spot_request.public_key
               )
@@ -49,7 +49,7 @@ module Fog
           end
 
           # make sure port 22 is open in the first security group
-          security_group = connection.security_groups.get(spot_request.groups.first)
+          security_group = service.security_groups.get(spot_request.groups.first)
           authorized = security_group.ip_permissions.detect do |ip_permission|
             ip_permission['ipRanges'].first && ip_permission['ipRanges'].first['cidrIp'] == '0.0.0.0/0' &&
             ip_permission['fromPort'] == 22 &&
@@ -62,10 +62,10 @@ module Fog
 
           spot_request.save
           Fog.wait_for { spot_request.reload.ready? rescue nil }
-          server = connection.servers.get(spot_request.instance_id)
+          server = service.servers.get(spot_request.instance_id)
           if spot_request.tags
             for key, value in spot_request.tags
-              connection.tags.create(
+              service.tags.create(
                 :key          => key,
                 :resource_id  => spot_request.instance_id,
                 :value        => value
@@ -79,7 +79,7 @@ module Fog
 
         def get(spot_request_id)
           if spot_request_id
-            self.class.new(:connection => connection).all('spot-instance-request-id' => spot_request_id).first
+            self.class.new(:service => service).all('spot-instance-request-id' => spot_request_id).first
           end
         rescue Fog::Errors::NotFound
           nil
diff --git a/lib/fog/aws/models/compute/subnet.rb b/lib/fog/aws/models/compute/subnet.rb
index afe0eede8..c8cf4bd06 100644
--- a/lib/fog/aws/models/compute/subnet.rb
+++ b/lib/fog/aws/models/compute/subnet.rb
@@ -7,7 +7,7 @@ module Fog
       class Subnet < Fog::Model
 
         identity  :subnet_id,                   :aliases => 'subnetId'
-        attribute :state     
+        attribute :state
         attribute :vpc_id,                      :aliases => 'vpcId'
         attribute :cidr_block,                  :aliases => 'cidrBlock'
         attribute :available_ip_address_count,  :aliases => 'availableIpAddressCount'
@@ -27,7 +27,7 @@ module Fog
         def destroy
           requires :subnet_id
 
-          connection.delete_subnet(subnet_id)
+          service.delete_subnet(subnet_id)
           true
         end
 
@@ -43,7 +43,7 @@ module Fog
 
         def save
           requires :vpc_id, :cidr_block
-          data = connection.create_subnet(vpc_id, cidr_block).body['subnetSet'].first
+          data = service.create_subnet(vpc_id, cidr_block).body['subnetSet'].first
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true
diff --git a/lib/fog/aws/models/compute/subnets.rb b/lib/fog/aws/models/compute/subnets.rb
index def0df00d..0b74d98cb 100644
--- a/lib/fog/aws/models/compute/subnets.rb
+++ b/lib/fog/aws/models/compute/subnets.rb
@@ -63,7 +63,7 @@ module Fog
             filters = {'subnet-id' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_subnets(filters).body
+          data = service.describe_subnets(filters).body
           load(data['subnetSet'])
         end
 
@@ -88,7 +88,7 @@ module Fog
 
         def get(subnet_id)
           if subnet_id
-            self.class.new(:connection => connection).all('subnet-id' => subnet_id).first
+            self.class.new(:service => service).all('subnet-id' => subnet_id).first
           end
         end
 
diff --git a/lib/fog/aws/models/compute/tag.rb b/lib/fog/aws/models/compute/tag.rb
index 1653c9ab4..c41423cf6 100644
--- a/lib/fog/aws/models/compute/tag.rb
+++ b/lib/fog/aws/models/compute/tag.rb
@@ -18,13 +18,13 @@ module Fog
 
         def destroy
           requires :key, :resource_id
-          connection.delete_tags(resource_id, key => value)
+          service.delete_tags(resource_id, key => value)
           true
         end
 
         def save
           requires :key, :resource_id
-          connection.create_tags(resource_id, key => value)
+          service.create_tags(resource_id, key => value)
           true
         end
 
diff --git a/lib/fog/aws/models/compute/tags.rb b/lib/fog/aws/models/compute/tags.rb
index 8b13d5375..632e40cf7 100644
--- a/lib/fog/aws/models/compute/tags.rb
+++ b/lib/fog/aws/models/compute/tags.rb
@@ -18,13 +18,13 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          data = connection.describe_tags(filters).body
+          data = service.describe_tags(filters).body
           load(data['tagSet'])
         end
-        
+
         def get(key)
           if key
-            self.class.new(:connection => connection).all('key' => key)
+            self.class.new(:service => service).all('key' => key)
           end
         end
       end
diff --git a/lib/fog/aws/models/compute/volume.rb b/lib/fog/aws/models/compute/volume.rb
index 25300e5d9..8fb245e40 100644
--- a/lib/fog/aws/models/compute/volume.rb
+++ b/lib/fog/aws/models/compute/volume.rb
@@ -30,7 +30,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.delete_volume(id)
+          service.delete_volume(id)
           true
         end
 
@@ -47,7 +47,7 @@ module Fog
             requires :iops
           end
 
-          data = connection.create_volume(availability_zone, size, 'SnapshotId' => snapshot_id, 'VolumeType' => type, 'Iops' => iops).body
+          data = service.create_volume(availability_zone, size, 'SnapshotId' => snapshot_id, 'VolumeType' => type, 'Iops' => iops).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
 
@@ -55,7 +55,7 @@ module Fog
             # expect eventual consistency
             Fog.wait_for { self.reload rescue nil }
             for key, value in (self.tags = tags)
-              connection.tags.create(
+              service.tags.create(
                 :key          => key,
                 :resource_id  => self.identity,
                 :value        => value
@@ -71,7 +71,7 @@ module Fog
 
         def server
           requires :server_id
-          connection.servers('instance-id' => server_id)
+          service.servers('instance-id' => server_id)
         end
 
         def server=(new_server)
@@ -84,12 +84,12 @@ module Fog
 
         def snapshots
           requires :id
-          connection.snapshots(:volume => self)
+          service.snapshots(:volume => self)
         end
 
         def snapshot(description)
           requires :id
-          connection.create_snapshot(id, description)
+          service.create_snapshot(id, description)
         end
 
         def force_detach
@@ -110,7 +110,7 @@ module Fog
             requires :device
             @server = nil
             self.server_id = new_server.id
-            connection.attach_volume(server_id, id, device)
+            service.attach_volume(server_id, id, device)
             reload
           end
         end
@@ -119,7 +119,7 @@ module Fog
           @server = nil
           self.server_id = nil
           if persisted?
-            connection.detach_volume(id, 'Force' => force)
+            service.detach_volume(id, 'Force' => force)
             reload
           end
         end
diff --git a/lib/fog/aws/models/compute/volumes.rb b/lib/fog/aws/models/compute/volumes.rb
index f551d78a4..15e87b4fd 100644
--- a/lib/fog/aws/models/compute/volumes.rb
+++ b/lib/fog/aws/models/compute/volumes.rb
@@ -68,7 +68,7 @@ module Fog
             filters = {'volume-id' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_volumes(filters).body
+          data = service.describe_volumes(filters).body
           load(data['volumeSet'])
           if server
             self.replace(self.select {|volume| volume.server_id == server.id})
@@ -102,7 +102,7 @@ module Fog
 
         def get(volume_id)
           if volume_id
-            self.class.new(:connection => connection).all('volume-id' => volume_id).first
+            self.class.new(:service => service).all('volume-id' => volume_id).first
           end
         end
 
diff --git a/lib/fog/aws/models/compute/vpc.rb b/lib/fog/aws/models/compute/vpc.rb
index 7df11573f..80ec246f9 100644
--- a/lib/fog/aws/models/compute/vpc.rb
+++ b/lib/fog/aws/models/compute/vpc.rb
@@ -32,7 +32,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.delete_vpc(id)
+          service.delete_vpc(id)
           true
         end
 
@@ -50,7 +50,7 @@ module Fog
         def save
           requires :cidr_block
 
-          data = connection.create_vpc(cidr_block).body['vpcSet'].first
+          data = service.create_vpc(cidr_block).body['vpcSet'].first
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true
diff --git a/lib/fog/aws/models/compute/vpcs.rb b/lib/fog/aws/models/compute/vpcs.rb
index a3a339d66..612a90cd1 100644
--- a/lib/fog/aws/models/compute/vpcs.rb
+++ b/lib/fog/aws/models/compute/vpcs.rb
@@ -61,7 +61,7 @@ module Fog
             filters = {'vpc-id' => [*filters]}
           end
           self.filters = filters
-          data = connection.describe_vpcs(filters).body
+          data = service.describe_vpcs(filters).body
           load(data['vpcSet'])
         end
 
@@ -82,7 +82,7 @@ module Fog
 
         def get(vpc_id)
           if vpc_id
-            self.class.new(:connection => connection).all('vpc-id' => vpc_id).first
+            self.class.new(:service => service).all('vpc-id' => vpc_id).first
           end
         end
 
diff --git a/lib/fog/aws/models/dns/record.rb b/lib/fog/aws/models/dns/record.rb
index cf64ad752..87d0c2efc 100644
--- a/lib/fog/aws/models/dns/record.rb
+++ b/lib/fog/aws/models/dns/record.rb
@@ -29,7 +29,7 @@ module Fog
 
         def destroy
           options = attributes_to_options('DELETE')
-          connection.change_resource_record_sets(zone.id, [options])
+          service.change_resource_record_sets(zone.id, [options])
           true
         end
 
@@ -39,7 +39,7 @@ module Fog
 
         def save
           options = attributes_to_options('CREATE')
-          data = connection.change_resource_record_sets(zone.id, [options]).body
+          data = service.change_resource_record_sets(zone.id, [options]).body
           merge_attributes(data)
           true
         end
@@ -54,7 +54,7 @@ module Fog
           merge_attributes(new_attributes)
           options << attributes_to_options('CREATE')
 
-          data = connection.change_resource_record_sets(zone.id, options).body
+          data = service.change_resource_record_sets(zone.id, options).body
           merge_attributes(data)
           true
         end
@@ -69,7 +69,7 @@ module Fog
         def reload
           # If we have a change_id (newly created or modified), then reload performs a get_change to update status.
           if change_id
-            data = connection.get_change(change_id).body
+            data = service.get_change(change_id).body
             merge_attributes(data)
             self
           else
diff --git a/lib/fog/aws/models/dns/records.rb b/lib/fog/aws/models/dns/records.rb
index 363a5e0bd..00a840047 100644
--- a/lib/fog/aws/models/dns/records.rb
+++ b/lib/fog/aws/models/dns/records.rb
@@ -28,7 +28,7 @@ module Fog
           options[:identifier] ||= identifier
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.list_resource_record_sets(zone.id, options).body
+          data = service.list_resource_record_sets(zone.id, options).body
           # NextRecordIdentifier is completely absent instead of nil, so set to nil, or iteration breaks.
           data['NextRecordIdentifier'] = nil unless data.has_key?('NextRecordIdentifier')
 
@@ -57,7 +57,7 @@ module Fog
             }
             options.delete_if {|key, value| value.nil?}
 
-            batch = connection.list_resource_record_sets(zone.id, options).body
+            batch = service.list_resource_record_sets(zone.id, options).body
             # NextRecordIdentifier is completely absent instead of nil, so set to nil, or iteration breaks.
             batch['NextRecordIdentifier'] = nil unless batch.has_key?('NextRecordIdentifier')
 
@@ -92,7 +92,7 @@ module Fog
           }
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.list_resource_record_sets(zone.id, options).body
+          data = service.list_resource_record_sets(zone.id, options).body
           # Get first record
           data = data['ResourceRecordSets'].shift
 
diff --git a/lib/fog/aws/models/dns/zone.rb b/lib/fog/aws/models/dns/zone.rb
index a324a011a..31508d552 100644
--- a/lib/fog/aws/models/dns/zone.rb
+++ b/lib/fog/aws/models/dns/zone.rb
@@ -17,7 +17,7 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_hosted_zone(identity)
+          service.delete_hosted_zone(identity)
           true
         end
 
@@ -25,7 +25,7 @@ module Fog
           @records ||= begin
             Fog::DNS::AWS::Records.new(
               :zone       => self,
-              :connection => connection
+              :service => service
             )
           end
         end
@@ -35,7 +35,7 @@ module Fog
           options = {}
           options[:caller_ref]  = caller_reference if caller_reference
           options[:comment]     = description if description
-          data = connection.create_hosted_zone(domain, options).body
+          data = service.create_hosted_zone(domain, options).body
           merge_attributes(data)
           true
         end
diff --git a/lib/fog/aws/models/dns/zones.rb b/lib/fog/aws/models/dns/zones.rb
index a32ac9cb5..29a221681 100644
--- a/lib/fog/aws/models/dns/zones.rb
+++ b/lib/fog/aws/models/dns/zones.rb
@@ -15,12 +15,12 @@ module Fog
         def all(options = {})
           options['marker']   ||= marker
           options['maxitems'] ||= max_items
-          data = connection.list_hosted_zones(options).body['HostedZones']
+          data = service.list_hosted_zones(options).body['HostedZones']
           load(data)
         end
 
         def get(zone_id)
-          data = connection.get_hosted_zone(zone_id).body
+          data = service.get_hosted_zone(zone_id).body
           new(data)
         rescue Excon::Errors::NotFound
           nil
diff --git a/lib/fog/aws/models/elasticache/cluster.rb b/lib/fog/aws/models/elasticache/cluster.rb
index 488393ca1..ef617261f 100644
--- a/lib/fog/aws/models/elasticache/cluster.rb
+++ b/lib/fog/aws/models/elasticache/cluster.rb
@@ -35,7 +35,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_cache_cluster(id)
+          service.delete_cache_cluster(id)
           true
         end
 
@@ -45,7 +45,7 @@ module Fog
           parameter_group     ||= Hash.new
           notification_config ||= Hash.new
 
-          connection.create_cache_cluster(
+          service.create_cache_cluster(
             id, {
               :node_type                    => node_type,
               :security_group_names         => security_groups,
diff --git a/lib/fog/aws/models/elasticache/clusters.rb b/lib/fog/aws/models/elasticache/clusters.rb
index e99b93b99..0ef7490fe 100644
--- a/lib/fog/aws/models/elasticache/clusters.rb
+++ b/lib/fog/aws/models/elasticache/clusters.rb
@@ -10,7 +10,7 @@ module Fog
 
         def all
           load(
-            connection.describe_cache_clusters(
+            service.describe_cache_clusters(
               nil, :show_node_info => true
             ).body['CacheClusters']
           )
@@ -18,7 +18,7 @@ module Fog
 
         def get(identity, show_node_info = true)
           new(
-            connection.describe_cache_clusters(
+            service.describe_cache_clusters(
               identity, :show_node_info => show_node_info
             ).body['CacheClusters'].first
           )
diff --git a/lib/fog/aws/models/elasticache/parameter_group.rb b/lib/fog/aws/models/elasticache/parameter_group.rb
index 67054d702..93c44a3c5 100644
--- a/lib/fog/aws/models/elasticache/parameter_group.rb
+++ b/lib/fog/aws/models/elasticache/parameter_group.rb
@@ -12,13 +12,13 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_cache_parameter_group(id)
+          service.delete_cache_parameter_group(id)
           true
         end
 
         def save
           requires :id
-          connection.create_cache_parameter_group(
+          service.create_cache_parameter_group(
             id,
             description = id,
             family      = 'memcached1.4'
diff --git a/lib/fog/aws/models/elasticache/parameter_groups.rb b/lib/fog/aws/models/elasticache/parameter_groups.rb
index 2eceef459..3b9848cb7 100644
--- a/lib/fog/aws/models/elasticache/parameter_groups.rb
+++ b/lib/fog/aws/models/elasticache/parameter_groups.rb
@@ -10,13 +10,13 @@ module Fog
 
         def all
           load(
-            connection.describe_cache_parameter_groups.body['CacheParameterGroups']
+            service.describe_cache_parameter_groups.body['CacheParameterGroups']
           )
         end
 
         def get(identity)
           new(
-            connection.describe_cache_parameter_groups(
+            service.describe_cache_parameter_groups(
               identity
             ).body['CacheParameterGroups'].first
           )
diff --git a/lib/fog/aws/models/elasticache/security_group.rb b/lib/fog/aws/models/elasticache/security_group.rb
index 306f95624..d216625f4 100644
--- a/lib/fog/aws/models/elasticache/security_group.rb
+++ b/lib/fog/aws/models/elasticache/security_group.rb
@@ -17,20 +17,20 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_cache_security_group(id)
+          service.delete_cache_security_group(id)
           true
         end
 
         def save
           requires :id
           requires :description
-          connection.create_cache_security_group(id, description)
+          service.create_cache_security_group(id, description)
         end
 
         def authorize_ec2_group(group_name, group_owner_id=owner_id)
           requires :id
           requires :owner_id if group_owner_id.nil?
-          data = connection.authorize_cache_security_group_ingress(
+          data = service.authorize_cache_security_group_ingress(
             id, group_name, group_owner_id
           )
           merge_attributes(data.body['CacheSecurityGroup'])
@@ -39,7 +39,7 @@ module Fog
         def revoke_ec2_group(group_name, group_owner_id=owner_id)
           requires :id
           requires :owner_id if group_owner_id.nil?
-          data = connection.revoke_cache_security_group_ingress(
+          data = service.revoke_cache_security_group_ingress(
             id, group_name, group_owner_id
           )
           merge_attributes(data.body['CacheSecurityGroup'])
diff --git a/lib/fog/aws/models/elasticache/security_groups.rb b/lib/fog/aws/models/elasticache/security_groups.rb
index 2578ff67b..6a76db55c 100644
--- a/lib/fog/aws/models/elasticache/security_groups.rb
+++ b/lib/fog/aws/models/elasticache/security_groups.rb
@@ -10,13 +10,13 @@ module Fog
 
         def all
           load(
-            connection.describe_cache_security_groups.body['CacheSecurityGroups']
+            service.describe_cache_security_groups.body['CacheSecurityGroups']
           )
         end
 
         def get(identity)
           new(
-            connection.describe_cache_security_groups(
+            service.describe_cache_security_groups(
               identity
             ).body['CacheSecurityGroups'].first
           )
diff --git a/lib/fog/aws/models/elb/listener.rb b/lib/fog/aws/models/elb/listener.rb
index 23fe82e56..fced39787 100644
--- a/lib/fog/aws/models/elb/listener.rb
+++ b/lib/fog/aws/models/elb/listener.rb
@@ -19,13 +19,13 @@ module Fog
 
         def save
           requires :load_balancer, :instance_port, :lb_port, :protocol, :instance_protocol
-          connection.create_load_balancer_listeners(load_balancer.id, [to_params])
+          service.create_load_balancer_listeners(load_balancer.id, [to_params])
           reload
         end
 
         def destroy
           requires :load_balancer, :lb_port
-          connection.delete_load_balancer_listeners(load_balancer.id, [lb_port])
+          service.delete_load_balancer_listeners(load_balancer.id, [lb_port])
           reload
         end
 
diff --git a/lib/fog/aws/models/elb/load_balancer.rb b/lib/fog/aws/models/elb/load_balancer.rb
index 47d3b3ef1..a0320e0a0 100644
--- a/lib/fog/aws/models/elb/load_balancer.rb
+++ b/lib/fog/aws/models/elb/load_balancer.rb
@@ -21,7 +21,7 @@ module Fog
 
         def initialize(attributes={})
           if attributes[:subnet_ids] ||= attributes['Subnets']
-            attributes[:availability_zones] ||= attributes['AvailabilityZones'] 
+            attributes[:availability_zones] ||= attributes['AvailabilityZones']
           else
             attributes[:availability_zones] ||= attributes['AvailabilityZones']  || %w(us-east-1a us-east-1b us-east-1c us-east-1d)
           end
@@ -38,51 +38,51 @@ module Fog
 
         def register_instances(instances)
           requires :id
-          data = connection.register_instances_with_load_balancer(instances, id).body['RegisterInstancesWithLoadBalancerResult']
+          data = service.register_instances_with_load_balancer(instances, id).body['RegisterInstancesWithLoadBalancerResult']
           data['Instances'].map!{|h| h['InstanceId']}
           merge_attributes(data)
         end
 
         def deregister_instances(instances)
           requires :id
-          data = connection.deregister_instances_from_load_balancer(instances, id).body['DeregisterInstancesFromLoadBalancerResult']
+          data = service.deregister_instances_from_load_balancer(instances, id).body['DeregisterInstancesFromLoadBalancerResult']
           data['Instances'].map!{|h| h['InstanceId']}
           merge_attributes(data)
         end
 
         def enable_availability_zones(zones)
           requires :id
-          data = connection.enable_availability_zones_for_load_balancer(zones, id).body['EnableAvailabilityZonesForLoadBalancerResult']
+          data = service.enable_availability_zones_for_load_balancer(zones, id).body['EnableAvailabilityZonesForLoadBalancerResult']
           merge_attributes(data)
         end
 
         def disable_availability_zones(zones)
           requires :id
-          data = connection.disable_availability_zones_for_load_balancer(zones, id).body['DisableAvailabilityZonesForLoadBalancerResult']
+          data = service.disable_availability_zones_for_load_balancer(zones, id).body['DisableAvailabilityZonesForLoadBalancerResult']
           merge_attributes(data)
         end
-        
+
         def attach_subnets(subnet_ids)
           requires :id
-          data = connection.attach_load_balancer_to_subnets(subnet_ids, id).body['AttachLoadBalancerToSubnetsResult']
+          data = service.attach_load_balancer_to_subnets(subnet_ids, id).body['AttachLoadBalancerToSubnetsResult']
           merge_attributes(data)
         end
 
         def detach_subnets(subnet_ids)
           requires :id
-          data = connection.detach_load_balancer_from_subnets(subnet_ids, id).body['DetachLoadBalancerFromSubnetsResult']
+          data = service.detach_load_balancer_from_subnets(subnet_ids, id).body['DetachLoadBalancerFromSubnetsResult']
           merge_attributes(data)
         end
-        
+
         def apply_security_groups(security_groups)
           requires :id
-          data = connection.apply_security_groups_to_load_balancer(security_groups, id).body['ApplySecurityGroupsToLoadBalancerResult']
+          data = service.apply_security_groups_to_load_balancer(security_groups, id).body['ApplySecurityGroupsToLoadBalancerResult']
           merge_attributes(data)
         end
 
         def instance_health
           requires :id
-          @instance_health ||= connection.describe_instance_health(id).body['DescribeInstanceHealthResult']['InstanceStates']
+          @instance_health ||= service.describe_instance_health(id).body['DescribeInstanceHealthResult']['InstanceStates']
         end
 
         def instances_in_service
@@ -95,14 +95,14 @@ module Fog
 
         def configure_health_check(health_check)
           requires :id
-          data = connection.configure_health_check(id, health_check).body['ConfigureHealthCheckResult']['HealthCheck']
+          data = service.configure_health_check(id, health_check).body['ConfigureHealthCheckResult']['HealthCheck']
           merge_attributes(:health_check => data)
         end
 
         def listeners
           Fog::AWS::ELB::Listeners.new({
             :data => attributes['ListenerDescriptions'],
-            :connection => connection,
+            :service => service,
             :load_balancer => self
           })
         end
@@ -110,7 +110,7 @@ module Fog
         def policies
           Fog::AWS::ELB::Policies.new({
             :data => attributes['Policies'],
-            :connection => connection,
+            :service => service,
             :load_balancer => self
           })
         end
@@ -118,13 +118,13 @@ module Fog
         def set_listener_policy(port, policy_name)
           requires :id
           policy_name = [policy_name].flatten
-          connection.set_load_balancer_policies_of_listener(id, port, policy_name)
+          service.set_load_balancer_policies_of_listener(id, port, policy_name)
           reload
         end
 
         def set_listener_ssl_certificate(port, ssl_certificate_id)
           requires :id
-          connection.set_load_balancer_listener_ssl_certificate(id, port, ssl_certificate_id)
+          service.set_load_balancer_listener_ssl_certificate(id, port, ssl_certificate_id)
           reload
         end
 
@@ -144,8 +144,8 @@ module Fog
           # if both are specified, the availability zones have preference
           #requires :availability_zones
           if (availability_zones || subnet_ids)
-            connection.create_load_balancer(availability_zones, id, listeners.map{|l| l.to_params}) if availability_zones
-            connection.create_load_balancer(nil, id, listeners.map{|l| l.to_params}, {:subnet_ids => subnet_ids, :security_groups => security_groups, :scheme => scheme}) if subnet_ids && !availability_zones
+            service.create_load_balancer(availability_zones, id, listeners.map{|l| l.to_params}) if availability_zones
+            service.create_load_balancer(nil, id, listeners.map{|l| l.to_params}, {:subnet_ids => subnet_ids, :security_groups => security_groups, :scheme => scheme}) if subnet_ids && !availability_zones
           else
             throw Fog::Errors::Error.new("No availability zones or subnet ids specified")
           end
@@ -164,7 +164,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_load_balancer(id)
+          service.delete_load_balancer(id)
         end
 
       end
diff --git a/lib/fog/aws/models/elb/load_balancers.rb b/lib/fog/aws/models/elb/load_balancers.rb
index 8c8566687..ec6354302 100644
--- a/lib/fog/aws/models/elb/load_balancers.rb
+++ b/lib/fog/aws/models/elb/load_balancers.rb
@@ -15,7 +15,7 @@ module Fog
           marker = nil
           finished = false
           while !finished
-            data = connection.describe_load_balancers('Marker' => marker).body
+            data = service.describe_load_balancers('Marker' => marker).body
             result.concat(data['DescribeLoadBalancersResult']['LoadBalancerDescriptions'])
             marker = data['DescribeLoadBalancersResult']['NextMarker']
             finished = marker.nil?
@@ -25,7 +25,7 @@ module Fog
 
         def get(identity)
           if identity
-            data = connection.describe_load_balancers('LoadBalancerNames' => identity).body['DescribeLoadBalancersResult']['LoadBalancerDescriptions'].first
+            data = service.describe_load_balancers('LoadBalancerNames' => identity).body['DescribeLoadBalancersResult']['LoadBalancerDescriptions'].first
             new(data)
           end
         rescue Fog::AWS::ELB::NotFound
diff --git a/lib/fog/aws/models/elb/policy.rb b/lib/fog/aws/models/elb/policy.rb
index 9ba10c1a1..fafbf6bac 100644
--- a/lib/fog/aws/models/elb/policy.rb
+++ b/lib/fog/aws/models/elb/policy.rb
@@ -13,7 +13,7 @@ module Fog
 
         def save
           requires :id, :load_balancer, :cookie_stickiness
-          connection_method = nil
+          service_method = nil
           args = [load_balancer.id, id]
           case cookie_stickiness
           when :app
@@ -27,13 +27,13 @@ module Fog
             raise ArgumentError.new('cookie_stickiness must be :app or :lb')
           end
 
-          connection.send(method, *args)
+          service.send(method, *args)
           reload
         end
 
         def destroy
           requires :id, :load_balancer
-          connection.delete_load_balancer_policy(load_balancer.id, id)
+          service.delete_load_balancer_policy(load_balancer.id, id)
           reload
         end
 
diff --git a/lib/fog/aws/models/glacier/archive.rb b/lib/fog/aws/models/glacier/archive.rb
index 9462dc9fa..06505e0ea 100644
--- a/lib/fog/aws/models/glacier/archive.rb
+++ b/lib/fog/aws/models/glacier/archive.rb
@@ -22,15 +22,15 @@ module Fog
           if multipart_chunk_size && body.respond_to?(:read)
             self.id = multipart_save
           else
-            data = connection.create_archive(vault.id, body, 'description' => description)
+            data = service.create_archive(vault.id, body, 'description' => description)
             self.id = data.headers['x-amz-archive-id']
           end
           true
         end
-        
+
         def destroy
           requires :id
-          connection.delete_archive(vault.id,id)
+          service.delete_archive(vault.id,id)
         end
 
         private
@@ -41,7 +41,7 @@ module Fog
 
         def multipart_save
           # Initiate the upload
-          res = connection.initiate_multipart_upload vault.id, multipart_chunk_size, 'description' => description
+          res = service.initiate_multipart_upload vault.id, multipart_chunk_size, 'description' => description
           upload_id = res.headers["x-amz-multipart-upload-id"]
 
           hash = Fog::AWS::Glacier::TreeHash.new
@@ -50,17 +50,17 @@ module Fog
           offset = 0
           while (chunk = body.read(multipart_chunk_size)) do
             part_hash = hash.add_part(chunk)
-            part_upload = connection.upload_part(vault.id, upload_id, chunk, offset, part_hash  )
+            part_upload = service.upload_part(vault.id, upload_id, chunk, offset, part_hash  )
             offset += chunk.bytesize
           end
 
         rescue
           # Abort the upload & reraise
-          connection.abort_multipart_upload(vault.id, upload_id) if upload_id
+          service.abort_multipart_upload(vault.id, upload_id) if upload_id
           raise
         else
           # Complete the upload
-          connection.complete_multipart_upload(vault.id, upload_id, offset, hash.hexdigest).headers['x-amz-archive-id']
+          service.complete_multipart_upload(vault.id, upload_id, offset, hash.hexdigest).headers['x-amz-archive-id']
         end
 
       end
diff --git a/lib/fog/aws/models/glacier/job.rb b/lib/fog/aws/models/glacier/job.rb
index 0df420262..df29e2baa 100644
--- a/lib/fog/aws/models/glacier/job.rb
+++ b/lib/fog/aws/models/glacier/job.rb
@@ -35,7 +35,7 @@ module Fog
           requires :vault, :type
           specification = {'Type' => type, 'ArchiveId' => archive_id, 'Format' => format, 'Description' => description, 'SNSTopic' => sns_topic}.reject{|k,v| v.nil?}
 
-          data = connection.initiate_job(vault.id, specification)
+          data = service.initiate_job(vault.id, specification)
           self.id = data.headers['x-amz-job-id']
           reload
         end
@@ -51,7 +51,7 @@ module Fog
             options = options.merge :response_block => lambda {|chunk, remaining_bytes, total_bytes| io.write chunk}
           end
           options['Range'] = options.delete :range
-          connection.get_job_output(vault.id, id, options)
+          service.get_job_output(vault.id, id, options)
         end
 
         private
diff --git a/lib/fog/aws/models/glacier/jobs.rb b/lib/fog/aws/models/glacier/jobs.rb
index 3f4817318..b40586da8 100644
--- a/lib/fog/aws/models/glacier/jobs.rb
+++ b/lib/fog/aws/models/glacier/jobs.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::AWS::Glacier::Job
         attribute :vault
         attribute :filters
-        
+
         def initialize(attributes)
           self.filters = {}
           super
@@ -21,12 +21,12 @@ module Fog
         # completed (true/false)
         def all(filters = self.filters)
           self.filters = filters
-          data = connection.list_jobs(vault.id, self.filters).body['JobList']
+          data = service.list_jobs(vault.id, self.filters).body['JobList']
           load(data)
         end
 
         def get(key)
-          data = connection.describe_job(vault.id, key).body
+          data = service.describe_job(vault.id, key).body
           new(data)
         rescue Excon::Errors::NotFound
           nil
diff --git a/lib/fog/aws/models/glacier/vault.rb b/lib/fog/aws/models/glacier/vault.rb
index 01ff4bd4c..5521ea5f5 100644
--- a/lib/fog/aws/models/glacier/vault.rb
+++ b/lib/fog/aws/models/glacier/vault.rb
@@ -21,30 +21,30 @@ module Fog
         end
 
         def archives
-          @archives ||= Fog::AWS::Glacier::Archives.new(:vault => self, :connection => connection)
+          @archives ||= Fog::AWS::Glacier::Archives.new(:vault => self, :service => service)
         end
 
         def jobs(filters={})
-          Fog::AWS::Glacier::Jobs.new(:vault => self, :connection => connection, :filters => filters)
+          Fog::AWS::Glacier::Jobs.new(:vault => self, :service => service, :filters => filters)
         end
 
         def set_notification_configuration(topic, events)
-          connection.set_vault_notification_configuration(id, topic, events)
+          service.set_vault_notification_configuration(id, topic, events)
         end
 
         def delete_notification_configuration
-          connection.delete_vault_notification_configuration
+          service.delete_vault_notification_configuration
         end
-        
+
         def save
           requires :id
-          connection.create_vault(id)
+          service.create_vault(id)
           reload
         end
 
         def destroy
           requires :id
-          connection.delete_vault(id)
+          service.delete_vault(id)
         end
 
       end
diff --git a/lib/fog/aws/models/glacier/vaults.rb b/lib/fog/aws/models/glacier/vaults.rb
index bea89dac6..186f15e89 100644
--- a/lib/fog/aws/models/glacier/vaults.rb
+++ b/lib/fog/aws/models/glacier/vaults.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::AWS::Glacier::Vault
 
         def all
-          data = connection.list_vaults.body['VaultList']
+          data = service.list_vaults.body['VaultList']
           load(data)
         end
 
         def get(key)
-          data = connection.describe_vault(key).body
+          data = service.describe_vault(key).body
           new(data)
         rescue Excon::Errors::NotFound
           nil
diff --git a/lib/fog/aws/models/iam/access_key.rb b/lib/fog/aws/models/iam/access_key.rb
index 96ae35bbb..00caa8139 100644
--- a/lib/fog/aws/models/iam/access_key.rb
+++ b/lib/fog/aws/models/iam/access_key.rb
@@ -10,29 +10,29 @@ module Fog
         attribute :username, :aliases => 'UserName'
         attribute :secret_access_key, :aliases => 'SecretAccessKey'
         attribute :status, :aliases => 'Status'
-        
+
         def save
           requires :username
 
-          data = connection.create_access_key('UserName'=> username).body["AccessKey"]
+          data = service.create_access_key('UserName'=> username).body["AccessKey"]
           merge_attributes(data)
           true
         end
-        
+
         def destroy
           requires :id
           requires :username
 
-          connection.delete_access_key(id,'UserName'=> username)
+          service.delete_access_key(id,'UserName'=> username)
           true
         end
-        
+
         def user
           requires :username
-          connection.users.get(username)
+          service.users.get(username)
         end
-        
+
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/aws/models/iam/access_keys.rb b/lib/fog/aws/models/iam/access_keys.rb
index db0e93698..4ab4b7d6f 100644
--- a/lib/fog/aws/models/iam/access_keys.rb
+++ b/lib/fog/aws/models/iam/access_keys.rb
@@ -6,17 +6,17 @@ module Fog
     class IAM
 
       class AccessKeys < Fog::Collection
-    
+
         model Fog::AWS::IAM::AccessKey
-        
+
         def initialize(attributes = {})
           @username = attributes[:username]
           raise ArgumentError.new("Can't get an access_key's user without a username") unless @username
           super
         end
-        
-        def all 
-          data = connection.list_access_keys('UserName'=> @username).body['AccessKeys']
+
+        def all
+          data = service.list_access_keys('UserName'=> @username).body['AccessKeys']
           # AWS response doesn't contain the UserName, this injects it
           data.each {|access_key| access_key['UserName'] = @username }
           load(data)
@@ -25,7 +25,7 @@ module Fog
         def get(identity)
           self.all.select {|access_key| access_key.id == identity}.first
         end
-        
+
         def new(attributes = {})
           super({ :username => @username }.merge!(attributes))
         end
@@ -33,4 +33,4 @@ module Fog
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/aws/models/iam/policies.rb b/lib/fog/aws/models/iam/policies.rb
index c948a0a50..87d05be1f 100644
--- a/lib/fog/aws/models/iam/policies.rb
+++ b/lib/fog/aws/models/iam/policies.rb
@@ -6,39 +6,39 @@ module Fog
     class IAM
 
       class Policies < Fog::Collection
-                
+
         model Fog::AWS::IAM::Policy
-        
+
         def initialize(attributes = {})
           @username = attributes[:username]
           raise ArgumentError.new("Can't get a policy's user without a username") unless @username
           super
         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 = connection.list_user_policies(@username).body['PolicyNames'] # it returns an array
+          policy_names = service.list_user_policies(@username).body['PolicyNames'] # it returns an array
           policies = []
           policy_names.each do |policy_name|
-            policies << connection.get_user_policy(policy_name,@username).body['Policy']
+            policies << service.get_user_policy(policy_name,@username).body['Policy']
           end
           load(policies) # data is an array of attribute hashes
         end
 
         def get(identity)
-          data = connection.get_user_policy(identity,@username).body['Policy']
+          data = service.get_user_policy(identity,@username).body['Policy']
           new(data) # data is an attribute hash
         rescue Fog::AWS::IAM::NotFound
           nil
         end
-        
+
         def new(attributes = {})
           super({ :username => @username }.merge!(attributes))
         end
-        
+
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/aws/models/iam/policy.rb b/lib/fog/aws/models/iam/policy.rb
index c2f67b542..11b4d698c 100644
--- a/lib/fog/aws/models/iam/policy.rb
+++ b/lib/fog/aws/models/iam/policy.rb
@@ -9,31 +9,31 @@ module Fog
         identity  :id, :aliases => 'PolicyName'
         attribute :username, :aliases => 'UserName'
         attribute :document, :aliases => 'PolicyDocument'
-        
+
         def save
           requires :id
           requires :username
           requires :document
 
-          data = connection.put_user_policy(username, id, document).body
+          data = service.put_user_policy(username, id, document).body
           merge_attributes(data)
           true
         end
-        
+
         def destroy
           requires :id
           requires :username
 
-          connection.delete_user_policy(username, id)
+          service.delete_user_policy(username, id)
           true
         end
-        
+
         def user
           requires :username
-          connection.users.get(username)
+          service.users.get(username)
         end
-        
+
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/aws/models/iam/user.rb b/lib/fog/aws/models/iam/user.rb
index 7969d5157..8b8dbfa55 100644
--- a/lib/fog/aws/models/iam/user.rb
+++ b/lib/fog/aws/models/iam/user.rb
@@ -10,31 +10,31 @@ module Fog
         attribute :path, :aliases => 'Path'
         attribute :arn, :aliases => 'Arn'
         attribute :user_id, :aliases => 'UserId'
-        
+
         def save
           requires :id
-          data = connection.create_user(id, path || '/').body['User']
+          data = service.create_user(id, path || '/').body['User']
           merge_attributes(data)
           true
         end
-        
+
         def destroy
           requires :id
-          connection.delete_user(id)
+          service.delete_user(id)
           true
         end
-        
+
         def policies
           requires :id
-          connection.policies(:username => id)
+          service.policies(:username => id)
         end
-        
+
         def access_keys
           requires :id
-          connection.access_keys(:username => id)
+          service.access_keys(:username => id)
         end
-        
+
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/aws/models/iam/users.rb b/lib/fog/aws/models/iam/users.rb
index f5b5dc1a7..343ded06c 100644
--- a/lib/fog/aws/models/iam/users.rb
+++ b/lib/fog/aws/models/iam/users.rb
@@ -14,13 +14,13 @@ module Fog
 
         def all(options = {})
           merge_attributes(options)
-          data = connection.list_users(options).body
+          data = service.list_users(options).body
           merge_attributes('IsTruncated' => data['IsTruncated'], 'Marker' => data['Marker'])
           load(data['Users']) # data is an array of attribute hashes
         end
 
         def get(identity)
-          data = connection.get_user(identity).body['User']
+          data = service.get_user(identity).body['User']
           new(data) # data is an attribute hash
         rescue Fog::AWS::IAM::NotFound
           nil
diff --git a/lib/fog/aws/models/rds/parameter.rb b/lib/fog/aws/models/rds/parameter.rb
index 3e31492ce..f7bb3af6f 100644
--- a/lib/fog/aws/models/rds/parameter.rb
+++ b/lib/fog/aws/models/rds/parameter.rb
@@ -3,7 +3,7 @@ require 'fog/core/model'
 module Fog
   module AWS
     class RDS
-      
+
       class Parameter < Fog::Model
 
         attribute  :name, :aliases => ['ParameterName']
@@ -14,7 +14,7 @@ module Fog
         attribute  :modifiable, :aliases => 'IsModifiable'
         attribute  :apply_type, :aliases => 'ApplyType'
         attribute  :value, :aliases => 'ParameterValue'
-        
+
       end
     end
   end
diff --git a/lib/fog/aws/models/rds/parameter_group.rb b/lib/fog/aws/models/rds/parameter_group.rb
index d584535f0..e96c8ac15 100644
--- a/lib/fog/aws/models/rds/parameter_group.rb
+++ b/lib/fog/aws/models/rds/parameter_group.rb
@@ -3,34 +3,34 @@ require 'fog/core/model'
 module Fog
   module AWS
     class RDS
-      
+
       class ParameterGroup < Fog::Model
 
         identity  :id, :aliases => ['DBParameterGroupName', :name]
         attribute  :family, :aliases => 'DBParameterGroupFamily'
         attribute  :description, :aliases => 'Description'
-        
+
         def save
           requires :family
           requires :description
           requires :id
-          connection.create_db_parameter_group(id, family, description)
+          service.create_db_parameter_group(id, family, description)
         end
-        
+
         def modify(changes)
-          connection.modify_db_parameter_group id, changes.collect {|c| {'ParameterName' => c[:name], 'ParameterValue' => c[:value], 'ApplyMethod' => c[:apply_method]}}
+          service.modify_db_parameter_group id, changes.collect {|c| {'ParameterName' => c[:name], 'ParameterValue' => c[:value], 'ApplyMethod' => c[:apply_method]}}
         end
-        
+
         def destroy
           requires :id
-          connection.delete_db_parameter_group(id)
+          service.delete_db_parameter_group(id)
           true
         end
-        
+
         def parameters(filters={})
-          connection.parameters({:group => self}.merge(filters))
+          service.parameters({:group => self}.merge(filters))
         end
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/aws/models/rds/parameter_groups.rb b/lib/fog/aws/models/rds/parameter_groups.rb
index 2ac75bb11..d1c002c0a 100644
--- a/lib/fog/aws/models/rds/parameter_groups.rb
+++ b/lib/fog/aws/models/rds/parameter_groups.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::AWS::RDS::ParameterGroup
 
         def all
-          data = connection.describe_db_parameter_groups.body['DescribeDBParameterGroupsResult']['DBParameterGroups']
+          data = service.describe_db_parameter_groups.body['DescribeDBParameterGroupsResult']['DBParameterGroups']
           load(data) # data is an array of attribute hashes
         end
 
         def get(identity)
-          data = connection.describe_db_parameter_groups(identity).body['DescribeDBParameterGroupsResult']['DBParameterGroups'].first
+          data = service.describe_db_parameter_groups(identity).body['DescribeDBParameterGroupsResult']['DBParameterGroups'].first
           new(data) # data is an attribute hash
         rescue Fog::AWS::RDS::NotFound
           nil
@@ -24,4 +24,4 @@ module Fog
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/aws/models/rds/parameters.rb b/lib/fog/aws/models/rds/parameters.rb
index 18e69d6fa..7af8447a0 100644
--- a/lib/fog/aws/models/rds/parameters.rb
+++ b/lib/fog/aws/models/rds/parameters.rb
@@ -24,7 +24,7 @@ module Fog
           marker = nil
           finished = false
           while !finished
-            data = connection.describe_db_parameters(group.id, filters.merge(:marker => marker)).body
+            data = service.describe_db_parameters(group.id, filters.merge(:marker => marker)).body
             result.concat(data['DescribeDBParametersResult']['Parameters'])
             marker = data['DescribeDBParametersResult']['Marker']
             finished = marker.nil?
@@ -34,4 +34,4 @@ module Fog
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/aws/models/rds/security_group.rb b/lib/fog/aws/models/rds/security_group.rb
index dbf508697..47d9946f5 100644
--- a/lib/fog/aws/models/rds/security_group.rb
+++ b/lib/fog/aws/models/rds/security_group.rb
@@ -19,7 +19,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_db_security_group(id)
+          service.delete_db_security_group(id)
           true
         end
 
@@ -27,7 +27,7 @@ module Fog
           requires :id
           requires :description
 
-          data = connection.create_db_security_group(id, description).body['CreateDBSecurityGroupResult']['DBSecurityGroup']
+          data = service.create_db_security_group(id, description).body['CreateDBSecurityGroupResult']['DBSecurityGroup']
           merge_attributes(data)
           true
         end
@@ -55,7 +55,7 @@ module Fog
         end
 
         def authorize_ingress(opts)
-          data = connection.authorize_db_security_group_ingress(id, opts).body['AuthorizeDBSecurityGroupIngressResult']['DBSecurityGroup']
+          data = service.authorize_db_security_group_ingress(id, opts).body['AuthorizeDBSecurityGroupIngressResult']['DBSecurityGroup']
           merge_attributes(data)
         end
 
@@ -72,7 +72,7 @@ module Fog
         end
 
         def revoke_ingress(opts)
-          data = connection.revoke_db_security_group_ingress(id, opts).body['RevokeDBSecurityGroupIngressResult']['DBSecurityGroup']
+          data = service.revoke_db_security_group_ingress(id, opts).body['RevokeDBSecurityGroupIngressResult']['DBSecurityGroup']
           merge_attributes(data)
         end
 
diff --git a/lib/fog/aws/models/rds/security_groups.rb b/lib/fog/aws/models/rds/security_groups.rb
index dd5220e7e..0000a221c 100644
--- a/lib/fog/aws/models/rds/security_groups.rb
+++ b/lib/fog/aws/models/rds/security_groups.rb
@@ -20,14 +20,14 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          data = connection.describe_db_security_groups(filters).body['DescribeDBSecurityGroupsResult']['DBSecurityGroups']
+          data = service.describe_db_security_groups(filters).body['DescribeDBSecurityGroupsResult']['DBSecurityGroups']
           load(data) # data is an array of attribute hashes
         end
 
         # Example:
         # get('my_db_security_group') # => model for my_db_security_group
         def get(identity)
-          data = connection.describe_db_security_groups(identity).body['DescribeDBSecurityGroupsResult']['DBSecurityGroups'].first
+          data = service.describe_db_security_groups(identity).body['DescribeDBSecurityGroupsResult']['DBSecurityGroups'].first
           new(data) # data is an attribute hash
         rescue Fog::AWS::RDS::NotFound
           nil
diff --git a/lib/fog/aws/models/rds/server.rb b/lib/fog/aws/models/rds/server.rb
index 5ca7383ab..b64a75227 100644
--- a/lib/fog/aws/models/rds/server.rb
+++ b/lib/fog/aws/models/rds/server.rb
@@ -36,8 +36,8 @@ module Fog
         def create_read_replica(replica_id, options={})
           options[:security_group_names] ||= options['DBSecurityGroups']
           params = self.class.new(options).attributes_to_params
-          connection.create_db_instance_read_replica(replica_id, id, params)
-          connection.servers.get(replica_id)
+          service.create_db_instance_read_replica(replica_id, id, params)
+          service.servers.get(replica_id)
         end
 
         def ready?
@@ -46,42 +46,42 @@ module Fog
 
         def destroy(snapshot_identifier=nil)
           requires :id
-          connection.delete_db_instance(id, snapshot_identifier, snapshot_identifier.nil?)
+          service.delete_db_instance(id, snapshot_identifier, snapshot_identifier.nil?)
           true
         end
 
         def reboot
-          connection.reboot_db_instance(id)
+          service.reboot_db_instance(id)
           true
         end
 
         def snapshots
           requires :id
-          connection.snapshots(:server => self)
+          service.snapshots(:server => self)
         end
 
         def tags
           requires :id
-          connection.list_tags_for_resource(id).
+          service.list_tags_for_resource(id).
             body['ListTagsForResourceResult']['TagList']
         end
 
         def add_tags(new_tags)
           requires :id
-          connection.add_tags_to_resource(id, new_tags)
+          service.add_tags_to_resource(id, new_tags)
           tags
         end
 
         def remove_tags(tag_keys)
           requires :id
-          connection.remove_tags_from_resource(id, tag_keys)
+          service.remove_tags_from_resource(id, tag_keys)
           tags
         end
 
         def modify(immediately, options)
           options[:security_group_names] ||= options['DBSecurityGroups']
           params = self.class.new(options).attributes_to_params
-          data = connection.modify_db_instance(id, immediately, params)
+          data = service.modify_db_instance(id, immediately, params)
           merge_attributes(data.body['ModifyDBInstanceResult']['DBInstance'])
           true
         end
@@ -94,7 +94,7 @@ module Fog
 
           self.flavor_id ||= 'db.m1.small'
 
-          data = connection.create_db_instance(id, attributes_to_params)
+          data = service.create_db_instance(id, attributes_to_params)
           merge_attributes(data.body['CreateDBInstanceResult']['DBInstance'])
           true
         end
diff --git a/lib/fog/aws/models/rds/servers.rb b/lib/fog/aws/models/rds/servers.rb
index d291e9dc5..59cb9d478 100644
--- a/lib/fog/aws/models/rds/servers.rb
+++ b/lib/fog/aws/models/rds/servers.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::AWS::RDS::Server
 
         def all
-          data = connection.describe_db_instances.body['DescribeDBInstancesResult']['DBInstances']
+          data = service.describe_db_instances.body['DescribeDBInstancesResult']['DBInstances']
           load(data) # data is an array of attribute hashes
         end
 
         def get(identity)
-          data = connection.describe_db_instances(identity).body['DescribeDBInstancesResult']['DBInstances'].first
+          data = service.describe_db_instances(identity).body['DescribeDBInstancesResult']['DBInstances'].first
           new(data) # data is an attribute hash
         rescue Fog::AWS::RDS::NotFound
           nil
@@ -24,4 +24,4 @@ module Fog
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/aws/models/rds/snapshot.rb b/lib/fog/aws/models/rds/snapshot.rb
index f9c098c39..8e952175e 100644
--- a/lib/fog/aws/models/rds/snapshot.rb
+++ b/lib/fog/aws/models/rds/snapshot.rb
@@ -26,7 +26,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.delete_db_snapshot(id)
+          service.delete_db_snapshot(id)
           true
         end
 
@@ -34,14 +34,14 @@ module Fog
           requires :instance_id
           requires :id
 
-          data = connection.create_db_snapshot(instance_id, id).body['CreateDBSnapshotResult']['DBSnapshot']
+          data = service.create_db_snapshot(instance_id, id).body['CreateDBSnapshotResult']['DBSnapshot']
           merge_attributes(data)
           true
         end
 
         def server
           requires :instance_id
-          connection.servers.get(instance_id)
+          service.servers.get(instance_id)
         end
 
       end
diff --git a/lib/fog/aws/models/rds/snapshots.rb b/lib/fog/aws/models/rds/snapshots.rb
index dae903931..e5f0b1775 100644
--- a/lib/fog/aws/models/rds/snapshots.rb
+++ b/lib/fog/aws/models/rds/snapshots.rb
@@ -23,12 +23,12 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          data = connection.describe_db_snapshots(filters).body['DescribeDBSnapshotsResult']['DBSnapshots']
+          data = service.describe_db_snapshots(filters).body['DescribeDBSnapshotsResult']['DBSnapshots']
           load(data) # data is an array of attribute hashes
         end
 
         def get(identity)
-          data = connection.describe_db_snapshots(:snapshot_id => identity).body['DescribeDBSnapshotsResult']['DBSnapshots'].first
+          data = service.describe_db_snapshots(:snapshot_id => identity).body['DescribeDBSnapshotsResult']['DBSnapshots'].first
           new(data) # data is an attribute hash
         rescue Fog::AWS::RDS::NotFound
           nil
@@ -45,4 +45,4 @@ module Fog
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/aws/models/rds/subnet_groups.rb b/lib/fog/aws/models/rds/subnet_groups.rb
index 661025ea9..6b5ad6ed0 100644
--- a/lib/fog/aws/models/rds/subnet_groups.rb
+++ b/lib/fog/aws/models/rds/subnet_groups.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::AWS::RDS::SubnetGroup
 
         def all
-          data = connection.describe_db_subnet_groups.body['DescribeDBSubnetGroupsResult']['DBSubnetGroups']
+          data = service.describe_db_subnet_groups.body['DescribeDBSubnetGroupsResult']['DBSubnetGroups']
           load(data) # data is an array of attribute hashes
         end
 
         def get(identity)
-          data = connection.describe_db_subnet_groups(identity).body['DescribeDBSubnetGroupsResult']['DBSubnetGroups'].first
+          data = service.describe_db_subnet_groups(identity).body['DescribeDBSubnetGroupsResult']['DBSubnetGroups'].first
           new(data) # data is an attribute hash
         rescue Fog::AWS::RDS::NotFound
           nil
diff --git a/lib/fog/aws/models/storage/directories.rb b/lib/fog/aws/models/storage/directories.rb
index ac66856cf..b3a9ddb0a 100644
--- a/lib/fog/aws/models/storage/directories.rb
+++ b/lib/fog/aws/models/storage/directories.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Storage::AWS::Directory
 
         def all
-          data = connection.get_service.body['Buckets']
+          data = service.get_service.body['Buckets']
           load(data)
         end
 
@@ -21,7 +21,7 @@ module Fog
             :max_keys   => 'max-keys',
             :prefix     => 'prefix'
           })
-          data = connection.get_bucket(key, options).body
+          data = service.get_bucket(key, options).body
           directory = new(:key => data['Name'])
           options = {}
           for k, v in data
diff --git a/lib/fog/aws/models/storage/directory.rb b/lib/fog/aws/models/storage/directory.rb
index c88d93fe0..bd108a700 100644
--- a/lib/fog/aws/models/storage/directory.rb
+++ b/lib/fog/aws/models/storage/directory.rb
@@ -28,7 +28,7 @@ module Fog
 
         def destroy
           requires :key
-          connection.delete_bucket(key)
+          service.delete_bucket(key)
           true
         rescue Excon::Errors::NotFound
           false
@@ -36,7 +36,7 @@ module Fog
 
         def location
           requires :key
-          attributes[:location] || bucket_location || self.connection.region
+          attributes[:location] || bucket_location || self.service.region
         end
 
         def location=(new_location)
@@ -48,34 +48,34 @@ module Fog
         end
 
         def files
-          @files ||= Fog::Storage::AWS::Files.new(:directory => self, :connection => connection)
+          @files ||= Fog::Storage::AWS::Files.new(:directory => self, :service => service)
         end
 
         def payer
           requires :key
-          data = connection.get_request_payment(key)
+          data = service.get_request_payment(key)
           data.body['Payer']
         end
 
         def payer=(new_payer)
           requires :key
-          connection.put_request_payment(key, new_payer)
+          service.put_request_payment(key, new_payer)
           @payer = new_payer
         end
 
         def versioning?
           requires :key
-          data = connection.get_bucket_versioning(key)
+          data = service.get_bucket_versioning(key)
           data.body['VersioningConfiguration']['Status'] == 'Enabled'
         end
 
         def versioning=(new_versioning)
           requires :key
-          connection.put_bucket_versioning(key, new_versioning ? 'Enabled' : 'Suspended')
+          service.put_bucket_versioning(key, new_versioning ? 'Enabled' : 'Suspended')
         end
 
         def versions
-          @versions ||= Fog::Storage::AWS::Versions.new(:directory => self, :connection => connection)
+          @versions ||= Fog::Storage::AWS::Versions.new(:directory => self, :service => service)
         end
 
         def public=(new_public)
@@ -85,7 +85,7 @@ module Fog
 
         def public_url
           requires :key
-          if connection.get_bucket_acl(key).body['AccessControlList'].detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' && grant['Permission'] == 'READ'}
+          if service.get_bucket_acl(key).body['AccessControlList'].detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' && grant['Permission'] == 'READ'}
             if key.to_s =~ Fog::AWS::COMPLIANT_BUCKET_NAMES
               "https://#{key}.s3.amazonaws.com"
             else
@@ -103,11 +103,11 @@ module Fog
 
           options['x-amz-acl'] = acl if acl
 
-          if location = attributes[:location] || (self.connection.region != 'us-east-1' && self.connection.region)
+          if location = attributes[:location] || (self.service.region != 'us-east-1' && self.service.region)
             options['LocationConstraint'] = location
           end
 
-          connection.put_bucket(key, options)
+          service.put_bucket(key, options)
 
           true
         end
@@ -115,7 +115,7 @@ module Fog
         private
 
         def bucket_location
-          data = connection.get_bucket_location(key)
+          data = service.get_bucket_location(key)
           data.body['LocationConstraint']
         end
 
diff --git a/lib/fog/aws/models/storage/file.rb b/lib/fog/aws/models/storage/file.rb
index c1e8c46e5..1be0cb7f5 100644
--- a/lib/fog/aws/models/storage/file.rb
+++ b/lib/fog/aws/models/storage/file.rb
@@ -90,8 +90,8 @@ module Fog
         # 
         def copy(target_directory_key, target_file_key, options = {})
           requires :directory, :key
-          connection.copy_object(directory.key, key, target_directory_key, target_file_key, options)
-          target_directory = connection.directories.new(:key => target_directory_key)
+          service.copy_object(directory.key, key, target_directory_key, target_file_key, options)
+          target_directory = service.directories.new(:key => target_directory_key)
           target_directory.files.head(target_file_key)
         end
 
@@ -107,7 +107,7 @@ module Fog
         def destroy(options = {})
           requires :directory, :key
           attributes[:body] = nil if options['versionId'] == version
-          connection.delete_object(directory.key, key, options)
+          service.delete_object(directory.key, key, options)
           true
         end
 
@@ -162,7 +162,7 @@ module Fog
         # 
         def public_url
           requires :directory, :key
-          if connection.get_object_acl(directory.key, key).body['AccessControlList'].detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' && grant['Permission'] == 'READ'}
+          if service.get_object_acl(directory.key, key).body['AccessControlList'].detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' && grant['Permission'] == 'READ'}
             if directory.key.to_s =~ Fog::AWS::COMPLIANT_BUCKET_NAMES
               "https://#{directory.key}.s3.amazonaws.com/#{Fog::AWS.escape(key)}".gsub('%2F','/')
             else
@@ -173,7 +173,6 @@ module Fog
           end
         end
 
-
         # Save file with body as contents to directory.key with name key via http PUT
         # 
         #   required attributes: body, directory, key
@@ -210,7 +209,7 @@ module Fog
             data = multipart_save(options)
             merge_attributes(data.body)
           else
-            data = connection.put_object(directory.key, key, body, options)
+            data = service.put_object(directory.key, key, body, options)
             merge_attributes(data.headers.reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)})
           end
           self.etag.gsub!('"','')
@@ -241,7 +240,7 @@ module Fog
           @versions ||= begin
             Fog::Storage::AWS::Versions.new(
               :file         => self,
-              :connection   => connection
+              :service   => service
             )
           end
         end
@@ -254,7 +253,7 @@ module Fog
 
         def multipart_save(options)
           # Initiate the upload
-          res = connection.initiate_multipart_upload(directory.key, key, options)
+          res = service.initiate_multipart_upload(directory.key, key, options)
           upload_id = res.body["UploadId"]
 
           # Store ETags of upload parts
@@ -267,17 +266,17 @@ module Fog
           body.rewind if body.respond_to?(:rewind)
           while (chunk = body.read(multipart_chunk_size)) do
             md5 = Base64.encode64(Digest::MD5.digest(chunk)).strip
-            part_upload = connection.upload_part(directory.key, key, upload_id, part_tags.size + 1, chunk, 'Content-MD5' => md5 )
+            part_upload = service.upload_part(directory.key, key, upload_id, part_tags.size + 1, chunk, 'Content-MD5' => md5 )
             part_tags << part_upload.headers["ETag"]
           end
 
         rescue
           # Abort the upload & reraise
-          connection.abort_multipart_upload(directory.key, key, upload_id) if upload_id
+          service.abort_multipart_upload(directory.key, key, upload_id) if upload_id
           raise
         else
           # Complete the upload
-          connection.complete_multipart_upload(directory.key, key, upload_id, part_tags)
+          service.complete_multipart_upload(directory.key, key, upload_id, part_tags)
         end
 
       end
diff --git a/lib/fog/aws/models/storage/files.rb b/lib/fog/aws/models/storage/files.rb
index 08aa6c9ae..c904f25fa 100644
--- a/lib/fog/aws/models/storage/files.rb
+++ b/lib/fog/aws/models/storage/files.rb
@@ -60,7 +60,7 @@ module Fog
 
         def get(key, options = {}, &block)
           requires :directory
-          data = connection.get_object(directory.key, key, options, &block)
+          data = service.get_object(directory.key, key, options, &block)
           file_data = data.headers.merge({
             :body => data.body,
             :key  => key
@@ -80,22 +80,22 @@ module Fog
 
         def get_url(key, expires, options = {})
           requires :directory
-          connection.get_object_url(directory.key, key, expires, options)
+          service.get_object_url(directory.key, key, expires, options)
         end
 
         def get_http_url(key, expires, options = {})
           requires :directory
-          connection.get_object_http_url(directory.key, key, expires, options)
+          service.get_object_http_url(directory.key, key, expires, options)
         end
 
         def get_https_url(key, expires, options = {})
           requires :directory
-          connection.get_object_https_url(directory.key, key, expires, options)
+          service.get_object_https_url(directory.key, key, expires, options)
         end
 
         def head(key, options = {})
           requires :directory
-          data = connection.head_object(directory.key, key, options)
+          data = service.head_object(directory.key, key, options)
           file_data = data.headers.merge({
             :key => key
           })
diff --git a/lib/fog/aws/models/storage/version.rb b/lib/fog/aws/models/storage/version.rb
index eaffa083f..38b355ca6 100644
--- a/lib/fog/aws/models/storage/version.rb
+++ b/lib/fog/aws/models/storage/version.rb
@@ -24,9 +24,9 @@ module Fog
 
         def destroy
           if collection.file
-            collection.connection.delete_object(collection.file.directory.key, key, 'versionId' => version)
+            collection.service.delete_object(collection.file.directory.key, key, 'versionId' => version)
           else
-            collection.connection.delete_object(collection.directory.key, key, 'versionId' => version)
+            collection.service.delete_object(collection.directory.key, key, 'versionId' => version)
           end
         end
       end
diff --git a/lib/fog/aws/models/storage/versions.rb b/lib/fog/aws/models/storage/versions.rb
index ff46d4bb9..0d3e59fb4 100644
--- a/lib/fog/aws/models/storage/versions.rb
+++ b/lib/fog/aws/models/storage/versions.rb
@@ -14,9 +14,9 @@ module Fog
 
         def all(options = {})
           data = if file
-            connection.get_bucket_object_versions(file.directory.key, options.merge('prefix' => file.key)).body['Versions']
+            service.get_bucket_object_versions(file.directory.key, options.merge('prefix' => file.key)).body['Versions']
           else
-            connection.get_bucket_object_versions(directory.key, options).body['Versions']
+            service.get_bucket_object_versions(directory.key, options).body['Versions']
           end
 
           load(data)
@@ -35,4 +35,4 @@ module Fog
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/bluebox/models/compute/flavors.rb b/lib/fog/bluebox/models/compute/flavors.rb
index 59a8ed7ac..7ce0df18f 100644
--- a/lib/fog/bluebox/models/compute/flavors.rb
+++ b/lib/fog/bluebox/models/compute/flavors.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Bluebox::Flavor
 
         def all
-          data = connection.get_products.body
+          data = service.get_products.body
           load(data)
         end
 
         def get(product_id)
-          response = connection.get_product(product_id)
+          response = service.get_product(product_id)
           new(response.body)
         rescue Fog::Compute::Bluebox::NotFound
           nil
diff --git a/lib/fog/bluebox/models/compute/image.rb b/lib/fog/bluebox/models/compute/image.rb
index f3af4709e..660867958 100644
--- a/lib/fog/bluebox/models/compute/image.rb
+++ b/lib/fog/bluebox/models/compute/image.rb
@@ -7,26 +7,26 @@ module Fog
       class Image < Fog::Model
 
         identity :id
-        
+
         attribute :block_id
         attribute :description
         attribute :public
         attribute :created_at, :aliases => 'created'
-        
+
         def save
           requires :block_id
-          
-          data = connection.create_template(block_id, attributes)
+
+          data = service.create_template(block_id, attributes)
           true
         end
-        
+
         def destroy
           requires :id
-          
-          data = connection.destroy_template(id)
+
+          data = service.destroy_template(id)
           true
         end
-        
+
       end
 
     end
diff --git a/lib/fog/bluebox/models/compute/images.rb b/lib/fog/bluebox/models/compute/images.rb
index be622a610..0f563dbf5 100644
--- a/lib/fog/bluebox/models/compute/images.rb
+++ b/lib/fog/bluebox/models/compute/images.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Bluebox::Image
 
         def all
-          data = connection.get_templates.body
+          data = service.get_templates.body
           load(data)
         end
 
         def get(template_id)
-          response = connection.get_template(template_id)
+          response = service.get_template(template_id)
           new(response.body)
         rescue Fog::Compute::Bluebox::NotFound
           nil
diff --git a/lib/fog/bluebox/models/compute/locations.rb b/lib/fog/bluebox/models/compute/locations.rb
index d03118802..ecbb56f1d 100644
--- a/lib/fog/bluebox/models/compute/locations.rb
+++ b/lib/fog/bluebox/models/compute/locations.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Bluebox::Location
 
         def all
-          data = connection.get_locations.body
+          data = service.get_locations.body
           load(data)
         end
 
         def get(location_id)
-          response = connection.get_location(location_id)
+          response = service.get_location(location_id)
           new(response.body)
         rescue Fog::Compute::Bluebox::NotFound
           nil
diff --git a/lib/fog/bluebox/models/compute/server.rb b/lib/fog/bluebox/models/compute/server.rb
index 145a58c9e..523706687 100644
--- a/lib/fog/bluebox/models/compute/server.rb
+++ b/lib/fog/bluebox/models/compute/server.rb
@@ -33,23 +33,23 @@ module Fog
 
         def destroy
           requires :id
-          connection.destroy_block(id)
+          service.destroy_block(id)
           true
         end
 
         def flavor
           requires :flavor_id
-          connection.flavors.get(flavor_id)
+          service.flavors.get(flavor_id)
         end
 
         def image
           requires :image_id
-          connection.images.get(image_id)
+          service.images.get(image_id)
         end
-        
+
         def location
           requires :location_id
-          connection.locations.get(location_id)
+          service.locations.get(location_id)
         end
 
         def private_ip_address
@@ -66,7 +66,7 @@ module Fog
 
         def reboot(type = 'SOFT')
           requires :id
-          connection.reboot_block(id, type)
+          service.reboot_block(id, type)
           true
         end
 
@@ -88,10 +88,10 @@ module Fog
           elsif @lb_applications
             options['lb_applications'] = lb_applications
           end
-          
+
           options['username'] = username
           options['hostname'] = hostname if @hostname
-          data = connection.create_block(flavor_id, image_id, location_id, options)
+          data = service.create_block(flavor_id, image_id, location_id, options)
           merge_attributes(data.body)
           true
         end
diff --git a/lib/fog/bluebox/models/compute/servers.rb b/lib/fog/bluebox/models/compute/servers.rb
index 55a56e636..360d8a779 100644
--- a/lib/fog/bluebox/models/compute/servers.rb
+++ b/lib/fog/bluebox/models/compute/servers.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Bluebox::Server
 
         def all
-          data = connection.get_blocks.body
+          data = service.get_blocks.body
           load(data)
         end
 
@@ -22,7 +22,7 @@ module Fog
         end
 
         def get(server_id)
-          if server_id && server = connection.get_block(server_id).body
+          if server_id && server = service.get_block(server_id).body
             new(server)
           end
         rescue Fog::Compute::Bluebox::NotFound
diff --git a/lib/fog/bluebox/models/dns/record.rb b/lib/fog/bluebox/models/dns/record.rb
index 4156f8cf5..09fb66416 100644
--- a/lib/fog/bluebox/models/dns/record.rb
+++ b/lib/fog/bluebox/models/dns/record.rb
@@ -23,7 +23,7 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_record(@zone.identity, identity)
+          service.delete_record(@zone.identity, identity)
           true
         end
 
@@ -34,9 +34,9 @@ module Fog
         def save
           requires :zone, :type, :name, :value
           data = unless identity
-            connection.create_record(zone.identity, type, name, value)
+            service.create_record(zone.identity, type, name, value)
           else
-            connection.update_record(zone.identity, identity, {:type => type, :name => name, :content => value})
+            service.update_record(zone.identity, identity, {:type => type, :name => name, :content => value})
           end
           merge_attributes(data.body)
           true
diff --git a/lib/fog/bluebox/models/dns/records.rb b/lib/fog/bluebox/models/dns/records.rb
index eb7fd2493..bf8f1a2e6 100644
--- a/lib/fog/bluebox/models/dns/records.rb
+++ b/lib/fog/bluebox/models/dns/records.rb
@@ -13,12 +13,12 @@ module Fog
 
         def all
           requires :zone
-          data = connection.get_records(zone.identity).body['records']
+          data = service.get_records(zone.identity).body['records']
           load(data)
         end
 
         def get(record_id)
-          data = connection.get_record(zone.identity, record_id).body
+          data = service.get_record(zone.identity, record_id).body
           new(data)
         rescue Fog::Service::NotFound
           nil
diff --git a/lib/fog/bluebox/models/dns/zone.rb b/lib/fog/bluebox/models/dns/zone.rb
index f081e8c44..a7c6d211f 100644
--- a/lib/fog/bluebox/models/dns/zone.rb
+++ b/lib/fog/bluebox/models/dns/zone.rb
@@ -31,7 +31,7 @@ module Fog
           @records ||= begin
             Fog::DNS::Bluebox::Records.new(
               :zone       => self,
-              :connection => connection
+              :service => service
             )
           end
         end
@@ -46,7 +46,7 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_zone(identity)
+          service.delete_zone(identity)
           true
         end
 
@@ -54,7 +54,7 @@ module Fog
           requires :domain, :ttl
           options = attributes.dup
           options[:name] = options.delete(:domain)
-          data = identity.nil? ? connection.create_zone(options) : connection.update_zone(identity, options)
+          data = identity.nil? ? service.create_zone(options) : service.update_zone(identity, options)
           merge_attributes(data.body)
           true
         end
diff --git a/lib/fog/bluebox/models/dns/zones.rb b/lib/fog/bluebox/models/dns/zones.rb
index dfb2f7fcd..b82535500 100644
--- a/lib/fog/bluebox/models/dns/zones.rb
+++ b/lib/fog/bluebox/models/dns/zones.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::DNS::Bluebox::Zone
 
         def all
-          data = connection.get_zones.body['zones']
+          data = service.get_zones.body['zones']
           load(data)
         end
 
         def get(zone_id)
-          data = connection.get_zone(zone_id).body
+          data = service.get_zone(zone_id).body
           new(data)
         rescue Fog::Service::NotFound
           nil
diff --git a/lib/fog/brightbox/compute.rb b/lib/fog/brightbox/compute.rb
index 427d9d021..1fb9d5daa 100644
--- a/lib/fog/brightbox/compute.rb
+++ b/lib/fog/brightbox/compute.rb
@@ -138,7 +138,7 @@ module Fog
 
         # Creates a new instance of the Brightbox Compute service
         #
-        # @note If you open a connection using just a refresh token when it
+        # @note If you create service using just a refresh token when it
         #   expires the service will no longer be able to authenticate.
         #
         # @param [Hash] options
@@ -209,15 +209,13 @@ module Fog
         #
         # * For API clients this is the owning account
         # * For User applications this is the account specified by either +account_id+
-        #   option on a connection or the +brightbox_account+ setting in your configuration
+        #   option on the service or the +brightbox_account+ setting in your configuration
         #
         # @return [Fog::Compute::Brightbox::Account]
         #
         def account
-          Fog::Compute::Brightbox::Account.new(get_scoped_account).tap do |acc|
-            # Connection is more like the compute 'service'
-            acc.connection = self
-          end
+          account_data = get_scoped_account.merge(:service => self)
+          Fog::Compute::Brightbox::Account.new(account_data)
         end
 
         # Returns true if authentication is being performed as a user
diff --git a/lib/fog/brightbox/models/compute/account.rb b/lib/fog/brightbox/models/compute/account.rb
index 0850cff51..d0427234e 100644
--- a/lib/fog/brightbox/models/compute/account.rb
+++ b/lib/fog/brightbox/models/compute/account.rb
@@ -57,7 +57,7 @@ module Fog
         #
         def reset_ftp_password
           requires :identity
-          data = connection.reset_ftp_password_account(identity)
+          data = service.reset_ftp_password_account(identity)
           merge_attributes(data)
           library_ftp_password
         end
diff --git a/lib/fog/brightbox/models/compute/accounts.rb b/lib/fog/brightbox/models/compute/accounts.rb
index 9abd87164..3690944fe 100644
--- a/lib/fog/brightbox/models/compute/accounts.rb
+++ b/lib/fog/brightbox/models/compute/accounts.rb
@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::Brightbox::Account
 
         def all
-          data = connection.list_accounts
+          data = service.list_accounts
           load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.get_account(identifier)
+          data = service.get_account(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
@@ -26,4 +26,4 @@ module Fog
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/brightbox/models/compute/api_client.rb b/lib/fog/brightbox/models/compute/api_client.rb
index 615805ea5..b899af2a9 100644
--- a/lib/fog/brightbox/models/compute/api_client.rb
+++ b/lib/fog/brightbox/models/compute/api_client.rb
@@ -15,20 +15,20 @@ module Fog
             :name => name,
             :description => description
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.create_api_client(options)
+          data = service.create_api_client(options)
           merge_attributes(data)
           true
         end
 
         def destroy
           requires :identity
-          connection.destroy_api_client(identity)
+          service.destroy_api_client(identity)
           true
         end
 
         def reset_secret
           requires :identity
-          connection.reset_secret_api_client(identity)
+          service.reset_secret_api_client(identity)
           true
         end
       end
diff --git a/lib/fog/brightbox/models/compute/api_clients.rb b/lib/fog/brightbox/models/compute/api_clients.rb
index 33ded8a33..3ff35caa6 100644
--- a/lib/fog/brightbox/models/compute/api_clients.rb
+++ b/lib/fog/brightbox/models/compute/api_clients.rb
@@ -8,12 +8,12 @@ module Fog
         model Fog::Compute::Brightbox::ApiClient
 
         def all
-          data = connection.list_api_clients
+          data = service.list_api_clients
           load(data)
         end
 
         def get(identifier = nil)
-          data = connection.get_api_client(identifier)
+          data = service.get_api_client(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
diff --git a/lib/fog/brightbox/models/compute/application.rb b/lib/fog/brightbox/models/compute/application.rb
index 925a8a803..240936501 100644
--- a/lib/fog/brightbox/models/compute/application.rb
+++ b/lib/fog/brightbox/models/compute/application.rb
@@ -16,7 +16,7 @@ module Fog
           options = {
             :name => name
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.create_application(options)
+          data = service.create_application(options)
           merge_attributes(data)
           true
         end
diff --git a/lib/fog/brightbox/models/compute/applications.rb b/lib/fog/brightbox/models/compute/applications.rb
index 9c3704d93..ed2bfb67b 100644
--- a/lib/fog/brightbox/models/compute/applications.rb
+++ b/lib/fog/brightbox/models/compute/applications.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Brightbox::Application
 
         def all
-          data = connection.list_applications
+          data = service.list_applications
           load(data)
         end
 
         def get(identifier)
-          data = connection.get_application(identifier)
+          data = service.get_application(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
@@ -25,4 +25,4 @@ module Fog
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/brightbox/models/compute/cloud_ip.rb b/lib/fog/brightbox/models/compute/cloud_ip.rb
index 0970f4780..f29a8d438 100644
--- a/lib/fog/brightbox/models/compute/cloud_ip.rb
+++ b/lib/fog/brightbox/models/compute/cloud_ip.rb
@@ -36,7 +36,7 @@ module Fog
           else
             final_destination = destination
           end
-          connection.map_cloud_ip(identity, :destination => final_destination)
+          service.map_cloud_ip(identity, :destination => final_destination)
         end
 
         def mapped?
@@ -45,12 +45,12 @@ module Fog
 
         def unmap
           requires :identity
-          connection.unmap_cloud_ip(identity)
+          service.unmap_cloud_ip(identity)
         end
 
         def destroy
           requires :identity
-          connection.destroy_cloud_ip(identity)
+          service.destroy_cloud_ip(identity)
         end
 
       end
diff --git a/lib/fog/brightbox/models/compute/cloud_ips.rb b/lib/fog/brightbox/models/compute/cloud_ips.rb
index 63526a08d..4d0308c38 100644
--- a/lib/fog/brightbox/models/compute/cloud_ips.rb
+++ b/lib/fog/brightbox/models/compute/cloud_ips.rb
@@ -10,20 +10,20 @@ module Fog
         model Fog::Compute::Brightbox::CloudIp
 
         def all
-          data = connection.list_cloud_ips
+          data = service.list_cloud_ips
           load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.get_cloud_ip(identifier)
+          data = service.get_cloud_ip(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
         end
 
         def allocate
-          data = connection.create_cloud_ip
+          data = service.create_cloud_ip
           new(data)
         end
 
@@ -31,4 +31,4 @@ module Fog
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/brightbox/models/compute/firewall_policies.rb b/lib/fog/brightbox/models/compute/firewall_policies.rb
index e56159948..d42ffbeee 100644
--- a/lib/fog/brightbox/models/compute/firewall_policies.rb
+++ b/lib/fog/brightbox/models/compute/firewall_policies.rb
@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::Brightbox::FirewallPolicy
 
         def all
-          data = connection.list_firewall_policies
+          data = service.list_firewall_policies
           load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.get_firewall_policy(identifier)
+          data = service.get_firewall_policy(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
@@ -26,4 +26,4 @@ module Fog
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/brightbox/models/compute/firewall_policy.rb b/lib/fog/brightbox/models/compute/firewall_policy.rb
index a628574e8..70446332d 100644
--- a/lib/fog/brightbox/models/compute/firewall_policy.rb
+++ b/lib/fog/brightbox/models/compute/firewall_policy.rb
@@ -27,7 +27,7 @@ module Fog
             :name => name,
             :description => description
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.create_firewall_policy(options)
+          data = service.create_firewall_policy(options)
           merge_attributes(data)
           true
         end
@@ -37,7 +37,7 @@ module Fog
           options = {
             :server_group => server_group_id
           }
-          data = connection.apply_to_firewall_policy(identity, options)
+          data = service.apply_to_firewall_policy(identity, options)
           merge_attributes(data)
           true
         end
@@ -47,14 +47,14 @@ module Fog
           options = {
             :server_group => server_group_id
           }
-          data = connection.remove_firewall_policy(identity, options)
+          data = service.remove_firewall_policy(identity, options)
           merge_attributes(data)
           true
         end
 
         def destroy
           requires :identity
-          data = connection.destroy_firewall_policy(identity)
+          data = service.destroy_firewall_policy(identity)
           true
         end
 
diff --git a/lib/fog/brightbox/models/compute/firewall_rule.rb b/lib/fog/brightbox/models/compute/firewall_rule.rb
index 263ecc567..bdce21cb5 100644
--- a/lib/fog/brightbox/models/compute/firewall_rule.rb
+++ b/lib/fog/brightbox/models/compute/firewall_rule.rb
@@ -36,14 +36,14 @@ module Fog
             :destination_port => destination_port,
             :icmp_type_name => icmp_type_name
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.create_firewall_rule(options)
+          data = service.create_firewall_rule(options)
           merge_attributes(data)
           true
         end
 
         def destroy
           requires :identity
-          connection.destroy_firewall_rule(identity)
+          service.destroy_firewall_rule(identity)
           true
         end
 
diff --git a/lib/fog/brightbox/models/compute/firewall_rules.rb b/lib/fog/brightbox/models/compute/firewall_rules.rb
index 6476eae8e..f22026600 100644
--- a/lib/fog/brightbox/models/compute/firewall_rules.rb
+++ b/lib/fog/brightbox/models/compute/firewall_rules.rb
@@ -11,7 +11,7 @@ module Fog
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.get_firewall_rule(identifier)
+          data = service.get_firewall_rule(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
@@ -21,4 +21,4 @@ module Fog
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/brightbox/models/compute/flavors.rb b/lib/fog/brightbox/models/compute/flavors.rb
index a67df22f3..908dcb67b 100644
--- a/lib/fog/brightbox/models/compute/flavors.rb
+++ b/lib/fog/brightbox/models/compute/flavors.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Brightbox::Flavor
 
         def all
-          data = connection.list_server_types
+          data = service.list_server_types
           load(data)
         end
 
         def get(identifier)
-          data = connection.get_server_type(identifier)
+          data = service.get_server_type(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
@@ -25,4 +25,4 @@ module Fog
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/brightbox/models/compute/image.rb b/lib/fog/brightbox/models/compute/image.rb
index ac2534b21..616e24bc5 100644
--- a/lib/fog/brightbox/models/compute/image.rb
+++ b/lib/fog/brightbox/models/compute/image.rb
@@ -48,14 +48,14 @@ module Fog
             :username => username,
             :description => description
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.create_image(options)
+          data = service.create_image(options)
           merge_attributes(data)
           true
         end
 
         def destroy
           requires :identity
-          connection.destroy_image(identity)
+          service.destroy_image(identity)
           true
         end
 
diff --git a/lib/fog/brightbox/models/compute/images.rb b/lib/fog/brightbox/models/compute/images.rb
index 2f3e7726c..e401ebffc 100644
--- a/lib/fog/brightbox/models/compute/images.rb
+++ b/lib/fog/brightbox/models/compute/images.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Brightbox::Image
 
         def all
-          data = connection.list_images
+          data = service.list_images
           load(data)
         end
 
         def get(identifier)
-          data = connection.get_image(identifier)
+          data = service.get_image(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
diff --git a/lib/fog/brightbox/models/compute/load_balancer.rb b/lib/fog/brightbox/models/compute/load_balancer.rb
index 0042b477b..8f7a15399 100644
--- a/lib/fog/brightbox/models/compute/load_balancer.rb
+++ b/lib/fog/brightbox/models/compute/load_balancer.rb
@@ -41,14 +41,14 @@ module Fog
             :policy => policy,
             :name => name
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.create_load_balancer(options)
+          data = service.create_load_balancer(options)
           merge_attributes(data)
           true
         end
 
         def destroy
           requires :identity
-          connection.destroy_load_balancer(identity)
+          service.destroy_load_balancer(identity)
           true
         end
 
diff --git a/lib/fog/brightbox/models/compute/load_balancers.rb b/lib/fog/brightbox/models/compute/load_balancers.rb
index ba170c3c3..a88b2c166 100644
--- a/lib/fog/brightbox/models/compute/load_balancers.rb
+++ b/lib/fog/brightbox/models/compute/load_balancers.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Brightbox::LoadBalancer
 
         def all
-          data = connection.list_load_balancers
+          data = service.list_load_balancers
           load(data)
         end
 
         def get(identifier)
-          data = connection.get_load_balancer(identifier)
+          data = service.get_load_balancer(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
diff --git a/lib/fog/brightbox/models/compute/server.rb b/lib/fog/brightbox/models/compute/server.rb
index 443d9124c..519ec69e2 100644
--- a/lib/fog/brightbox/models/compute/server.rb
+++ b/lib/fog/brightbox/models/compute/server.rb
@@ -38,10 +38,9 @@ module Fog
         attribute :server_type
 
         def initialize(attributes={})
-          # Call super first to initialize the 'connection' object for our default image
+          # Call super first to initialize the service object for our default image
           super
-          # FIXME connection is actually <Fog::Compute::Brightbox::Real> not <Fog::Connection>
-          self.image_id ||= connection.default_image
+          self.image_id ||= service.default_image
         end
 
         def zone_id
@@ -70,7 +69,7 @@ module Fog
 
         def snapshot
           requires :identity
-          connection.snapshot_server(identity)
+          service.snapshot_server(identity)
         end
 
         # Directly requesting a server reboot is not supported in the API
@@ -97,36 +96,36 @@ module Fog
 
         def start
           requires :identity
-          connection.start_server(identity)
+          service.start_server(identity)
           true
         end
 
         def stop
           requires :identity
-          connection.stop_server(identity)
+          service.stop_server(identity)
           true
         end
 
         def shutdown
           requires :identity
-          connection.shutdown_server(identity)
+          service.shutdown_server(identity)
           true
         end
 
         def destroy
           requires :identity
-          connection.destroy_server(identity)
+          service.destroy_server(identity)
           true
         end
 
         def flavor
           requires :flavor_id
-          connection.flavors.get(flavor_id)
+          service.flavors.get(flavor_id)
         end
 
         def image
           requires :image_id
-          connection.images.get(image_id)
+          service.images.get(image_id)
         end
 
         # Returns the public DNS name of the server
@@ -159,7 +158,7 @@ module Fog
 
         def activate_console
           requires :identity
-          response = connection.activate_console_server(identity)
+          response = service.activate_console_server(identity)
           [response["console_url"], response["console_token"], response["console_token_expires"]]
         end
 
@@ -176,7 +175,7 @@ module Fog
           unless flavor_id.nil? || flavor_id == ""
             options.merge!(:server_type => flavor_id)
           end
-          data = connection.create_server(options)
+          data = service.create_server(options)
           merge_attributes(data)
           true
         end
diff --git a/lib/fog/brightbox/models/compute/server_group.rb b/lib/fog/brightbox/models/compute/server_group.rb
index 9a0626bf6..42c04c125 100644
--- a/lib/fog/brightbox/models/compute/server_group.rb
+++ b/lib/fog/brightbox/models/compute/server_group.rb
@@ -25,7 +25,7 @@ module Fog
             :name => name,
             :description => description
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.create_server_group(options)
+          data = service.create_server_group(options)
           merge_attributes(data)
           true
         end
@@ -33,7 +33,7 @@ module Fog
         def servers
           srv_ids = server_ids.collect {|srv| srv["id"]}
           srv_ids.collect do |srv_id|
-            connection.servers.get(srv_id)
+            service.servers.get(srv_id)
           end
         end
 
@@ -46,7 +46,7 @@ module Fog
           options = {
             :servers => server_references(identifiers)
           }
-          data = connection.add_servers_server_group identity, options
+          data = service.add_servers_server_group identity, options
           merge_attributes data
         end
 
@@ -59,7 +59,7 @@ module Fog
           options = {
             :servers => server_references(identifiers)
           }
-          data = connection.remove_servers_server_group identity, options
+          data = service.remove_servers_server_group identity, options
           merge_attributes data
         end
 
@@ -74,13 +74,13 @@ module Fog
             :servers => server_references(identifiers),
             :destination => destination_group_id
           }
-          data = connection.move_servers_server_group identity, options
+          data = service.move_servers_server_group identity, options
           merge_attributes data
         end
 
         def destroy
           requires :identity
-          connection.destroy_server_group(identity)
+          service.destroy_server_group(identity)
           true
         end
 
diff --git a/lib/fog/brightbox/models/compute/server_groups.rb b/lib/fog/brightbox/models/compute/server_groups.rb
index 9fe3b942a..b2c85f48c 100644
--- a/lib/fog/brightbox/models/compute/server_groups.rb
+++ b/lib/fog/brightbox/models/compute/server_groups.rb
@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::Brightbox::ServerGroup
 
         def all
-          data = connection.list_server_groups
+          data = service.list_server_groups
           load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.get_server_group(identifier)
+          data = service.get_server_group(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
@@ -26,4 +26,4 @@ module Fog
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/brightbox/models/compute/servers.rb b/lib/fog/brightbox/models/compute/servers.rb
index 56f33ba86..d921b5d68 100644
--- a/lib/fog/brightbox/models/compute/servers.rb
+++ b/lib/fog/brightbox/models/compute/servers.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Brightbox::Server
 
         def all
-          data = connection.list_servers
+          data = service.list_servers
           load(data)
         end
 
@@ -38,7 +38,7 @@ module Fog
           server.wait_for { ready? }
 
           # To get a public IP address we need to map a cloud IP address
-          cip = connection.cloud_ips.allocate
+          cip = service.cloud_ips.allocate
           cip.map(server)
           cip.wait_for { mapped? }
 
@@ -48,7 +48,7 @@ module Fog
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.get_server(identifier)
+          data = service.get_server(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
diff --git a/lib/fog/brightbox/models/compute/user.rb b/lib/fog/brightbox/models/compute/user.rb
index 5b4c86de2..9f1917813 100644
--- a/lib/fog/brightbox/models/compute/user.rb
+++ b/lib/fog/brightbox/models/compute/user.rb
@@ -31,7 +31,7 @@ module Fog
             :name => name
           }
 
-          data = connection.update_user(identity, options)
+          data = service.update_user(identity, options)
           merge_attributes(data)
           true
         end
diff --git a/lib/fog/brightbox/models/compute/users.rb b/lib/fog/brightbox/models/compute/users.rb
index ba348ec82..76d4409f0 100644
--- a/lib/fog/brightbox/models/compute/users.rb
+++ b/lib/fog/brightbox/models/compute/users.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Brightbox::User
 
         def all
-          data = connection.list_users
+          data = service.list_users
           load(data)
         end
 
         def get(identifier = nil)
-          data = connection.get_user(identifier)
+          data = service.get_user(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
@@ -24,4 +24,4 @@ module Fog
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/brightbox/models/compute/zones.rb b/lib/fog/brightbox/models/compute/zones.rb
index c46b4408a..60016a21f 100644
--- a/lib/fog/brightbox/models/compute/zones.rb
+++ b/lib/fog/brightbox/models/compute/zones.rb
@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::Brightbox::Zone
 
         def all
-          data = connection.list_zones
+          data = service.list_zones
           load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.get_zone(identifier)
+          data = service.get_zone(identifier)
           new(data)
         rescue Excon::Errors::NotFound
           nil
@@ -26,4 +26,4 @@ module Fog
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/clodo/models/compute/images.rb b/lib/fog/clodo/models/compute/images.rb
index a6b1843af..0479f8336 100644
--- a/lib/fog/clodo/models/compute/images.rb
+++ b/lib/fog/clodo/models/compute/images.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Clodo::Image
 
         def all
-          data = connection.list_images_detail.body['images']
+          data = service.list_images_detail.body['images']
           load(data)
         end
 
         def get(image_id)
-          image = connection.get_image_details(image_id).body['image']
+          image = service.get_image_details(image_id).body['image']
           new(image) if image
         rescue Fog::Compute::Clodo::NotFound
           nil
diff --git a/lib/fog/clodo/models/compute/server.rb b/lib/fog/clodo/models/compute/server.rb
index b4ec4d98f..2f633d08b 100644
--- a/lib/fog/clodo/models/compute/server.rb
+++ b/lib/fog/clodo/models/compute/server.rb
@@ -47,7 +47,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_server(id)
+          service.delete_server(id)
           true
         end
 
@@ -66,15 +66,15 @@ module Fog
         end
 
         def add_ip_address
-          connection.add_ip_address(id)
+          service.add_ip_address(id)
         end
 
         def move_ip_address(ip_address)
-          connection.move_ip_address(id, ip_address)
+          service.move_ip_address(id, ip_address)
         end
 
         def delete_ip_address(ip_address)
-          connection.delete_ip_address(id, ip_address)
+          service.delete_ip_address(id, ip_address)
         end
 
         def ready?
@@ -83,14 +83,14 @@ module Fog
 
         def reboot(type = 'SOFT')
           requires :id
-          connection.reboot_server(id, type)
+          service.reboot_server(id, type)
           true
         end
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :image_id
-          data = connection.create_server(image_id, attributes)
+          data = service.create_server(image_id, attributes)
           merge_attributes(data.body['server'])
           true
         end
diff --git a/lib/fog/clodo/models/compute/servers.rb b/lib/fog/clodo/models/compute/servers.rb
index 30d088d8b..14da86a09 100644
--- a/lib/fog/clodo/models/compute/servers.rb
+++ b/lib/fog/clodo/models/compute/servers.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Clodo::Server
 
         def all
-          data = connection.list_servers_detail.body['servers']
+          data = service.list_servers_detail.body['servers']
           load(data)
         end
 
@@ -22,7 +22,7 @@ module Fog
         end
 
         def get(server_id)
-          if server = connection.get_server_details(server_id).body['server']
+          if server = service.get_server_details(server_id).body['server']
             new(server)
           end
         rescue Fog::Compute::Clodo::NotFound
diff --git a/lib/fog/cloudstack/models/compute/flavors.rb b/lib/fog/cloudstack/models/compute/flavors.rb
index 1125681f9..001c587c3 100644
--- a/lib/fog/cloudstack/models/compute/flavors.rb
+++ b/lib/fog/cloudstack/models/compute/flavors.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Cloudstack::Flavor
 
         def all
-          data = connection.list_service_offerings["listserviceofferingsresponse"]["serviceoffering"] || []
+          data = service.list_service_offerings["listserviceofferingsresponse"]["serviceoffering"] || []
           load(data)
         end
 
         def get(flavor_id)
-          if flavor = connection.list_service_offerings('id' => flavor_id)["listserviceofferingsresponse"]["serviceoffering"].first
+          if flavor = service.list_service_offerings('id' => flavor_id)["listserviceofferingsresponse"]["serviceoffering"].first
             new(flavor)
           end
         rescue Fog::Compute::Cloudstack::BadRequest
diff --git a/lib/fog/cloudstack/models/compute/image.rb b/lib/fog/cloudstack/models/compute/image.rb
index ceae76d9d..3cbc1efeb 100644
--- a/lib/fog/cloudstack/models/compute/image.rb
+++ b/lib/fog/cloudstack/models/compute/image.rb
@@ -57,13 +57,13 @@ module Fog
             'virtualmachineid' => virtual_machine_id,
             'volumeid'         => volume_id
           }
-          data = connection.create_template(options)
+          data = service.create_template(options)
           merge_attributes(data['createtemplateresponse'])
         end
 
         def destroy
           requires :id
-          connection.delete_template('id' => self.id)
+          service.delete_template('id' => self.id)
           true
         end
       end # Server
diff --git a/lib/fog/cloudstack/models/compute/images.rb b/lib/fog/cloudstack/models/compute/images.rb
index 2b1b6848d..bc13f8682 100644
--- a/lib/fog/cloudstack/models/compute/images.rb
+++ b/lib/fog/cloudstack/models/compute/images.rb
@@ -12,7 +12,7 @@ module Fog
         def all(filters={})
           options = get_filter_options(filters)
 
-          data = connection.list_templates(options)["listtemplatesresponse"]["template"] || []
+          data = service.list_templates(options)["listtemplatesresponse"]["template"] || []
           load(data)
         end
 
@@ -20,7 +20,7 @@ module Fog
           filter_option = get_filter_options(filters)
           options = filter_option.merge('id' => template_id)
 
-          if template = connection.list_templates(options)["listtemplatesresponse"]["template"].first
+          if template = service.list_templates(options)["listtemplatesresponse"]["template"].first
             new(template)
           end
         rescue Fog::Compute::Cloudstack::BadRequest
diff --git a/lib/fog/cloudstack/models/compute/job.rb b/lib/fog/cloudstack/models/compute/job.rb
index 0cdbe1e32..55ea8d9e9 100644
--- a/lib/fog/cloudstack/models/compute/job.rb
+++ b/lib/fog/cloudstack/models/compute/job.rb
@@ -17,7 +17,7 @@ module Fog
 
         def reload
           requires :id
-          merge_attributes(connection.query_async_job_result('jobid' => self.id)['queryasyncjobresultresponse'])
+          merge_attributes(service.query_async_job_result('jobid' => self.id)['queryasyncjobresultresponse'])
         end
 
         def ready?
@@ -32,7 +32,7 @@ module Fog
         def result
           if successful? && model = Fog::Compute::Cloudstack.constants.find{|c| c.to_s.downcase == self.job_result.keys.first.to_s}.to_s
             collection = model.gsub(/.[A-Z]/){|w| "#{w[0,1]}_#{w[1,1].downcase}"}.downcase + "s" # cheap underscorize, assume simple pluralization
-            connection.send(collection).new(self.job_result.values.first)
+            service.send(collection).new(self.job_result.values.first)
           else self.job_result
           end
         end
diff --git a/lib/fog/cloudstack/models/compute/jobs.rb b/lib/fog/cloudstack/models/compute/jobs.rb
index eec3c71b7..1fac02fbf 100644
--- a/lib/fog/cloudstack/models/compute/jobs.rb
+++ b/lib/fog/cloudstack/models/compute/jobs.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Cloudstack::Job
 
         def all
-          data = connection.list_async_jobs["listasyncjobsresponse"]["asyncjobs"] || []
+          data = service.list_async_jobs["listasyncjobsresponse"]["asyncjobs"] || []
           load(data)
         end
 
         def get(job_id)
-          if job = connection.query_async_job_result('jobid' => job_id)["queryasyncjobresultresponse"]
+          if job = service.query_async_job_result('jobid' => job_id)["queryasyncjobresultresponse"]
             new(job)
           end
         rescue Fog::Compute::Cloudstack::BadRequest
diff --git a/lib/fog/cloudstack/models/compute/security_group.rb b/lib/fog/cloudstack/models/compute/security_group.rb
index b0d449028..84b6137cd 100644
--- a/lib/fog/cloudstack/models/compute/security_group.rb
+++ b/lib/fog/cloudstack/models/compute/security_group.rb
@@ -15,7 +15,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_security_group('id' => self.id)
+          service.delete_security_group('id' => self.id)
           true
         end
 
@@ -37,12 +37,12 @@ module Fog
             'projectid'   => self.project_id,
             'domainid'    => self.domain_id,
           }
-          data = connection.create_security_group(options)
+          data = service.create_security_group(options)
           merge_attributes(data['createsecuritygroupresponse']['securitygroup'])
         end
 
         def rules
-          connection.security_group_rules.all("security_group_id" => self.id)
+          service.security_group_rules.all("security_group_id" => self.id)
         end
       end # SecurityGroup
     end # Cloudstack
diff --git a/lib/fog/cloudstack/models/compute/security_group_rule.rb b/lib/fog/cloudstack/models/compute/security_group_rule.rb
index 487a65f08..b9d498911 100644
--- a/lib/fog/cloudstack/models/compute/security_group_rule.rb
+++ b/lib/fog/cloudstack/models/compute/security_group_rule.rb
@@ -13,8 +13,8 @@ module Fog
         attribute :direction,         :type => :string
 
         def destroy
-          data = connection.send("revoke_security_group_#{self.direction}", "id" => self.id)
-          job = connection.jobs.new(data["revokesecuritygroup#{self.direction}"])
+          data = service.send("revoke_security_group_#{self.direction}", "id" => self.id)
+          job = service.jobs.new(data["revokesecuritygroup#{self.direction}"])
           job.wait_for { ready? }
           job.successful?
         end
@@ -26,8 +26,8 @@ module Fog
         def save
           requires :security_group_id, :cidr, :direction
 
-          data = connection.send("authorize_security_group_#{self.direction}".to_sym, params)
-          job = connection.jobs.new(data["authorizesecuritygroup#{self.direction}response"])
+          data = service.send("authorize_security_group_#{self.direction}".to_sym, params)
+          job = service.jobs.new(data["authorizesecuritygroup#{self.direction}response"])
           job.wait_for { ready? }
           # durty
           merge_attributes(job.result.send("#{self.direction}_rules").last)
@@ -35,7 +35,7 @@ module Fog
         end
 
         def security_group
-          connection.security_groups.get(self.security_group_id)
+          service.security_groups.get(self.security_group_id)
         end
 
         def reload
diff --git a/lib/fog/cloudstack/models/compute/security_group_rules.rb b/lib/fog/cloudstack/models/compute/security_group_rules.rb
index 44434a075..2271c935f 100644
--- a/lib/fog/cloudstack/models/compute/security_group_rules.rb
+++ b/lib/fog/cloudstack/models/compute/security_group_rules.rb
@@ -12,7 +12,7 @@ module Fog
         attribute :security_group_id, :type => :string
 
         def security_group
-          connection.security_groups.get(self.security_group_id)
+          service.security_groups.get(self.security_group_id)
         end
 
         def create(attributes)
diff --git a/lib/fog/cloudstack/models/compute/security_groups.rb b/lib/fog/cloudstack/models/compute/security_groups.rb
index 31d7cdb48..8a22b7cef 100644
--- a/lib/fog/cloudstack/models/compute/security_groups.rb
+++ b/lib/fog/cloudstack/models/compute/security_groups.rb
@@ -9,12 +9,12 @@ module Fog
         model Fog::Compute::Cloudstack::SecurityGroup
 
         def all(options={})
-          data = connection.list_security_groups(options)["listsecuritygroupsresponse"]["securitygroup"] || []
+          data = service.list_security_groups(options)["listsecuritygroupsresponse"]["securitygroup"] || []
           load(data)
         end
 
         def get(security_group_id)
-          if security_group = connection.list_security_groups('id' => security_group_id)["listsecuritygroupsresponse"]["securitygroup"].first
+          if security_group = service.list_security_groups('id' => security_group_id)["listsecuritygroupsresponse"]["securitygroup"].first
             new(security_group)
           end
         rescue Fog::Compute::Cloudstack::BadRequest
diff --git a/lib/fog/cloudstack/models/compute/server.rb b/lib/fog/cloudstack/models/compute/server.rb
index 10e2e2369..97e5d8c81 100644
--- a/lib/fog/cloudstack/models/compute/server.rb
+++ b/lib/fog/cloudstack/models/compute/server.rb
@@ -46,12 +46,12 @@ module Fog
 
         def destroy
           requires :id
-          data = connection.destroy_virtual_machine("id" => id)
-          connection.jobs.new(data["destroyvirtualmachineresponse"])
+          data = service.destroy_virtual_machine("id" => id)
+          service.jobs.new(data["destroyvirtualmachineresponse"])
         end
 
         def flavor
-          connection.flavors.get(self.flavor_id)
+          service.flavors.get(self.flavor_id)
         end
 
         def ready?
@@ -60,8 +60,8 @@ module Fog
 
         def reboot
           requires :id
-          data = connection.reboot_virtual_machine('id' => self.id) # FIXME: does this ever fail?
-          connection.jobs.new(data["rebootvirtualmachineresponse"])
+          data = service.reboot_virtual_machine('id' => self.id) # FIXME: does this ever fail?
+          service.jobs.new(data["rebootvirtualmachineresponse"])
         end
 
         def security_groups=(security_groups)
@@ -73,7 +73,7 @@ module Fog
         end
 
         def security_groups
-          security_group_ids.map{|id| self.connection.security_groups.get(id)}
+          security_group_ids.map{|id| service.security_groups.get(id)}
         end
 
         def save
@@ -97,20 +97,20 @@ module Fog
           options.merge!('networkids' => network_ids) if network_ids
           options.merge!('securitygroupids' => security_group_ids) unless security_group_ids.empty?
 
-          data = connection.deploy_virtual_machine(options)
+          data = service.deploy_virtual_machine(options)
           merge_attributes(data['deployvirtualmachineresponse'])
         end
 
         def start
           requires :id
-          data = connection.start_virtual_machine("id" => self.id)
-          connection.jobs.new(data["startvirtualmachineresponse"])
+          data = service.start_virtual_machine("id" => self.id)
+          service.jobs.new(data["startvirtualmachineresponse"])
         end
 
         def stop(force=false)
           requires :id
-          data = connection.stop_virtual_machine("id" => self.id, "force" => force)
-          connection.jobs.new(data["stopvirtualmachineresponse"])
+          data = service.stop_virtual_machine("id" => self.id, "force" => force)
+          service.jobs.new(data["stopvirtualmachineresponse"])
         end
       end # Server
     end # Cloudstack
diff --git a/lib/fog/cloudstack/models/compute/servers.rb b/lib/fog/cloudstack/models/compute/servers.rb
index ea403d8d4..4a4a7a085 100644
--- a/lib/fog/cloudstack/models/compute/servers.rb
+++ b/lib/fog/cloudstack/models/compute/servers.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Cloudstack::Server
 
         def all
-          data = connection.list_virtual_machines["listvirtualmachinesresponse"]["virtualmachine"] || []
+          data = service.list_virtual_machines["listvirtualmachinesresponse"]["virtualmachine"] || []
           load(data)
         end
 
@@ -21,7 +21,7 @@ module Fog
         end
 
         def get(server_id)
-          if server = connection.list_virtual_machines('id' => server_id)["listvirtualmachinesresponse"]["virtualmachine"].first
+          if server = service.list_virtual_machines('id' => server_id)["listvirtualmachinesresponse"]["virtualmachine"].first
             new(server)
           end
         rescue Fog::Compute::Cloudstack::BadRequest
diff --git a/lib/fog/cloudstack/models/compute/volume.rb b/lib/fog/cloudstack/models/compute/volume.rb
index bfe85bc8b..a20c9e344 100644
--- a/lib/fog/cloudstack/models/compute/volume.rb
+++ b/lib/fog/cloudstack/models/compute/volume.rb
@@ -39,7 +39,7 @@ module Fog
             'snapshotid'     => snapshot_id,
             'projectid'      => project_id
           }
-          data = connection.create_volume(options)
+          data = service.create_volume(options)
           merge_attributes(data['createvolumeresponse'])
         end
 
@@ -48,13 +48,13 @@ module Fog
         end
 
         def flavor
-          connection.disk_offerings.get(self.disk_offering_id)
+          service.disk_offerings.get(self.disk_offering_id)
         end
         alias disk_offering flavor
 
         def server
           if server_id
-            connection.servers.get(server_id)
+            service.servers.get(server_id)
           end
         end
 
@@ -91,22 +91,22 @@ module Fog
           }
           options.merge!('deviceid' => mountpoint) if mountpoint
 
-          data = connection.attach_volume(options)
+          data = service.attach_volume(options)
 
-					connection.jobs.new(data["attachvolumeresponse"])
+					service.jobs.new(data["attachvolumeresponse"])
         end
 
         def detach
           requires :id
 
-          data = connection.detach_volume('id' => id)
+          data = service.detach_volume('id' => id)
 
-          connection.jobs.new(data["detachvolumeresponse"])
+          service.jobs.new(data["detachvolumeresponse"])
         end
 
         def destroy
           requires :id
-          connection.delete_volume('id' => id)
+          service.delete_volume('id' => id)
           true
         end
       end # Volume
diff --git a/lib/fog/cloudstack/models/compute/volumes.rb b/lib/fog/cloudstack/models/compute/volumes.rb
index c9cfe8b85..f4dd65d09 100644
--- a/lib/fog/cloudstack/models/compute/volumes.rb
+++ b/lib/fog/cloudstack/models/compute/volumes.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Cloudstack::Volume
 
         def all
-          data = connection.list_volumes["listvolumesresponse"]["volume"] || []
+          data = service.list_volumes["listvolumesresponse"]["volume"] || []
           load(data)
         end
 
         def get(volume_id)
-          if volume = connection.list_volumes('id' => volume_id)["listvolumesresponse"]["volume"].first
+          if volume = service.list_volumes('id' => volume_id)["listvolumesresponse"]["volume"].first
             new(volume)
           end
         rescue Fog::Compute::Cloudstack::BadRequest
diff --git a/lib/fog/cloudstack/models/compute/zone.rb b/lib/fog/cloudstack/models/compute/zone.rb
index 147518675..2d0cf081a 100644
--- a/lib/fog/cloudstack/models/compute/zone.rb
+++ b/lib/fog/cloudstack/models/compute/zone.rb
@@ -28,7 +28,7 @@ module Fog
             'internaldns2'          => internaldns2,
             'securitygroupenabled'  => security_groups_enabled,
           }
-          data = connection.create_zone(options)
+          data = service.create_zone(options)
           merge_attributes(data['createzoneresponse'])
         end
       end # Zone
diff --git a/lib/fog/cloudstack/models/compute/zones.rb b/lib/fog/cloudstack/models/compute/zones.rb
index 38b46e1b6..108aafe33 100644
--- a/lib/fog/cloudstack/models/compute/zones.rb
+++ b/lib/fog/cloudstack/models/compute/zones.rb
@@ -14,12 +14,12 @@ module Fog
             'templatefilter' => 'self'
           }.merge(filters)
 
-          data = connection.list_zones(options)["listzonesresponse"]["zone"] || []
+          data = service.list_zones(options)["listzonesresponse"]["zone"] || []
           load(data)
         end
 
         def get(zone_id)
-          if zone = connection.list_zones('id' => zone_id)["listzonesresponse"]["zone"].first
+          if zone = service.list_zones('id' => zone_id)["listzonesresponse"]["zone"].first
             new(zone)
           end
         rescue Fog::Compute::Cloudstack::BadRequest
diff --git a/lib/fog/core/attributes.rb b/lib/fog/core/attributes.rb
index dbebb9d8f..e9c284042 100644
--- a/lib/fog/core/attributes.rb
+++ b/lib/fog/core/attributes.rb
@@ -194,7 +194,7 @@ module Fog
 
       def missing_attributes(args)
         missing = []
-        for arg in [:connection] | args
+        for arg in [:service] | args
           unless send("#{arg}") || attributes.has_key?(arg)
             missing << arg
           end
diff --git a/lib/fog/core/collection.rb b/lib/fog/core/collection.rb
index 5c9f2a374..993c9a729 100644
--- a/lib/fog/core/collection.rb
+++ b/lib/fog/core/collection.rb
@@ -1,8 +1,12 @@
+require "fog/core/deprecated_connection_accessors"
+
 module Fog
   class Collection < Array
-
     extend Fog::Attributes::ClassMethods
     include Fog::Attributes::InstanceMethods
+    include Fog::Core::DeprecatedConnectionAccessors
+
+    attr_reader :service
 
     Array.public_instance_methods(false).each do |method|
       unless [:reject, :select, :slice].include?(method.to_sym)
@@ -37,8 +41,6 @@ module Fog
       end
     end
 
-    attr_accessor :connection
-
     remove_method :clear
     def clear
       @loaded = true
@@ -56,11 +58,20 @@ module Fog
       object.destroy
     end
 
+    # Creates a new Fog::Collection based around the passed service
+    #
+    # @param [Hash] attributes
+    # @option attributes [Fog::Service] service Instance of a service
+    #
+    # @return [Fog::Collection]
+    #
     def initialize(attributes = {})
+      @service = attributes.delete(:service)
       @loaded = false
       merge_attributes(attributes)
     end
 
+
     remove_method :inspect
     def inspect
       Thread.current[:formatador] ||= Formatador.new
@@ -105,7 +116,7 @@ module Fog
       model.new(
         {
           :collection => self,
-          :connection => connection
+          :service => service
         }.merge(attributes)
       )
     end
diff --git a/lib/fog/core/deprecated_connection_accessors.rb b/lib/fog/core/deprecated_connection_accessors.rb
new file mode 100644
index 000000000..4698b71aa
--- /dev/null
+++ b/lib/fog/core/deprecated_connection_accessors.rb
@@ -0,0 +1,41 @@
+module Fog
+  module Core
+    # This module covers the shared code used by models and collections
+    # that deprecates the confusing usage of 'connection' which was
+    # actually intended to be an instance of Fog::Service
+    module DeprecatedConnectionAccessors
+      # Sets the Service but using the wrong name!
+      #
+      # @deprecated The connection name was wrong and confusing since it refered to the service
+      # @param [Fog::Service] service An instance of a Fog service this collection is for
+      #
+      def connection=(service)
+        Fog::Logger.deprecation("#connection= is deprecated, pass :service in at creation [light_black](#{caller.first})[/]")
+        @service = service
+      end
+
+      # Returns the Service the collection is part of
+      #
+      # @deprecated #connection is deprecated due to confusing name, use #service instead
+      # @return [Fog::Service]
+      #
+      def connection
+        Fog::Logger.deprecation("#connection is deprecated, use #service instead [light_black](#{caller.first})[/]")
+        @service
+      end
+
+      # Prepares the value of the service based on the passed attributes
+      #
+      # @note Intended for use where the service is required before the normal
+      #   initializer runs. The logic is run there with deprecation warnings.
+      #
+      # @param [Hash] attributes
+      # @return [Fog::Service]
+      #
+      def prepare_service_value(attributes)
+        @service = attributes[:service] || attributes[:connection]
+      end
+
+    end
+  end
+end
diff --git a/lib/fog/core/model.rb b/lib/fog/core/model.rb
index b4c5dcd0f..debd1c612 100644
--- a/lib/fog/core/model.rb
+++ b/lib/fog/core/model.rb
@@ -1,12 +1,22 @@
+require "fog/core/deprecated_connection_accessors"
+
 module Fog
   class Model
 
     extend Fog::Attributes::ClassMethods
     include Fog::Attributes::InstanceMethods
+    include Fog::Core::DeprecatedConnectionAccessors
 
-    attr_accessor :collection, :connection
+    attr_accessor :collection
+    attr_reader :service
 
     def initialize(new_attributes = {})
+      # TODO Remove compatibility with old connection option
+      @service = @service || new_attributes.delete(:service)
+      if @service.nil? && new_attributes[:connection]
+        Fog::Logger.deprecation("Passing :connection option is deprecated, use :service instead [light_black](#{caller.first})[/]")
+        @service = new_attributes[:connection]
+      end
       merge_attributes(new_attributes)
     end
 
diff --git a/lib/fog/core/service.rb b/lib/fog/core/service.rb
index 7fc7138b3..3f6505d40 100644
--- a/lib/fog/core/service.rb
+++ b/lib/fog/core/service.rb
@@ -91,7 +91,7 @@ module Fog
             constant = collection.to_s.split('_').map {|characters| characters[0...1].upcase << characters[1..-1]}.join('')
             service::Collections.module_eval <<-EOS, __FILE__, __LINE__
               def #{collection}(attributes = {})
-                #{service}::#{constant}.new({:connection => self}.merge(attributes))
+                #{service}::#{constant}.new({:service => self}.merge(attributes))
               end
             EOS
           end
diff --git a/lib/fog/dnsimple/models/dns/record.rb b/lib/fog/dnsimple/models/dns/record.rb
index c500de79b..cfc046666 100644
--- a/lib/fog/dnsimple/models/dns/record.rb
+++ b/lib/fog/dnsimple/models/dns/record.rb
@@ -26,7 +26,7 @@ module Fog
         end
 
         def destroy
-          connection.delete_record(zone.domain, identity)
+          service.delete_record(zone.domain, identity)
           true
         end
 
@@ -42,14 +42,14 @@ module Fog
 
           # decide whether its a new record or update of an existing
           if id.nil?
-            data = connection.create_record(zone.domain, name, type, value, options)
+            data = service.create_record(zone.domain, name, type, value, options)
           else
             options[:name] = name if name
             options[:content] = value if value
             options[:type] = type if type
-            data = connection.update_record(zone.domain, id, options)
+            data = service.update_record(zone.domain, id, options)
           end
-          
+
           merge_attributes(data.body["record"])
           true
         end
diff --git a/lib/fog/dnsimple/models/dns/records.rb b/lib/fog/dnsimple/models/dns/records.rb
index 4e79ead27..b49c258e0 100644
--- a/lib/fog/dnsimple/models/dns/records.rb
+++ b/lib/fog/dnsimple/models/dns/records.rb
@@ -14,13 +14,13 @@ module Fog
         def all
           requires :zone
           clear
-          data = connection.list_records(zone.id).body.map {|record| record['record']}
+          data = service.list_records(zone.id).body.map {|record| record['record']}
           load(data)
         end
 
         def get(record_id)
           requires :zone
-          data = connection.get_record(zone.id, record_id).body["record"]
+          data = service.get_record(zone.id, record_id).body["record"]
           new(data)
         rescue Excon::Errors::NotFound
           nil
diff --git a/lib/fog/dnsimple/models/dns/zone.rb b/lib/fog/dnsimple/models/dns/zone.rb
index eb1d84c37..32dd18757 100644
--- a/lib/fog/dnsimple/models/dns/zone.rb
+++ b/lib/fog/dnsimple/models/dns/zone.rb
@@ -14,7 +14,7 @@ module Fog
         attribute :updated_at
 
         def destroy
-          connection.delete_domain(identity)
+          service.delete_domain(identity)
           true
         end
 
@@ -22,7 +22,7 @@ module Fog
           @records ||= begin
             Fog::DNS::DNSimple::Records.new(
               :zone       => self,
-              :connection => connection
+              :service => service
             )
           end
         end
@@ -38,7 +38,7 @@ module Fog
 
         def save
           requires :domain
-          data = connection.create_domain(domain).body["domain"]
+          data = service.create_domain(domain).body["domain"]
           merge_attributes(data)
           true
         end
diff --git a/lib/fog/dnsimple/models/dns/zones.rb b/lib/fog/dnsimple/models/dns/zones.rb
index fa35705ed..1a48866f5 100644
--- a/lib/fog/dnsimple/models/dns/zones.rb
+++ b/lib/fog/dnsimple/models/dns/zones.rb
@@ -11,12 +11,12 @@ module Fog
 
         def all
           clear
-          data = connection.list_domains.body.map {|zone| zone['domain']}
+          data = service.list_domains.body.map {|zone| zone['domain']}
           load(data)
         end
 
         def get(zone_id)
-          data = connection.get_domain(zone_id).body['domain']
+          data = service.get_domain(zone_id).body['domain']
           new(data)
         rescue Excon::Errors::NotFound
           nil
diff --git a/lib/fog/dnsmadeeasy/models/dns/record.rb b/lib/fog/dnsmadeeasy/models/dns/record.rb
index a8695b4f5..d924aeb40 100644
--- a/lib/fog/dnsmadeeasy/models/dns/record.rb
+++ b/lib/fog/dnsmadeeasy/models/dns/record.rb
@@ -8,7 +8,7 @@ module Fog
         extend Fog::Deprecation
         deprecate :ip, :value
         deprecate :ip=, :value=
-        
+
         identity :id
 
         attribute :name
@@ -23,14 +23,14 @@ module Fog
         attribute :hard_link, :aliases => "hardLink"
 
         attribute :value,          :aliases => "data"
-  
+
         def initialize(attributes={})
           self.ttl ||= 1800
           super
         end
 
         def destroy
-          connection.delete_record(zone.domain, identity)
+          service.delete_record(zone.domain, identity)
           true
         end
 
@@ -57,11 +57,11 @@ module Fog
           end
 
           if id.nil?
-            data = connection.create_record(zone.domain, name, type, value, options).body
+            data = service.create_record(zone.domain, name, type, value, options).body
             merge_attributes(data)
           else
             options.merge!(:name => name, :type => type, :data => value)
-            connection.update_record(zone.domain, id, options).body
+            service.update_record(zone.domain, id, options).body
           end
 
           true
diff --git a/lib/fog/dnsmadeeasy/models/dns/records.rb b/lib/fog/dnsmadeeasy/models/dns/records.rb
index 2ded4cbca..92ba0f9c4 100644
--- a/lib/fog/dnsmadeeasy/models/dns/records.rb
+++ b/lib/fog/dnsmadeeasy/models/dns/records.rb
@@ -13,12 +13,12 @@ module Fog
 
         def all
           requires :zone
-          data = connection.list_records(zone.identity).body
+          data = service.list_records(zone.identity).body
           load(data)
         end
 
         def get(record_id)
-          data = connection.get_record(zone.identity, record_id).body
+          data = service.get_record(zone.identity, record_id).body
           new(data)
         rescue Fog::Service::NotFound
           nil
diff --git a/lib/fog/dnsmadeeasy/models/dns/zone.rb b/lib/fog/dnsmadeeasy/models/dns/zone.rb
index 78143b8db..e9a44e9bc 100644
--- a/lib/fog/dnsmadeeasy/models/dns/zone.rb
+++ b/lib/fog/dnsmadeeasy/models/dns/zone.rb
@@ -14,7 +14,7 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_domain(identity)
+          service.delete_domain(identity)
           true
         end
 
@@ -22,14 +22,14 @@ module Fog
           @records ||= begin
             Fog::DNS::DNSMadeEasy::Records.new(
               :zone       => self,
-              :connection => connection
+              :service => service
             )
           end
         end
 
         def save
           requires :domain
-          data = connection.create_domain(domain).body
+          data = service.create_domain(domain).body
           self.identity = data['name']
           merge_attributes(data)
           true
diff --git a/lib/fog/dnsmadeeasy/models/dns/zones.rb b/lib/fog/dnsmadeeasy/models/dns/zones.rb
index bdd533ee8..6377c9498 100644
--- a/lib/fog/dnsmadeeasy/models/dns/zones.rb
+++ b/lib/fog/dnsmadeeasy/models/dns/zones.rb
@@ -11,12 +11,12 @@ module Fog
 
         def all
           clear
-          data = connection.list_domains.body['list'].collect{|domain| {:id => domain}}
+          data = service.list_domains.body['list'].collect{|domain| {:id => domain}}
           load(data)
         end
 
         def get(zone_id)
-          data = connection.get_domain(zone_id).body
+          data = service.get_domain(zone_id).body
           data.merge!(:id => data['name'])
           new(data)
         rescue Fog::Service::NotFound
diff --git a/lib/fog/dynect/models/dns/record.rb b/lib/fog/dynect/models/dns/record.rb
index 9be7eeaea..7c3d42089 100644
--- a/lib/fog/dynect/models/dns/record.rb
+++ b/lib/fog/dynect/models/dns/record.rb
@@ -16,7 +16,7 @@ module Fog
 
         def destroy
           requires :identity, :name, :type, :zone
-          connection.delete_record(type, zone.identity, name, identity)
+          service.delete_record(type, zone.identity, name, identity)
           true
         end
 
@@ -28,13 +28,13 @@ module Fog
           }
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.post_record(type, zone.identity, name, rdata, options).body['data']
+          data = service.post_record(type, zone.identity, name, rdata, options).body['data']
           # avoid overwriting zone object with zone string
           data = data.reject {|key, value| key == 'zone'}
           merge_attributes(data)
 
           zone.publish
-          records = connection.get_record(type, zone.identity, name).body['data']
+          records = service.get_record(type, zone.identity, name).body['data']
           # data in format ['/REST/xRecord/domain/fqdn/identity]
           records.map! do |record|
             tokens = record.split('/')
diff --git a/lib/fog/dynect/models/dns/records.rb b/lib/fog/dynect/models/dns/records.rb
index bab003f24..12122e61f 100644
--- a/lib/fog/dynect/models/dns/records.rb
+++ b/lib/fog/dynect/models/dns/records.rb
@@ -14,8 +14,8 @@ module Fog
         def all(options = {})
           requires :zone
           data = []
-          connection.get_node_list(zone.domain, options).body['data'].each do |fqdn|
-            records = connection.get_record('ANY', zone.domain, fqdn).body['data']
+          service.get_node_list(zone.domain, options).body['data'].each do |fqdn|
+            records = service.get_record('ANY', zone.domain, fqdn).body['data']
 
             # data in format ['/REST/xRecord/domain/fqdn/identity]
             records.map! do |record|
diff --git a/lib/fog/dynect/models/dns/zone.rb b/lib/fog/dynect/models/dns/zone.rb
index e75316ade..d4dc3c386 100644
--- a/lib/fog/dynect/models/dns/zone.rb
+++ b/lib/fog/dynect/models/dns/zone.rb
@@ -23,7 +23,7 @@ module Fog
 
         def destroy
           requires :domain
-          connection.delete_zone(domain)
+          service.delete_zone(domain)
           true
         end
 
@@ -34,12 +34,12 @@ module Fog
 
         def publish
           requires :identity
-          data = connection.put_zone(identity, 'publish' => true)
+          data = service.put_zone(identity, 'publish' => true)
           true
         end
 
         def records
-          @records ||= Fog::DNS::Dynect::Records.new(:zone => self, :connection => connection)
+          @records ||= Fog::DNS::Dynect::Records.new(:zone => self, :service => service)
         end
 
         def nameservers
@@ -48,7 +48,7 @@ module Fog
 
         def save
           requires :domain, :email, :ttl
-          data = connection.post_zone(email, ttl, domain).body['data']
+          data = service.post_zone(email, ttl, domain).body['data']
           merge_attributes(data)
           true
         end
diff --git a/lib/fog/dynect/models/dns/zones.rb b/lib/fog/dynect/models/dns/zones.rb
index c864af3fd..d3c33555f 100644
--- a/lib/fog/dynect/models/dns/zones.rb
+++ b/lib/fog/dynect/models/dns/zones.rb
@@ -10,14 +10,14 @@ module Fog
         model Fog::DNS::Dynect::Zone
 
         def all
-          data = connection.get_zone.body['data'].map do |zone|
+          data = service.get_zone.body['data'].map do |zone|
             { :domain => zone }
           end
           load(data)
         end
 
         def get(zone_id)
-          new(connection.get_zone('zone' => zone_id).body['data'])
+          new(service.get_zone('zone' => zone_id).body['data'])
         rescue Excon::Errors::NotFound
           nil
         end
diff --git a/lib/fog/ecloud/generate_collection.rb b/lib/fog/ecloud/generate_collection.rb
index 775667f21..cad674fd9 100644
--- a/lib/fog/ecloud/generate_collection.rb
+++ b/lib/fog/ecloud/generate_collection.rb
@@ -20,7 +20,7 @@ if options[:methods]
   methods = options[:methods].map do |m|
     m = <<METHOD
 def #{m[0]}
-          @#{m[0]} = Fog::Compute::Ecloud::#{m[0].camelize}.new(:connection => connection, :href => "#{m[1]}")
+          @#{m[0]} = Fog::Compute::Ecloud::#{m[0].camelize}.new(:service => service, :href => "#{m[1]}")
         end
 METHOD
   end.join("\n        ")
@@ -51,12 +51,12 @@ module Fog
         model Fog::Compute::Ecloud::#{options[:model].camelize}
 
         def all
-          data = connection.get_#{options[:collection]}(href).body
+          data = service.get_#{options[:collection]}(href).body
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_#{options[:model]}(uri)
+          if data = service.get_#{options[:model]}(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/admin_organization.rb b/lib/fog/ecloud/models/compute/admin_organization.rb
index 1bfff217a..8ccfc7658 100644
--- a/lib/fog/ecloud/models/compute/admin_organization.rb
+++ b/lib/fog/ecloud/models/compute/admin_organization.rb
@@ -11,19 +11,19 @@ module Fog
         attribute :support_access,      :aliases => :SupportAccess
 
         def ssh_keys
-          @ssh_keys = Fog::Compute::Ecloud::SshKeys.new(:connection => connection, :href => "/cloudapi/ecloud/admin/sshKeys/organizations/#{organization.id}")
+          @ssh_keys = Fog::Compute::Ecloud::SshKeys.new(:service => service, :href => "/cloudapi/ecloud/admin/sshKeys/organizations/#{organization.id}")
         end
 
         def password_complexity_rules
-          @password_complexity_rules = Fog::Compute::Ecloud::PasswordComplexityRules.new(:connection => connection, :href => "/cloudapi/ecloud/admin/organizations/#{organization.id}/passwordComplexityRules")
+          @password_complexity_rules = Fog::Compute::Ecloud::PasswordComplexityRules.new(:service => service, :href => "/cloudapi/ecloud/admin/organizations/#{organization.id}/passwordComplexityRules")
         end
 
         def login_banner
-          @login_banner = Fog::Compute::Ecloud::LoginBanner.new(:connection => connection, :href => "/cloudapi/ecloud/admin/organizations/#{organization.id}/loginBanner")
+          @login_banner = Fog::Compute::Ecloud::LoginBanner.new(:service => service, :href => "/cloudapi/ecloud/admin/organizations/#{organization.id}/loginBanner")
         end
 
         def authentication_levels
-          @authentication_levels = Fog::Compute::Ecloud::AuthenticationLevels.new(:connection => connection, :href => "/cloudapi/ecloud/admin/organizations/#{organization.id}/authenticationLevels")
+          @authentication_levels = Fog::Compute::Ecloud::AuthenticationLevels.new(:service => service, :href => "/cloudapi/ecloud/admin/organizations/#{organization.id}/authenticationLevels")
         end
 
         def id
@@ -34,7 +34,7 @@ module Fog
           @organization ||= begin
                               reload unless other_links
                               organization_link = other_links.find{|l| l[:type] == "application/vnd.tmrk.cloud.organization"}
-                              self.connection.organizations.new(organization_link)
+                              self.service.organizations.new(organization_link)
                             end
         end
       end
diff --git a/lib/fog/ecloud/models/compute/admin_organizations.rb b/lib/fog/ecloud/models/compute/admin_organizations.rb
index 1d87f2655..06b66c721 100644
--- a/lib/fog/ecloud/models/compute/admin_organizations.rb
+++ b/lib/fog/ecloud/models/compute/admin_organizations.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Ecloud::AdminOrganization
 
         def get(uri)
-          if data = connection.get_admin_organization(uri)
+          if data = service.get_admin_organization(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/api_keys.rb b/lib/fog/ecloud/models/compute/api_keys.rb
index 1e030b1e3..cf4f89c85 100644
--- a/lib/fog/ecloud/models/compute/api_keys.rb
+++ b/lib/fog/ecloud/models/compute/api_keys.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::ApiKey
 
         def all
-          data = connection.get_api_keys(href).body
+          data = service.get_api_keys(href).body
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_api_key(uri)
+          if data = service.get_api_key(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/association.rb b/lib/fog/ecloud/models/compute/association.rb
index 954dc7f05..4cfcbf62f 100644
--- a/lib/fog/ecloud/models/compute/association.rb
+++ b/lib/fog/ecloud/models/compute/association.rb
@@ -10,10 +10,10 @@ module Fog
         attribute :ip_address, :aliases => :IpAddress
 
         def delete
-          data = connection.rnat_associations_delete(href).body
-          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => href)[0]
+          data = service.rnat_associations_delete(href).body
+          task = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => href)[0]
         end
-        
+
         def id
           href.scan(/\d+/)[0]
         end
diff --git a/lib/fog/ecloud/models/compute/associations.rb b/lib/fog/ecloud/models/compute/associations.rb
index 014642db2..16c18a2c1 100644
--- a/lib/fog/ecloud/models/compute/associations.rb
+++ b/lib/fog/ecloud/models/compute/associations.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Ecloud::Association
 
         def all
-          data = connection.get_associations(href).body
+          data = service.get_associations(href).body
           if data[:Associations]
             data = data[:Associations]
             if data.is_a?(String) && data.empty?
@@ -23,7 +23,7 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_association(uri)
+          if data = service.get_association(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/authentication_levels.rb b/lib/fog/ecloud/models/compute/authentication_levels.rb
index cb1af7fb5..bd01fa2e7 100644
--- a/lib/fog/ecloud/models/compute/authentication_levels.rb
+++ b/lib/fog/ecloud/models/compute/authentication_levels.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::AuthenticationLevel
 
         def all
-          data = connection.get_authentication_levels(href).body
+          data = service.get_authentication_levels(href).body
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_authentication_level(uri)
+          if data = service.get_authentication_level(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/backup_internet_service.rb b/lib/fog/ecloud/models/compute/backup_internet_service.rb
index f6cc5067a..13d851eaf 100644
--- a/lib/fog/ecloud/models/compute/backup_internet_service.rb
+++ b/lib/fog/ecloud/models/compute/backup_internet_service.rb
@@ -8,32 +8,32 @@ module Fog
         attribute :type, :aliases => :Type
         attribute :other_links, :aliases => :Links
         attribute :protocol, :aliases => :Protocol
-        attribute :enabled, :aliases => :Enabled, :type => :boolean 
+        attribute :enabled, :aliases => :Enabled, :type => :boolean
         attribute :description, :aliases => :Description
         attribute :persistence, :aliases => :Persistence
         attribute :redirect_url, :aliases => :RedirectUrl
 
         def tasks
-          @tasks = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => href)
+          @tasks = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => href)
         end
 
         def internet_services
-          @internet_services = Fog::Compute::Ecloud::InternetServices.new(:connection => connection, :href => href)
+          @internet_services = Fog::Compute::Ecloud::InternetServices.new(:service => service, :href => href)
         end
 
         def node_services
-          @node_services = Fog::Compute::Ecloud::NodeServices.new(:connection => connection, :href => href)
+          @node_services = Fog::Compute::Ecloud::NodeServices.new(:service => service, :href => href)
         end
 
         def edit(options)
           options[:uri] = href
-          data = connection.backup_internet_service_edit(options).body
+          data = service.backup_internet_service_edit(options).body
           object = collection.from_data(data)
         end
 
         def delete
-          data = connection.backup_internet_service_delete(href).body
-          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])[0]
+          data = service.backup_internet_service_delete(href).body
+          task = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => data[:href])[0]
         end
 
         def id
diff --git a/lib/fog/ecloud/models/compute/backup_internet_services.rb b/lib/fog/ecloud/models/compute/backup_internet_services.rb
index 4fd18ba94..426879428 100644
--- a/lib/fog/ecloud/models/compute/backup_internet_services.rb
+++ b/lib/fog/ecloud/models/compute/backup_internet_services.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::BackupInternetService
 
         def all
-          data = connection.get_backup_internet_services(href).body
+          data = service.get_backup_internet_services(href).body
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_backup_internet_service(uri)
+          if data = service.get_backup_internet_service(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
@@ -29,7 +29,7 @@ module Fog
         def create(options)
           options[:uri] = href + "/action/createBackupInternetService"
           options[:enabled] ||= true
-          data = connection.backup_internet_service_create(options)
+          data = service.backup_internet_service_create(options)
           new(data)
         end
 
diff --git a/lib/fog/ecloud/models/compute/catalog.rb b/lib/fog/ecloud/models/compute/catalog.rb
index 54bf99018..cdd27c14c 100644
--- a/lib/fog/ecloud/models/compute/catalog.rb
+++ b/lib/fog/ecloud/models/compute/catalog.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Ecloud::CatalogItem
 
         def all
-          data = connection.get_catalog(href).body#[:Locations][:Location][:Catalog][:CatalogEntry]
+          data = service.get_catalog(href).body#[:Locations][:Location][:Catalog][:CatalogEntry]
           if data[:Locations][:Location].is_a?(Hash)
             data = [] if data[:Locations][:Location][:Catalog].is_a?(String) && data[:Locations][:Location][:Catalog].empty?
             load(data)
@@ -28,7 +28,7 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_catalog_item(uri)
+          if data = service.get_catalog_item(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/catalog_configurations.rb b/lib/fog/ecloud/models/compute/catalog_configurations.rb
index a7d128fce..6eb8b2bca 100644
--- a/lib/fog/ecloud/models/compute/catalog_configurations.rb
+++ b/lib/fog/ecloud/models/compute/catalog_configurations.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::CatalogConfiguration
 
         def all
-          data = connection.get_catalog_configurations(href).body
+          data = service.get_catalog_configurations(href).body
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_catalog_configuration(uri)
+          if data = service.get_catalog_configuration(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/catalog_item.rb b/lib/fog/ecloud/models/compute/catalog_item.rb
index bb492638c..2789e1c5f 100644
--- a/lib/fog/ecloud/models/compute/catalog_item.rb
+++ b/lib/fog/ecloud/models/compute/catalog_item.rb
@@ -12,7 +12,7 @@ module Fog
         attribute :files, :aliases => :Files
 
         def configuration
-          @configuration = Fog::Compute::Ecloud::CatalogConfigurations.new(:connection => connection, :href => "/cloudapi/ecloud/admin/catalog/#{id}/configuration")
+          @configuration = Fog::Compute::Ecloud::CatalogConfigurations.new(:service => service, :href => "/cloudapi/ecloud/admin/catalog/#{id}/configuration")
         end
 
         def id
diff --git a/lib/fog/ecloud/models/compute/compute_pool.rb b/lib/fog/ecloud/models/compute/compute_pool.rb
index 33fa1bf07..35f5e1516 100644
--- a/lib/fog/ecloud/models/compute/compute_pool.rb
+++ b/lib/fog/ecloud/models/compute/compute_pool.rb
@@ -15,50 +15,50 @@ module Fog
         attribute :memory_burst, :aliases => :MemoryBurst
 
         def servers
-          @servers ||= Fog::Compute::Ecloud::Servers.new( :connection => connection, :href => "/cloudapi/ecloud/virtualMachines/computePools/#{id}" )
+          @servers ||= Fog::Compute::Ecloud::Servers.new( :service => service, :href => "/cloudapi/ecloud/virtualMachines/computePools/#{id}" )
         end
 
         def layout
-          @layout ||= Fog::Compute::Ecloud::Layouts.new(:connection => connection, :href => "/cloudapi/ecloud/layout/computePools/#{id}").first
+          @layout ||= Fog::Compute::Ecloud::Layouts.new(:service => service, :href => "/cloudapi/ecloud/layout/computePools/#{id}").first
         end
 
         def cpu_usage
 #          time ? query = "/details?time=#{Time.parse(time).utc.strftime('%Y-%m-%dT%H:%M:%SZ')}" : query = ""
-          @cpu_usage ||= Fog::Compute::Ecloud::CpuUsageDetailSummary.new(:connection => connection, :href => "/cloudapi/ecloud/computePools/#{id}/usage/cpu")
+          @cpu_usage ||= Fog::Compute::Ecloud::CpuUsageDetailSummary.new(:service => service, :href => "/cloudapi/ecloud/computePools/#{id}/usage/cpu")
         end
 
         def memory_usage
 #          time ? query = "/details?time=#{Time.parse(time).utc.strftime('%Y-%m-%dT%H:%M:%SZ')}" : query = ""
-          @memory_usage ||= Fog::Compute::Ecloud::MemoryUsageDetailSummary.new(:connection => connection, :href => "/cloudapi/ecloud/computePools/#{id}/usage/memory")
+          @memory_usage ||= Fog::Compute::Ecloud::MemoryUsageDetailSummary.new(:service => service, :href => "/cloudapi/ecloud/computePools/#{id}/usage/memory")
         end
 
         def storage_usage
-          @storage_usage ||= Fog::Compute::Ecloud::StorageUsageDetailSummary.new(:connection => connection, :href => "/cloudapi/ecloud/computePools/#{id}/usage/storage")
+          @storage_usage ||= Fog::Compute::Ecloud::StorageUsageDetailSummary.new(:service => service, :href => "/cloudapi/ecloud/computePools/#{id}/usage/storage")
         end
 
         def operating_system_families
-          @operating_system_families ||= Fog::Compute::Ecloud::OperatingSystemFamilies.new(:connection => connection, :href => "/cloudapi/ecloud/operatingSystemFamilies/computePools/#{id}")
+          @operating_system_families ||= Fog::Compute::Ecloud::OperatingSystemFamilies.new(:service => service, :href => "/cloudapi/ecloud/operatingSystemFamilies/computePools/#{id}")
         end
 
         def templates
-          @templates ||= self.connection.templates(:href => "/cloudapi/ecloud/templates/computePools/#{id}")
+          @templates ||= self.service.templates(:href => "/cloudapi/ecloud/templates/computePools/#{id}")
         end
 
         def detached_disks
-          @detached_disks ||= self.connection.detached_disks(:href => "/cloudapi/ecloud/detacheddisks/computepools/#{id}")
+          @detached_disks ||= self.service.detached_disks(:href => "/cloudapi/ecloud/detacheddisks/computepools/#{id}")
         end
 
         def environment
           @environment ||= begin
                              reload unless other_links
                              environment_link = other_links.find{|l| l[:type] == "application/vnd.tmrk.cloud.environment"}
-                             self.connection.environments.get(environment_link[:href])
+                             self.service.environments.get(environment_link[:href])
                            end
         end
 
         def edit(options)
           options[:uri] = href
-          data = connection.compute_pool_edit(options).body
+          data = service.compute_pool_edit(options).body
           pool = collection.from_data(data)
         end
 
diff --git a/lib/fog/ecloud/models/compute/compute_pools.rb b/lib/fog/ecloud/models/compute/compute_pools.rb
index 88aa98b3e..2faaa1b59 100644
--- a/lib/fog/ecloud/models/compute/compute_pools.rb
+++ b/lib/fog/ecloud/models/compute/compute_pools.rb
@@ -13,12 +13,12 @@ module Fog
 
         def all
           check_href!(:message => "the Compute Pool href of the Environment you want to enumerate")
-          data = connection.get_compute_pools(href).body[:ComputePool]
+          data = service.get_compute_pools(href).body[:ComputePool]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_compute_pool(uri)
+          if data = service.get_compute_pool(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/cpu_usage_detail_summary.rb b/lib/fog/ecloud/models/compute/cpu_usage_detail_summary.rb
index 45d91e200..1601305ef 100644
--- a/lib/fog/ecloud/models/compute/cpu_usage_detail_summary.rb
+++ b/lib/fog/ecloud/models/compute/cpu_usage_detail_summary.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::CpuUsageDetail
 
         def all
-          data = connection.get_cpu_usage_detail_summary(href).body[:CpuUsageDetailSummary][:CpuUsageDetail]
+          data = service.get_cpu_usage_detail_summary(href).body[:CpuUsageDetailSummary][:CpuUsageDetail]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_cpu_usage_detail(uri)
+          if data = service.get_cpu_usage_detail(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/environment.rb b/lib/fog/ecloud/models/compute/environment.rb
index 951e83cf0..d35ba74b3 100644
--- a/lib/fog/ecloud/models/compute/environment.rb
+++ b/lib/fog/ecloud/models/compute/environment.rb
@@ -12,23 +12,23 @@ module Fog
         attribute :other_links, :aliases => :Links, :squash => :Link
 
         def public_ips
-          @public_ips ||= Fog::Compute::Ecloud::PublicIps.new(:connection => connection, :href => "/cloudapi/ecloud/publicIps/environments/#{id}")
+          @public_ips ||= Fog::Compute::Ecloud::PublicIps.new(:service => service, :href => "/cloudapi/ecloud/publicIps/environments/#{id}")
         end
 
         def internet_services
-          @internet_services ||= Fog::Compute::Ecloud::InternetServices.new(:connection => connection, :href => "/cloudapi/ecloud/networkSummary/environments/#{id}")
+          @internet_services ||= Fog::Compute::Ecloud::InternetServices.new(:service => service, :href => "/cloudapi/ecloud/networkSummary/environments/#{id}")
         end
 
         def node_services
-          @node_services ||= Fog::Compute::Ecloud::Nodes.new(:connection => connection, :href => "/cloudapi/ecloud/networkSummary/environments/#{id}")
+          @node_services ||= Fog::Compute::Ecloud::Nodes.new(:service => service, :href => "/cloudapi/ecloud/networkSummary/environments/#{id}")
         end
 
         def backup_internet_services
-          @backup_internet_services ||= Fog::Compute::Ecloud::BackupInternetServices.new(:connection => connection, :href => "/cloudapi/ecloud/backupInternetServices/environments/#{id}")
+          @backup_internet_services ||= Fog::Compute::Ecloud::BackupInternetServices.new(:service => service, :href => "/cloudapi/ecloud/backupInternetServices/environments/#{id}")
         end
 
         def networks
-          @networks ||= self.connection.networks(:href => "/cloudapi/ecloud/networks/environments/#{id}")
+          @networks ||= self.service.networks(:href => "/cloudapi/ecloud/networks/environments/#{id}")
         end
 
         def servers
@@ -45,7 +45,7 @@ module Fog
         end
 
         def layout
-          @layout ||= self.connection.layouts(:href => "/cloudapi/ecloud/layout/environments/#{id}").first
+          @layout ||= self.service.layouts(:href => "/cloudapi/ecloud/layout/environments/#{id}").first
         end
 
         def rows
@@ -53,45 +53,45 @@ module Fog
         end
 
         def tasks
-          @tasks ||= Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => "/cloudapi/ecloud/tasks/environments/#{id}")
+          @tasks ||= Fog::Compute::Ecloud::Tasks.new(:service => service, :href => "/cloudapi/ecloud/tasks/environments/#{id}")
         end
 
         def firewall_acls
-          @firewall_acls ||= Fog::Compute::Ecloud::FirewallAcls.new(:connection => connection, :href => "/cloudapi/ecloud/firewallAcls/environments/#{id}")
+          @firewall_acls ||= Fog::Compute::Ecloud::FirewallAcls.new(:service => service, :href => "/cloudapi/ecloud/firewallAcls/environments/#{id}")
         end
 
         def compute_pools
-          @compute_pools ||= Fog::Compute::Ecloud::ComputePools.new(:connection => connection, :href => "/cloudapi/ecloud/computePools/environments/#{id}")
+          @compute_pools ||= Fog::Compute::Ecloud::ComputePools.new(:service => service, :href => "/cloudapi/ecloud/computePools/environments/#{id}")
         end
 
         def physical_devices
-          @physical_devices ||= Fog::Compute::Ecloud::PhysicalDevices.new(:connection => connection, :href => "/cloudapi/ecloud/physicalDevices/environments/#{id}")
+          @physical_devices ||= Fog::Compute::Ecloud::PhysicalDevices.new(:service => service, :href => "/cloudapi/ecloud/physicalDevices/environments/#{id}")
         end
 
         def trusted_network_groups
-          @trusted_network_groups ||= Fog::Compute::Ecloud::TrustedNetworkGroups.new(:connection => connection, :href => "/cloudapi/ecloud/trustedNetworkGroups/environments/#{id}")
+          @trusted_network_groups ||= Fog::Compute::Ecloud::TrustedNetworkGroups.new(:service => service, :href => "/cloudapi/ecloud/trustedNetworkGroups/environments/#{id}")
         end
 
         def catalog
-          @catalog = connection.catalog(:href => "/cloudapi/ecloud/admin/catalog/organizations/#{organization.id}")
+          @catalog = service.catalog(:href => "/cloudapi/ecloud/admin/catalog/organizations/#{organization.id}")
         end
 
         def rnats
-          @rnats ||= Fog::Compute::Ecloud::Rnats.new(:connection => connection, :href => "/cloudapi/ecloud/rnats/environments/#{id}")
+          @rnats ||= Fog::Compute::Ecloud::Rnats.new(:service => service, :href => "/cloudapi/ecloud/rnats/environments/#{id}")
         end
 
         def create_trusted_network_group(options = {})
           options[:uri] = "/cloudapi/ecloud/trustedNetworkGroups/environments/#{id}/action/createTrustedNetworkGroup"
-          data = connection.trusted_network_groups_create(options).body
-          tng = Fog::Compute::Ecloud::TrustedNetworkGroups.new(:connection => connection, :href => data[:href])[0]
+          data = service.trusted_network_groups_create(options).body
+          tng = Fog::Compute::Ecloud::TrustedNetworkGroups.new(:service => service, :href => data[:href])[0]
         end
 
         def create_firewall_acl(options = {})
           options[:uri] = "/cloudapi/ecloud/firewallAcls/environments/#{id}/action/createFirewallAcl"
           options[:permission] ||= "deny"
           options[:protocol] ||= "any"
-          data = connection.firewall_acls_create(options).body
-          acl = Fog::Compute::Ecloud::FirewallAcls.new(:connection => connection, :href => data[:href])[0]
+          data = service.firewall_acls_create(options).body
+          acl = Fog::Compute::Ecloud::FirewallAcls.new(:service => service, :href => data[:href])[0]
         end
 
         def id
@@ -102,7 +102,7 @@ module Fog
           @organization ||= begin
                              reload unless other_links
                              organization_link = other_links.find{|l| l[:type] == "application/vnd.tmrk.cloud.organization"}
-                             self.connection.organizations.new(organization_link)
+                             self.service.organizations.new(organization_link)
                            end
         end
       end
diff --git a/lib/fog/ecloud/models/compute/environments.rb b/lib/fog/ecloud/models/compute/environments.rb
index 73df64a26..c09646a90 100644
--- a/lib/fog/ecloud/models/compute/environments.rb
+++ b/lib/fog/ecloud/models/compute/environments.rb
@@ -14,7 +14,7 @@ module Fog
 
         def all
           data = []
-          connection.get_organization(href).body[:Locations][:Location].each do |d|
+          service.get_organization(href).body[:Locations][:Location].each do |d|
             if d[:Environments][:Environment].is_a?(Array)
               d[:Environments][:Environment].each { |e| data << e }
             else
@@ -25,7 +25,7 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_environment(uri)
+          if data = service.get_environment(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/firewall_acl.rb b/lib/fog/ecloud/models/compute/firewall_acl.rb
index 9a5b77771..b7dfce361 100644
--- a/lib/fog/ecloud/models/compute/firewall_acl.rb
+++ b/lib/fog/ecloud/models/compute/firewall_acl.rb
@@ -15,7 +15,7 @@ module Fog
         attribute :port_range, :aliases => :PortRange
 
         def tasks
-          @tasks = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => "/cloudapi/ecloud/tasks/virtualMachines/#{id}")
+          @tasks = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => "/cloudapi/ecloud/tasks/virtualMachines/#{id}")
         end
 
         def id
diff --git a/lib/fog/ecloud/models/compute/firewall_acls.rb b/lib/fog/ecloud/models/compute/firewall_acls.rb
index 515b11622..be3735e36 100644
--- a/lib/fog/ecloud/models/compute/firewall_acls.rb
+++ b/lib/fog/ecloud/models/compute/firewall_acls.rb
@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::Ecloud::FirewallAcl
 
         def all
-          data = connection.get_firewall_acls(href).body
+          data = service.get_firewall_acls(href).body
           data = data[:FirewallAcl] ? data[:FirewallAcl] : data
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_firewall_acl(uri)
+          if data = service.get_firewall_acl(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/group.rb b/lib/fog/ecloud/models/compute/group.rb
index c8dd420fe..5fe84ac2b 100644
--- a/lib/fog/ecloud/models/compute/group.rb
+++ b/lib/fog/ecloud/models/compute/group.rb
@@ -10,24 +10,24 @@ module Fog
         attribute :index, :aliases => :Index
 
         def servers
-          @servers = Fog::Compute::Ecloud::Servers.new(:connection => connection, :href => href)
+          @servers = Fog::Compute::Ecloud::Servers.new(:service => service, :href => href)
         end
 
         def edit(options = {})
           options[:uri] = href
-          data = connection.groups_edit(options).body
-        end 
+          data = service.groups_edit(options).body
+        end
 
         def move_up
-          connection.groups_moveup(href).body
+          service.groups_moveup(href).body
         end
 
         def move_down
-          connection.groups_movedown(href).body
+          service.groups_movedown(href).body
         end
 
         def delete
-          connection.groups_delete(href).body
+          service.groups_delete(href).body
         end
 
         def id
diff --git a/lib/fog/ecloud/models/compute/groups.rb b/lib/fog/ecloud/models/compute/groups.rb
index 7e3b07a5b..25a1e942b 100644
--- a/lib/fog/ecloud/models/compute/groups.rb
+++ b/lib/fog/ecloud/models/compute/groups.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Ecloud::Group
 
         def all
-          data = connection.get_groups(href).body
+          data = service.get_groups(href).body
           data = if data == ""
                    ""
                  else
@@ -24,7 +24,7 @@ module Fog
         end
 
         def get(uri)
-          data = connection.get_group(uri).body
+          data = service.get_group(uri).body
           if data == ""
             nil
           else
diff --git a/lib/fog/ecloud/models/compute/guest_processes.rb b/lib/fog/ecloud/models/compute/guest_processes.rb
index eabed2af7..c788bc94d 100644
--- a/lib/fog/ecloud/models/compute/guest_processes.rb
+++ b/lib/fog/ecloud/models/compute/guest_processes.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::GuestProcess
 
         def all
-          data = connection.get_guest_processes(href).body[:GuestProcess]
+          data = service.get_guest_processes(href).body[:GuestProcess]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_guest_process(uri)
+          if data = service.get_guest_process(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/hardware_configurations.rb b/lib/fog/ecloud/models/compute/hardware_configurations.rb
index c53db3b18..9e95f4ea4 100644
--- a/lib/fog/ecloud/models/compute/hardware_configurations.rb
+++ b/lib/fog/ecloud/models/compute/hardware_configurations.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::HardwareConfiguration
 
         def all
-          data = connection.get_server(href).body
+          data = service.get_server(href).body
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_hardware_configuration(uri)
+          if data = service.get_hardware_configuration(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/internet_service.rb b/lib/fog/ecloud/models/compute/internet_service.rb
index 99878299b..3f030d63c 100644
--- a/lib/fog/ecloud/models/compute/internet_service.rb
+++ b/lib/fog/ecloud/models/compute/internet_service.rb
@@ -23,57 +23,57 @@ module Fog
         end
 
         def nodes
-          @nodes ||= Fog::Compute::Ecloud::Nodes.new(:connection => connection, :href => href)
+          @nodes ||= Fog::Compute::Ecloud::Nodes.new(:service => service, :href => href)
         end
 
         def monitors
-          @monitors ||= Fog::Compute::Ecloud::Monitors.new(:connection => connection, :href => "/cloudapi/ecloud/internetServices/#{id}/monitor") 
+          @monitors ||= Fog::Compute::Ecloud::Monitors.new(:service => service, :href => "/cloudapi/ecloud/internetServices/#{id}/monitor")
         end
 
         def save
           unless persisted?
-            result = connection.internet_service_create( collection.href, _compose_service_data )
+            result = service.internet_service_create( collection.href, _compose_service_data )
             merge_attributes(result.body)
           else
-            connection.configure_internet_service( href, _compose_service_data, _compose_ip_data )
+            service.configure_internet_service( href, _compose_service_data, _compose_ip_data )
           end
         end
 
         def edit(options)
           options[:uri] = href
-          data = connection.internet_service_edit(options).body
-          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])[0]
+          data = service.internet_service_edit(options).body
+          task = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => data[:href])[0]
         end
 
         def delete
-          data = connection.internet_service_delete(href).body
-          self.connection.tasks.new(data)
+          data = service.internet_service_delete(href).body
+          self.service.tasks.new(data)
         end
 
         def create_monitor(options = {})
           options = {:type => :default}.merge(options)
           case options[:type]
           when :default
-            data = connection.monitors_create_default(href + "/action/createDefaultMonitor").body
+            data = service.monitors_create_default(href + "/action/createDefaultMonitor").body
           when :ping
             options[:enabled] ||= true
             options[:uri] = href + "/action/createPingMonitor"
-            data = connection.monitors_create_ping(options).body
+            data = service.monitors_create_ping(options).body
           when :http
             options[:uri] = href + "/action/createHttpMonitor"
-            data = connection.monitors_create_http(options).body
+            data = service.monitors_create_http(options).body
           when :ecv
             options[:uri] = href + "/action/createEcvMonitor"
-            data = connection.monitors_create_ecv(options).body
+            data = service.monitors_create_ecv(options).body
           when :loopback
-            data = connection.monitors_create_loopback(href).body
+            data = service.monitors_create_loopback(href).body
           end
-          monitor = Fog::Compute::Ecloud::Monitors.new(:connection => connection, :href => data[:href])
+          monitor = Fog::Compute::Ecloud::Monitors.new(:service => service, :href => data[:href])
         end
 
         def disable_monitor
-          data = connection.monitors_disable(href + "/action/disableMonitor").body
-          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])
+          data = service.monitors_disable(href + "/action/disableMonitor").body
+          task = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => data[:href])
         end
 
         def id
diff --git a/lib/fog/ecloud/models/compute/internet_services.rb b/lib/fog/ecloud/models/compute/internet_services.rb
index a8f3c7bc9..59591511a 100644
--- a/lib/fog/ecloud/models/compute/internet_services.rb
+++ b/lib/fog/ecloud/models/compute/internet_services.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Ecloud::InternetService
 
         def all
-          data = connection.get_internet_services(href).body[:InternetServices]
+          data = service.get_internet_services(href).body[:InternetServices]
           if data.is_a?(Hash)
             load(data[:InternetService])
           elsif data.is_a?(String) && data.empty?
@@ -19,7 +19,7 @@ module Fog
         end
 
         def get(uri)
-          data = connection.get_internet_service(uri).body
+          data = service.get_internet_service(uri).body
           if data == ""
             new({})
           else
@@ -36,7 +36,7 @@ module Fog
           options[:description]        ||= ""
           options[:persistence]        ||= {}
           options[:persistence][:type] ||= "None"
-          data = connection.internet_service_create(options).body
+          data = service.internet_service_create(options).body
           object = new(data)
         end
 
diff --git a/lib/fog/ecloud/models/compute/ip_addresses.rb b/lib/fog/ecloud/models/compute/ip_addresses.rb
index 225a32c6a..712e8d027 100644
--- a/lib/fog/ecloud/models/compute/ip_addresses.rb
+++ b/lib/fog/ecloud/models/compute/ip_addresses.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Ecloud::IpAddress
 
         def all
-          data = connection.get_network(href).body
+          data = service.get_network(href).body
           data = if data[:IpAddresses]
                    data[:IpAddresses][:IpAddress]
                  else
@@ -21,7 +21,7 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_ip_address(uri)
+          if data = service.get_ip_address(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/layout.rb b/lib/fog/ecloud/models/compute/layout.rb
index 75cdea00f..3f3e6c5b0 100644
--- a/lib/fog/ecloud/models/compute/layout.rb
+++ b/lib/fog/ecloud/models/compute/layout.rb
@@ -8,7 +8,7 @@ module Fog
         attribute :other_links, :aliases => :Links
 
         def rows
-          @rows ||= self.connection.rows(:href => href)
+          @rows ||= self.service.rows(:href => href)
         end
 
         def id
diff --git a/lib/fog/ecloud/models/compute/layouts.rb b/lib/fog/ecloud/models/compute/layouts.rb
index c2c003b52..b6a52a9e3 100644
--- a/lib/fog/ecloud/models/compute/layouts.rb
+++ b/lib/fog/ecloud/models/compute/layouts.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::Layout
 
         def all
-          data = connection.get_layouts(href).body
+          data = service.get_layouts(href).body
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_layout(uri)
+          if data = service.get_layout(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/location.rb b/lib/fog/ecloud/models/compute/location.rb
index 5961dac59..565a99782 100644
--- a/lib/fog/ecloud/models/compute/location.rb
+++ b/lib/fog/ecloud/models/compute/location.rb
@@ -11,7 +11,7 @@ module Fog
         attribute :type, :aliases => :Type
 
         def catalog(org_href)
-          @catalog ||= Fog::Compute::Ecloud::Catalog.new(:connection => connection, :href => "/cloudapi/ecloud/admin/catalog/organizations/#{org_href.scan(/\d+/)[0]}/locations/#{id}")
+          @catalog ||= Fog::Compute::Ecloud::Catalog.new(:service => service, :href => "/cloudapi/ecloud/admin/catalog/organizations/#{org_href.scan(/\d+/)[0]}/locations/#{id}")
         end
 
         def id
diff --git a/lib/fog/ecloud/models/compute/locations.rb b/lib/fog/ecloud/models/compute/locations.rb
index 76163f861..48a5046b1 100644
--- a/lib/fog/ecloud/models/compute/locations.rb
+++ b/lib/fog/ecloud/models/compute/locations.rb
@@ -13,12 +13,12 @@ module Fog
         identity :href
 
         def all
-          data = connection.get_organization(href).body[:Locations][:Location]
+          data = service.get_organization(href).body[:Locations][:Location]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_location(uri)
+          if data = service.get_location(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/login_banners.rb b/lib/fog/ecloud/models/compute/login_banners.rb
index 99aa78309..280d8a457 100644
--- a/lib/fog/ecloud/models/compute/login_banners.rb
+++ b/lib/fog/ecloud/models/compute/login_banners.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::LoginBanner
 
         def all
-          data = connection.get_login_banners(href).body
+          data = service.get_login_banners(href).body
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_login_banner(uri)
+          if data = service.get_login_banner(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/memory_usage_detail_summary.rb b/lib/fog/ecloud/models/compute/memory_usage_detail_summary.rb
index 4643f9e66..9175ec81a 100644
--- a/lib/fog/ecloud/models/compute/memory_usage_detail_summary.rb
+++ b/lib/fog/ecloud/models/compute/memory_usage_detail_summary.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::MemoryUsageDetail
 
         def all
-          data = connection.get_memory_usage_detail_summary(href).body[:MemoryUsageDetailSummary][:MemoryUsageDetail]
+          data = service.get_memory_usage_detail_summary(href).body[:MemoryUsageDetailSummary][:MemoryUsageDetail]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_memory_usage_detail(uri)
+          if data = service.get_memory_usage_detail(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/monitor.rb b/lib/fog/ecloud/models/compute/monitor.rb
index 475b1938c..0017662d7 100644
--- a/lib/fog/ecloud/models/compute/monitor.rb
+++ b/lib/fog/ecloud/models/compute/monitor.rb
@@ -16,19 +16,19 @@ module Fog
         attribute :response_codes, :aliases => :ResponseCodes
         attribute :send_string, :aliases => :SendString
         attribute :receive_string, :aliases => :ReceiveString
-        
+
         def edit(options = {})
           href = "/cloudapi/ecloud/internetServices/#{internet_service_id}/monitor?type="
           case type
           when "application/vnd.tmrk.cloud.pingMonitor"
             options[:uri] = href + "ping"
-            data = connection.monitors_edit_ping(options).body
+            data = service.monitors_edit_ping(options).body
           when "application/vnd.tmrk.cloud.httpMonitor"
             options[:uri] = href + "http"
-            data = connection.monitors_edit_http(options).body
+            data = service.monitors_edit_http(options).body
           when "application/vnd.tmrk.cloud.ecvMonitor"
             options[:uri] = href + "ecv"
-            data = connection.monitors_edit_ecv(options).body
+            data = service.monitors_edit_ecv(options).body
           end
           object = collection.from_data(data)
         end
diff --git a/lib/fog/ecloud/models/compute/monitors.rb b/lib/fog/ecloud/models/compute/monitors.rb
index 53a3d1d39..a83f750dc 100644
--- a/lib/fog/ecloud/models/compute/monitors.rb
+++ b/lib/fog/ecloud/models/compute/monitors.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::Monitor
 
         def all
-          data = connection.get_monitors(href).body
+          data = service.get_monitors(href).body
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_monitor(uri)
+          if data = service.get_monitor(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/network.rb b/lib/fog/ecloud/models/compute/network.rb
index f3855f6f2..538b62a5b 100644
--- a/lib/fog/ecloud/models/compute/network.rb
+++ b/lib/fog/ecloud/models/compute/network.rb
@@ -14,17 +14,17 @@ module Fog
         attribute :rnat_address,      :aliases => :RnatAddress
 
         def rnats
-          @rnats ||= Fog::Compute::Ecloud::Rnats.new(:connection => connection, :href => "cloudapi/ecloud/rnats/networks/#{id}")
+          @rnats ||= Fog::Compute::Ecloud::Rnats.new(:service => service, :href => "cloudapi/ecloud/rnats/networks/#{id}")
         end
 
         def ips
-          @ips ||= Fog::Compute::Ecloud::IpAddresses.new(:connection => connection, :href => href)
+          @ips ||= Fog::Compute::Ecloud::IpAddresses.new(:service => service, :href => href)
         end
 
         def edit_rnat_association(options)
           options[:uri] = href
-          data = connection.rnat_associations_edit_network(options).body
-          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])[0]
+          data = service.rnat_associations_edit_network(options).body
+          task = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => data[:href])[0]
         end
 
         def id
diff --git a/lib/fog/ecloud/models/compute/networks.rb b/lib/fog/ecloud/models/compute/networks.rb
index 1763fd608..e0c924a6c 100644
--- a/lib/fog/ecloud/models/compute/networks.rb
+++ b/lib/fog/ecloud/models/compute/networks.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Ecloud::Network
 
         def all
-          body = connection.get_networks(self.href).body
+          body = service.get_networks(self.href).body
           body = body[:Networks] ? body[:Networks][:Network] : body[:Network]
           data = case body
                  when NilClass then []
@@ -21,7 +21,7 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_network(uri)
+          if data = service.get_network(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/node.rb b/lib/fog/ecloud/models/compute/node.rb
index c657df25b..486602555 100644
--- a/lib/fog/ecloud/models/compute/node.rb
+++ b/lib/fog/ecloud/models/compute/node.rb
@@ -18,20 +18,20 @@ module Fog
         end
 
         def tasks
-          @tasks ||= Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => "/cloudapi/ecloud/tasks/virtualMachines/#{id}")
+          @tasks ||= Fog::Compute::Ecloud::Tasks.new(:service => service, :href => "/cloudapi/ecloud/tasks/virtualMachines/#{id}")
         end
 
         def delete
-          data = connection.node_service_delete(href).body
-          self.connection.tasks.new(data)
+          data = service.node_service_delete(href).body
+          self.service.tasks.new(data)
         end
 
         def edit(options)
           options[:uri] = href
           options[:description] ||= ""
           options = {:name => name}.merge(options)
-          data = connection.node_service_edit(options).body
-          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])[0]
+          data = service.node_service_edit(options).body
+          task = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => data[:href])[0]
         end
 
         def id
diff --git a/lib/fog/ecloud/models/compute/nodes.rb b/lib/fog/ecloud/models/compute/nodes.rb
index 07264a46b..9e2dc20bd 100644
--- a/lib/fog/ecloud/models/compute/nodes.rb
+++ b/lib/fog/ecloud/models/compute/nodes.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Ecloud::Node
 
         def all
-          data = connection.get_nodes(href).body
+          data = service.get_nodes(href).body
           if data[:NodeServices]
             load(data[:NodeServices][:NodeService])
           else
@@ -19,7 +19,7 @@ module Fog
         end
 
         def get(uri)
-          data = connection.get_node(uri).body
+          data = service.get_node(uri).body
           if data == ""
             new({})
           else
@@ -34,7 +34,7 @@ module Fog
           options[:protocol] ||= "TCP"
           options[:enabled] ||= true
           options[:description] ||= ""
-          data = connection.node_service_create(options).body
+          data = service.node_service_create(options).body
           object = new(data)
         end
 
diff --git a/lib/fog/ecloud/models/compute/operating_system_families.rb b/lib/fog/ecloud/models/compute/operating_system_families.rb
index 4adf6d042..ed8c41552 100644
--- a/lib/fog/ecloud/models/compute/operating_system_families.rb
+++ b/lib/fog/ecloud/models/compute/operating_system_families.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::OperatingSystemFamily
 
         def all
-          data = connection.get_operating_system_families(href).body[:OperatingSystemFamily]
+          data = service.get_operating_system_families(href).body[:OperatingSystemFamily]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_operating_system(uri)
+          if data = service.get_operating_system(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/operating_system_family.rb b/lib/fog/ecloud/models/compute/operating_system_family.rb
index 622a8b9ec..7e8ca5ae9 100644
--- a/lib/fog/ecloud/models/compute/operating_system_family.rb
+++ b/lib/fog/ecloud/models/compute/operating_system_family.rb
@@ -9,7 +9,7 @@ module Fog
         attribute :operating_system_family, :aliases => :OperatingSystems
 
         def operating_systems
-          @operating_systems ||= self.connection.operating_systems(:data => operating_system_family[:OperatingSystem])
+          @operating_systems ||= self.service.operating_systems(:data => operating_system_family[:OperatingSystem])
         end
 
         def id
diff --git a/lib/fog/ecloud/models/compute/operating_systems.rb b/lib/fog/ecloud/models/compute/operating_systems.rb
index 0d349b5e5..d6e9cd6b0 100644
--- a/lib/fog/ecloud/models/compute/operating_systems.rb
+++ b/lib/fog/ecloud/models/compute/operating_systems.rb
@@ -14,7 +14,7 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_operating_system(uri)
+          if data = service.get_operating_system(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/organization.rb b/lib/fog/ecloud/models/compute/organization.rb
index 1e1ab1d47..da6029be4 100644
--- a/lib/fog/ecloud/models/compute/organization.rb
+++ b/lib/fog/ecloud/models/compute/organization.rb
@@ -12,60 +12,60 @@ module Fog
         attribute :other_links, :aliases => :Links, :squash => :Link
 
         def locations
-          @locations ||= Fog::Compute::Ecloud::Locations.new( :connection => connection, :href => href )
+          @locations ||= Fog::Compute::Ecloud::Locations.new( :service => service, :href => href )
         end
 
-        def environments 
-          @environments ||= self.connection.environments(:href => href)
+        def environments
+          @environments ||= self.service.environments(:href => href)
         end
 
         def tags
-          @tags ||= self.connection.tags(:href => "/cloudapi/ecloud/deviceTags/organizations/#{id}")
+          @tags ||= self.service.tags(:href => "/cloudapi/ecloud/deviceTags/organizations/#{id}")
         end
 
         def admin
-          @admin ||= self.connection.admin_organizations.new(:href => "/cloudapi/ecloud/admin/organizations/#{id}")
+          @admin ||= self.service.admin_organizations.new(:href => "/cloudapi/ecloud/admin/organizations/#{id}")
         end
 
         def users
-          @users ||= self.connection.users(:href => "/cloudapi/ecloud/admin/users/organizations/#{id}")
+          @users ||= self.service.users(:href => "/cloudapi/ecloud/admin/users/organizations/#{id}")
         end
 
         def support_tickets(type = :open)
           case type
           when :open
-            @support_tickets ||= Fog::Compute::Ecloud::SupportTickets.new(:connection => connection, :href => "/cloudapi/ecloud/admin/tickets/organizations/#{id}/active")
+            @support_tickets ||= Fog::Compute::Ecloud::SupportTickets.new(:service => service, :href => "/cloudapi/ecloud/admin/tickets/organizations/#{id}/active")
           when :closed
-            @support_tickets ||= Fog::Compute::Ecloud::SupportTickets.new(:connection => connection, :href => "/cloudapi/ecloud/admin/tickets/organizations/#{id}/closed")
+            @support_tickets ||= Fog::Compute::Ecloud::SupportTickets.new(:service => service, :href => "/cloudapi/ecloud/admin/tickets/organizations/#{id}/closed")
           end
         end
 
         def edit_authentication_levels(options = {})
           options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/authenticationLevels"
-          data = connection.admin_edit_authentication_levels(options).body
-          level = Fog::Compute::Ecloud::AdminOrganizations.new(:connection => connection, :href => data[:href])[0]
+          data = service.admin_edit_authentication_levels(options).body
+          level = Fog::Compute::Ecloud::AdminOrganizations.new(:service => service, :href => data[:href])[0]
         end
 
         def edit_password_complexity_rules(options = {})
           options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/passwordComplexityRules"
-          data = connection.admin_edit_password_complexity_rules(options).body
-          level = Fog::Compute::Ecloud::PasswordComplexityRules.new(:connection => connection, :href => data[:href])[0]
+          data = service.admin_edit_password_complexity_rules(options).body
+          level = Fog::Compute::Ecloud::PasswordComplexityRules.new(:service => service, :href => data[:href])[0]
         end
 
         def edit_login_banner(options = {})
           options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/loginBanner"
-          data = connection.admin_edit_login_banner(options).body
-          banner = Fog::Compute::Ecloud::LoginBanners.new(:connection => connection, :href => data[:href])[0]
+          data = service.admin_edit_login_banner(options).body
+          banner = Fog::Compute::Ecloud::LoginBanners.new(:service => service, :href => data[:href])[0]
         end
 
         def enable_support_access(options = {})
           options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/action/enableSupportAccess"
-          connection.admin_enable_support_access(options[:uri])
+          service.admin_enable_support_access(options[:uri])
         end
 
         def disable_support_access(options = {})
           options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/action/disableSupportAccess"
-          connection.admin_disable_support_access(options[:uri])
+          service.admin_disable_support_access(options[:uri])
         end
 
         def id
diff --git a/lib/fog/ecloud/models/compute/organizations.rb b/lib/fog/ecloud/models/compute/organizations.rb
index 25c8a76ae..d41c2dab0 100644
--- a/lib/fog/ecloud/models/compute/organizations.rb
+++ b/lib/fog/ecloud/models/compute/organizations.rb
@@ -12,12 +12,12 @@ module Fog
         identity :href
 
         def all
-          data = connection.get_organizations(organization_uri).body
+          data = service.get_organizations(organization_uri).body
           load(data[:Organization])
         end
 
         def get(uri)
-          if data = connection.get_organization(uri)
+          if data = service.get_organization(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
@@ -25,7 +25,7 @@ module Fog
         end
 
         def organization_uri
-          @organization_uri ||= connection.default_organization_uri
+          @organization_uri ||= service.default_organization_uri
         end
 
         private
diff --git a/lib/fog/ecloud/models/compute/password_complexity_rules.rb b/lib/fog/ecloud/models/compute/password_complexity_rules.rb
index 2af80e080..e6751771a 100644
--- a/lib/fog/ecloud/models/compute/password_complexity_rules.rb
+++ b/lib/fog/ecloud/models/compute/password_complexity_rules.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::PasswordComplexityRule
 
         def all
-          data = connection.get_password_complexity_rules(href).body
+          data = service.get_password_complexity_rules(href).body
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_password_complexity_rule(uri)
+          if data = service.get_password_complexity_rule(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/physical_devices.rb b/lib/fog/ecloud/models/compute/physical_devices.rb
index 5c74bb028..ad44c7d6c 100644
--- a/lib/fog/ecloud/models/compute/physical_devices.rb
+++ b/lib/fog/ecloud/models/compute/physical_devices.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::PhysicalDevice
 
         def all
-          data = connection.get_physical_devices(href).body[:PhysicalDevice] || []
+          data = service.get_physical_devices(href).body[:PhysicalDevice] || []
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_physical_device(uri)
+          if data = service.get_physical_device(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/public_ip.rb b/lib/fog/ecloud/models/compute/public_ip.rb
index 6b912ca65..9aea8f3bc 100644
--- a/lib/fog/ecloud/models/compute/public_ip.rb
+++ b/lib/fog/ecloud/models/compute/public_ip.rb
@@ -10,7 +10,7 @@ module Fog
         attribute :ip_type, :aliases => :IpType
 
         def internet_services
-          @internet_services = Fog::Compute::Ecloud::InternetServices.new(:connection => connection, :href => href)
+          @internet_services = Fog::Compute::Ecloud::InternetServices.new(:service => service, :href => href)
         end
 
         def environment_id
diff --git a/lib/fog/ecloud/models/compute/public_ips.rb b/lib/fog/ecloud/models/compute/public_ips.rb
index 79ed79626..4c6e79037 100644
--- a/lib/fog/ecloud/models/compute/public_ips.rb
+++ b/lib/fog/ecloud/models/compute/public_ips.rb
@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::Ecloud::PublicIp
 
         def all
-          data = connection.get_public_ips(href).body
+          data = service.get_public_ips(href).body
           data = data[:PublicIp] ? data[:PublicIp] : data
           load(data)
         end
 
         def get(uri)
-          data = connection.get_public_ip(uri).body
+          data = service.get_public_ip(uri).body
           if data == ""
             new({})
           else
@@ -27,8 +27,8 @@ module Fog
         end
 
         def activate
-          data = connection.public_ip_activate(href + "/action/activatePublicIp").body
-          ip = Fog::Compute::Ecloud::PublicIps.new(:connection => connection, :href => data[:href])[0]
+          data = service.public_ip_activate(href + "/action/activatePublicIp").body
+          ip = Fog::Compute::Ecloud::PublicIps.new(:service => service, :href => data[:href])[0]
         end
       end
     end
diff --git a/lib/fog/ecloud/models/compute/rnat.rb b/lib/fog/ecloud/models/compute/rnat.rb
index 4e16d7ff7..1437a6632 100644
--- a/lib/fog/ecloud/models/compute/rnat.rb
+++ b/lib/fog/ecloud/models/compute/rnat.rb
@@ -11,11 +11,11 @@ module Fog
         attribute :public_ip, :aliases => :PublicIp
 
         def networks
-          @networks = Fog::Compute::Ecloud::Networks.new(:connection => connection, :href => href)
+          @networks = Fog::Compute::Ecloud::Networks.new(:service => service, :href => href)
         end
 
         def associations
-          @associations = Fog::Compute::Ecloud::Associations.new(:connection => connection, :href => href)
+          @associations = Fog::Compute::Ecloud::Associations.new(:service => service, :href => href)
         end
 
         def id
diff --git a/lib/fog/ecloud/models/compute/rnats.rb b/lib/fog/ecloud/models/compute/rnats.rb
index c1f9ef585..c69796577 100644
--- a/lib/fog/ecloud/models/compute/rnats.rb
+++ b/lib/fog/ecloud/models/compute/rnats.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::Rnat
 
         def all
-          data = connection.get_rnats(href).body[:Rnats][:Rnat]
+          data = service.get_rnats(href).body[:Rnats][:Rnat]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_rnat(uri)
+          if data = service.get_rnat(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/roles.rb b/lib/fog/ecloud/models/compute/roles.rb
index 5ee29c989..d908270ce 100644
--- a/lib/fog/ecloud/models/compute/roles.rb
+++ b/lib/fog/ecloud/models/compute/roles.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Ecloud::Role
 
         def all
-          data = connection.get_roles(href).body
+          data = service.get_roles(href).body
           if data[:OrganizationRole]
             load(data[:OrganizationRole])
           else
@@ -25,7 +25,7 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_role(uri)
+          if data = service.get_role(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/row.rb b/lib/fog/ecloud/models/compute/row.rb
index 022f4a6b8..66bf7aeac 100644
--- a/lib/fog/ecloud/models/compute/row.rb
+++ b/lib/fog/ecloud/models/compute/row.rb
@@ -10,34 +10,34 @@ module Fog
         attribute :index, :aliases => :Index
 
         def groups
-          @groups = self.connection.groups(:href => href)
+          @groups = self.service.groups(:href => href)
         end
 
         def edit(options)
           options[:uri] = href
-          connection.rows_edit(options).body
+          service.rows_edit(options).body
         end
 
         def move_up(options)
           options[:uri] = href + "/action/moveup"
-          connection.rows_moveup(options).body
+          service.rows_moveup(options).body
         end
 
         def move_down(options)
           options[:uri] = href + "/action/movedown"
-          connection.rows_movedown(options).body
+          service.rows_movedown(options).body
         end
 
         def delete
-          connection.rows_delete(href).body
+          service.rows_delete(href).body
         end
 
         def create_group(options = {})
           options[:uri] = "/cloudapi/ecloud/layoutGroups/environments/#{environment_id}/action/createLayoutGroup"
           options[:row_name] = name
           options[:href] = href
-          data = connection.groups_create(options).body
-          group = self.connection.groups.new(data)
+          data = service.groups_create(options).body
+          group = self.service.groups.new(data)
         end
 
         def environment_id
diff --git a/lib/fog/ecloud/models/compute/rows.rb b/lib/fog/ecloud/models/compute/rows.rb
index fa7806210..54f06408b 100644
--- a/lib/fog/ecloud/models/compute/rows.rb
+++ b/lib/fog/ecloud/models/compute/rows.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::Row
 
         def all
-          data = connection.get_layout(href).body[:Rows][:Row]
+          data = service.get_layout(href).body[:Rows][:Row]
           load(data)
         end
 
         def get(uri)
-          data = connection.get_row(uri).body
+          data = service.get_row(uri).body
           if data == ""
             nil
           else
@@ -27,10 +27,10 @@ module Fog
 
         def create(options = {})
           options[:uri] = "/cloudapi/ecloud/layoutRows/environments/#{environment_id}/action/createLayoutRow"
-          data = connection.rows_create(options).body
+          data = service.rows_create(options).body
           new(data)
         end
- 
+
         def environment_id
           href.scan(/\d+/)[0]
         end
diff --git a/lib/fog/ecloud/models/compute/server.rb b/lib/fog/ecloud/models/compute/server.rb
index 0e4d4143c..7583a2ce8 100644
--- a/lib/fog/ecloud/models/compute/server.rb
+++ b/lib/fog/ecloud/models/compute/server.rb
@@ -39,32 +39,32 @@ module Fog
         end
 
         def tasks
-          @tasks ||= self.connection.tasks(:href => "/cloudapi/ecloud/tasks/virtualMachines/#{id}")
+          @tasks ||= self.service.tasks(:href => "/cloudapi/ecloud/tasks/virtualMachines/#{id}")
         end
 
         def processes
-          @processes ||= Fog::Compute::Ecloud::GuestProcesses.new(:connection, connection, :href => "/cloudapi/ecloud/virtualMachines/#{id}/guest/processes")
+          @processes ||= Fog::Compute::Ecloud::GuestProcesses.new(:service, service, :href => "/cloudapi/ecloud/virtualMachines/#{id}/guest/processes")
         end
 
         def hardware_configuration=(hardware_configuration)
-          @hardware_configuration = self.connection.hardware_configurations.new(hardware_configuration)
+          @hardware_configuration = self.service.hardware_configurations.new(hardware_configuration)
         end
 
         def hardware_configuration
-          @hardware_configuration ||= self.connection.hardware_configurations.new(:href => "/cloudapi/ecloud/virtualMachines/#{id}/hardwareConfiguration")
+          @hardware_configuration ||= self.service.hardware_configurations.new(:href => "/cloudapi/ecloud/virtualMachines/#{id}/hardwareConfiguration")
           @hardware_configuration.reload
         end
 
         def configuration
-          @configuration ||= Fog::Compute::Ecloud::ServerConfigurationOptions.new(:connection => connection, :href => "/cloudapi/ecloud/virtualMachines/#{id}/configurationOptions")[0]
+          @configuration ||= Fog::Compute::Ecloud::ServerConfigurationOptions.new(:service => service, :href => "/cloudapi/ecloud/virtualMachines/#{id}/configurationOptions")[0]
         end
 
         def ips
-          @ips = self.connection.virtual_machine_assigned_ips(:virtual_machine_id => self.id)
+          @ips = self.service.virtual_machine_assigned_ips(:virtual_machine_id => self.id)
         end
 
         def networks
-          @networks ||= self.connection.networks(:href => "/cloudapi/ecloud/virtualMachines/#{id}/assignedIps")
+          @networks ||= self.service.networks(:href => "/cloudapi/ecloud/virtualMachines/#{id}/assignedIps")
         end
 
         def power_on
@@ -84,8 +84,8 @@ module Fog
         end
 
         def delete
-          data = connection.virtual_machine_delete(href).body
-          self.connection.tasks.new(data)
+          data = service.virtual_machine_delete(href).body
+          self.service.tasks.new(data)
         end
 
         def copy(options = {})
@@ -103,21 +103,21 @@ module Fog
               options[:network_uri] = options[:network_uri].is_a?(String) ? [options[:network_uri]] : options[:network_uri]
               options[:network_uri].each do |uri|
                 index = options[:network_uri].index(uri)
-                ip = Fog::Compute::Ecloud::IpAddresses.new(:connection => connection, :href => uri).detect { |i| i.host == nil }.name
+                ip = Fog::Compute::Ecloud::IpAddresses.new(:service => service, :href => uri).detect { |i| i.host == nil }.name
                 options[:ips] ||= []
                 options[:ips][index] = ip
               end
             end
-            data = connection.virtual_machine_copy("/cloudapi/ecloud/virtualMachines/computePools/#{compute_pool_id}/action/copyVirtualMachine", options).body
+            data = service.virtual_machine_copy("/cloudapi/ecloud/virtualMachines/computePools/#{compute_pool_id}/action/copyVirtualMachine", options).body
           elsif options[:type] == :identical
-            data = connection.virtual_machine_copy_identical("/cloudapi/ecloud/virtualMachines/computePools/#{compute_pool_id}/action/copyIdenticalVirtualMachine", options).body
+            data = service.virtual_machine_copy_identical("/cloudapi/ecloud/virtualMachines/computePools/#{compute_pool_id}/action/copyIdenticalVirtualMachine", options).body
           end
           vm = collection.from_data(data)
           vm
         end
 
         def rnats
-          rnats = Fog::Compute::Ecloud::Rnats.new(:connection => connection, :href => "/cloudapi/ecloud/rnats/environments/#{environment_id}")
+          rnats = Fog::Compute::Ecloud::Rnats.new(:service => service, :href => "/cloudapi/ecloud/rnats/environments/#{environment_id}")
           associations = nil
           rnats.each do |rnat|
             if rnats.index(rnat) == 0
@@ -140,19 +140,19 @@ module Fog
         end
 
         def edit(options = {})
-          data = connection.virtual_machine_edit(href, options).body
+          data = service.virtual_machine_edit(href, options).body
           if data[:type] == "application/vnd.tmrk.cloud.task"
-            task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])[0]
+            task = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => data[:href])[0]
           end
         end
 
         def create_rnat(options)
           options[:host_ip_href] ||= ips.first.href
           options[:uri] = "/cloudapi/ecloud/rnats/environments/#{environment_id}/action/createAssociation"
-          data = connection.rnat_associations_create_device(options).body
-          rnat = Fog::Compute::Ecloud::Associations.new(:connection => connection, :href => data[:href])[0]
+          data = service.rnat_associations_create_device(options).body
+          rnat = Fog::Compute::Ecloud::Associations.new(:service => service, :href => data[:href])[0]
         end
-        
+
         def disks
           c = hardware_configuration.reload.storage
           c = c.is_a?(Hash) ? [c] : c
@@ -162,8 +162,8 @@ module Fog
         def add_disk(size)
           index = disks.map { |d| d[:Index].to_i }.sort[-1] + 1
           vm_disks = disks << {:Index => index.to_s, :Size=>{:Unit => "GB", :Value => size.to_s}, :Name => "Hard Disk #{index + 1}"}
-          data = connection.virtual_machine_edit_hardware_configuration(href + "/hardwareConfiguration", _configuration_data(:disks => vm_disks)).body
-          task = self.connection.tasks.new(data)
+          data = service.virtual_machine_edit_hardware_configuration(href + "/hardwareConfiguration", _configuration_data(:disks => vm_disks)).body
+          task = self.service.tasks.new(data)
         end
 
         def detach_disk(index)
@@ -171,22 +171,22 @@ module Fog
           options[:disk]        = disks.detect { |disk_hash| disk_hash[:Index] == index.to_s }
           options[:name]        = self.name
           options[:description] = self.description
-          data                  = connection.virtual_machine_detach_disk(href + "/hardwareconfiguration/disks/actions/detach", options).body
-          detached_disk         = self.connection.detached_disks.new(data)
+          data                  = service.virtual_machine_detach_disk(href + "/hardwareconfiguration/disks/actions/detach", options).body
+          detached_disk         = self.service.detached_disks.new(data)
         end
 
         def attach_disk(detached_disk)
           options        = {}
           options[:name] = detached_disk.name
           options[:href] = detached_disk.href
-          data           = connection.virtual_machine_attach_disk(href + "/hardwareconfiguration/disks/actions/attach", options).body
-          task           = self.connection.tasks.new(data)
+          data           = service.virtual_machine_attach_disk(href + "/hardwareconfiguration/disks/actions/attach", options).body
+          task           = self.service.tasks.new(data)
         end
 
         def delete_disk(index)
           vm_disks = disks.delete_if { |h| h[:Index] == index.to_s }
-          data     = connection.virtual_machine_edit_hardware_configuration(href + "/hardwareconfiguration", _configuration_data(:disks => vm_disks)).body
-          task     = self.connection.tasks.new(data)
+          data     = service.virtual_machine_edit_hardware_configuration(href + "/hardwareconfiguration", _configuration_data(:disks => vm_disks)).body
+          task     = self.service.tasks.new(data)
         end
 
         def nics
@@ -198,8 +198,8 @@ module Fog
         def add_nic(network)
           unit_number = nics.map { |n| n[:UnitNumber].to_i }.sort[-1] + 1
           vm_nics = nics << {:UnitNumber => unit_number, :Network => {:href => network.href, :name => network.name, :type => "application/vnd.tmrk.cloud.network"}}
-          data = connection.virtual_machine_edit_hardware_configuration(href + "/hardwareConfiguration", _configuration_data(:nics => vm_nics)).body
-          task = self.connection.tasks.new(:href => data[:href])[0]
+          data = service.virtual_machine_edit_hardware_configuration(href + "/hardwareConfiguration", _configuration_data(:nics => vm_nics)).body
+          task = self.service.tasks.new(:href => data[:href])[0]
         end
 
         def add_ip(options)
@@ -222,8 +222,8 @@ module Fog
               end
             end
           end
-          data = connection.virtual_machine_edit_assigned_ips(href + "/assignedIps", slice_networks).body
-          task = self.connection.tasks.new(data)
+          data = service.virtual_machine_edit_assigned_ips(href + "/assignedIps", slice_networks).body
+          task = self.service.tasks.new(data)
         end
 
         def delete_ip(options)
@@ -251,12 +251,12 @@ module Fog
               end
             end
           end
-          data = connection.virtual_machine_edit_assigned_ips(href + "/assignedips", slice_networks).body
-          task = self.connection.tasks.new(data)
+          data = service.virtual_machine_edit_assigned_ips(href + "/assignedips", slice_networks).body
+          task = self.service.tasks.new(data)
         end
 
         def upload_file(options)
-          connection.virtual_machine_upload_file(href + "/guest/action/files", options)
+          service.virtual_machine_upload_file(href + "/guest/action/files", options)
           true
         end
 
@@ -288,7 +288,7 @@ module Fog
 
         def compute_pool
           reload if other_links.nil?
-          @compute_pool = self.connection.compute_pools.new(:href => other_links.detect { |l| l[:type] == "application/vnd.tmrk.cloud.computePool" }[:href])
+          @compute_pool = self.service.compute_pools.new(:href => other_links.detect { |l| l[:type] == "application/vnd.tmrk.cloud.computePool" }[:href])
         end
 
         def environment_id
@@ -308,7 +308,7 @@ module Fog
         def power_operation(op)
           requires :href
           begin
-            connection.send(op.keys.first, href + "/action/#{op.values.first}" )
+            service.send(op.keys.first, href + "/action/#{op.values.first}" )
           rescue Excon::Errors::Conflict => e
             #Frankly we shouldn't get here ...
             raise e unless e.to_s =~ /because it is already powered o(n|ff)/
diff --git a/lib/fog/ecloud/models/compute/server_configuration_options.rb b/lib/fog/ecloud/models/compute/server_configuration_options.rb
index 7a20f8e0e..bffd8bd97 100644
--- a/lib/fog/ecloud/models/compute/server_configuration_options.rb
+++ b/lib/fog/ecloud/models/compute/server_configuration_options.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::ServerConfigurationOption
 
         def all
-          data = connection.get_server_configuration_options(href).body
+          data = service.get_server_configuration_options(href).body
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_server_configuration_option(uri)
+          if data = service.get_server_configuration_option(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/servers.rb b/lib/fog/ecloud/models/compute/servers.rb
index 2d2605397..dbf08f70d 100644
--- a/lib/fog/ecloud/models/compute/servers.rb
+++ b/lib/fog/ecloud/models/compute/servers.rb
@@ -10,7 +10,7 @@ module Fog
         identity :href
 
         def all
-          data = connection.get_servers(href).body
+          data = service.get_servers(href).body
           if data.keys.include?(:VirtualMachines)
             data = data[:VirtualMachines][:VirtualMachine]
           elsif data[:VirtualMachine]
@@ -22,7 +22,7 @@ module Fog
         end
 
         def get(uri)
-          data = connection.get_server(uri).body
+          data = service.get_server(uri).body
           if data == ""
             new({})
           else
@@ -51,17 +51,17 @@ module Fog
             else
               [*options[:network_uri]].each do |uri|
                 index = options[:network_uri].index(uri)
-                ip = self.connection.ip_addresses(:href => uri).detect { |i| i.host == nil && i.detected_on.nil? }.name
+                ip = self.service.ip_addresses(:href => uri).detect { |i| i.host == nil && i.detected_on.nil? }.name
                 options[:ips] ||= []
                 options[:ips][index] = ip
               end
             end
-            data = connection.virtual_machine_create_from_template( template_uri, options ).body
+            data = service.virtual_machine_create_from_template( template_uri, options ).body
           else
             options[:uri] = href + "/action/importVirtualMachine"
-            data = connection.virtual_machine_import( template_uri, options ).body
+            data = service.virtual_machine_import( template_uri, options ).body
           end
-          object = self.connection.servers.new(data)
+          object = self.service.servers.new(data)
           object
         end
 
diff --git a/lib/fog/ecloud/models/compute/ssh_keys.rb b/lib/fog/ecloud/models/compute/ssh_keys.rb
index cf95975b7..0caf48ed2 100644
--- a/lib/fog/ecloud/models/compute/ssh_keys.rb
+++ b/lib/fog/ecloud/models/compute/ssh_keys.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::SshKey
 
         def all
-          data = connection.get_ssh_keys(href).body[:SshKey]
+          data = service.get_ssh_keys(href).body[:SshKey]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_ssh_key(uri)
+          if data = service.get_ssh_key(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/storage_usage_detail_summary.rb b/lib/fog/ecloud/models/compute/storage_usage_detail_summary.rb
index fc00cc180..03ded9a0e 100644
--- a/lib/fog/ecloud/models/compute/storage_usage_detail_summary.rb
+++ b/lib/fog/ecloud/models/compute/storage_usage_detail_summary.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::StorageUsageDetail
 
         def all
-          data = connection.get_storage_usage_detail_summary(href).body[:VirtualMachines][:VirtualMachine]
+          data = service.get_storage_usage_detail_summary(href).body[:VirtualMachines][:VirtualMachine]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_storage_usage_detail(uri)
+          if data = service.get_storage_usage_detail(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/support_tickets.rb b/lib/fog/ecloud/models/compute/support_tickets.rb
index 7f17b375c..9e27391bf 100644
--- a/lib/fog/ecloud/models/compute/support_tickets.rb
+++ b/lib/fog/ecloud/models/compute/support_tickets.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::SupportTicket
 
         def all
-          data = connection.get_support_tickets(href).body[:TicketReference]
+          data = service.get_support_tickets(href).body[:TicketReference]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_support_ticket(uri)
+          if data = service.get_support_ticket(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/tags.rb b/lib/fog/ecloud/models/compute/tags.rb
index 011638a50..407967c0c 100644
--- a/lib/fog/ecloud/models/compute/tags.rb
+++ b/lib/fog/ecloud/models/compute/tags.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::Tag
 
         def all
-          data = connection.get_tags(href).body[:DeviceTag]
+          data = service.get_tags(href).body[:DeviceTag]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_tag(uri)
+          if data = service.get_tag(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/tasks.rb b/lib/fog/ecloud/models/compute/tasks.rb
index 9688f7b54..e3ba3d7d7 100644
--- a/lib/fog/ecloud/models/compute/tasks.rb
+++ b/lib/fog/ecloud/models/compute/tasks.rb
@@ -4,7 +4,7 @@ module Fog
   module Compute
     class Ecloud
       class Tasks < Fog::Ecloud::Collection
-        
+
         model Fog::Compute::Ecloud::Task
 
         identity :href
@@ -12,13 +12,13 @@ module Fog
         attribute :total_count, :aliases => :TotalCount
 
         def all
-          data = connection.get_tasks(href).body
+          data = service.get_tasks(href).body
           data = data[:Task] ? data[:Task] : data
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_task(uri)
+          if data = service.get_task(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/templates.rb b/lib/fog/ecloud/models/compute/templates.rb
index 87b4383fa..999f7c123 100644
--- a/lib/fog/ecloud/models/compute/templates.rb
+++ b/lib/fog/ecloud/models/compute/templates.rb
@@ -11,7 +11,7 @@ module Fog
 
         def all
           r_data = []
-          data = connection.get_templates(href).body[:Families]
+          data = service.get_templates(href).body[:Families]
           data[:Family].is_a?(Hash) ? data = [data[:Family]] : data = data[:Family]
           data.each do |d|
             d[:Categories][:Category].each do |cat|
@@ -28,7 +28,7 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_template(uri)
+          if data = service.get_template(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/trusted_network_group.rb b/lib/fog/ecloud/models/compute/trusted_network_group.rb
index 4d563c505..751baf652 100644
--- a/lib/fog/ecloud/models/compute/trusted_network_group.rb
+++ b/lib/fog/ecloud/models/compute/trusted_network_group.rb
@@ -10,18 +10,18 @@ module Fog
         attribute :hosts, :aliases => :Hosts
 
         def internet_services
-          @internet_services ||= Fog::Compute::Ecloud::InternetServices.new(:connection => connection, :href => href)
+          @internet_services ||= Fog::Compute::Ecloud::InternetServices.new(:service => service, :href => href)
         end
 
         def edit(options)
           options[:uri] = href
-          data = connection.trusted_network_groups_edit(options).body
-          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])[0]
+          data = service.trusted_network_groups_edit(options).body
+          task = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => data[:href])[0]
         end
 
         def delete
-          data = connection.trusted_network_groups_delete(href).body
-          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])[0]
+          data = service.trusted_network_groups_delete(href).body
+          task = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => data[:href])[0]
         end
 
         def id
diff --git a/lib/fog/ecloud/models/compute/trusted_network_groups.rb b/lib/fog/ecloud/models/compute/trusted_network_groups.rb
index 960d225b7..83070b4dc 100644
--- a/lib/fog/ecloud/models/compute/trusted_network_groups.rb
+++ b/lib/fog/ecloud/models/compute/trusted_network_groups.rb
@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::Ecloud::TrustedNetworkGroup
 
         def all
-          data = connection.get_trusted_network_groups(href).body
+          data = service.get_trusted_network_groups(href).body
           data = data[:TrustedNetworkGroup] ? data[:TrustedNetworkGroup] : data
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_trusted_network_group(uri)
+          if data = service.get_trusted_network_group(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/ecloud/models/compute/user.rb b/lib/fog/ecloud/models/compute/user.rb
index 1ec1f1120..f1b9f3f47 100644
--- a/lib/fog/ecloud/models/compute/user.rb
+++ b/lib/fog/ecloud/models/compute/user.rb
@@ -19,11 +19,11 @@ module Fog
         attribute :is_multifactor_authentication_enabled, :aliases => :IsMultifactorAuthenticationEnabled, :type => :boolean
 
         def roles
-          @roles = Fog::Compute::Ecloud::Roles.new(:connection => connection, :href => "/cloudapi/ecloud/admin/roles/users/#{id}")
+          @roles = Fog::Compute::Ecloud::Roles.new(:service => service, :href => "/cloudapi/ecloud/admin/roles/users/#{id}")
         end
 
         def api_keys
-          @api_keys = Fog::Compute::Ecloud::ApiKeys.new(:connection => connection, :href => "/cloudapi/ecloud/admin/apiKeys/users/#{id}")
+          @api_keys = Fog::Compute::Ecloud::ApiKeys.new(:service => service, :href => "/cloudapi/ecloud/admin/apiKeys/users/#{id}")
         end
 
         def id
diff --git a/lib/fog/ecloud/models/compute/users.rb b/lib/fog/ecloud/models/compute/users.rb
index 39f63d403..176d6c6ab 100644
--- a/lib/fog/ecloud/models/compute/users.rb
+++ b/lib/fog/ecloud/models/compute/users.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::User
 
         def all
-          data = connection.get_users(href).body[:User]
+          data = service.get_users(href).body[:User]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_user(uri)
+          if data = service.get_user(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/glesys/models/compute/ip.rb b/lib/fog/glesys/models/compute/ip.rb
index f7733f0ed..ea1df8b0c 100644
--- a/lib/fog/glesys/models/compute/ip.rb
+++ b/lib/fog/glesys/models/compute/ip.rb
@@ -15,12 +15,12 @@ module Fog
         attribute :ip
 
         def list_own
-          connection.list_own
+          service.list_own
         end
 
         def list_free
           requires :version, :datacenter, :platform
-          connection.ip_list_free(
+          service.ip_list_free(
             :ipversion => version,
             :platform => platform,
             :datacenter => datacenter
@@ -29,7 +29,7 @@ module Fog
 
         def details
           requires :version, :ip
-          connection.ip_details(
+          service.ip_details(
             :ipversion => version,
             :ipaddress => ip
           )
@@ -37,7 +37,7 @@ module Fog
 
         def take
           requires :version, :ip
-          connection.ip_take(
+          service.ip_take(
             :ipversion => version,
             :ipaddress => ip
           )
@@ -45,7 +45,7 @@ module Fog
 
         def release
           requires :version, :ip
-          connection.ip_release(
+          service.ip_release(
             :ipversion => version,
             :ipaddress => ip
           )
@@ -53,7 +53,7 @@ module Fog
 
         def add
           requires :serverid, :version, :ip
-          connection.ip_add(
+          service.ip_add(
             :serverid  => serverid,
             :ipversion => version,
             :ipaddress => ip
@@ -62,7 +62,7 @@ module Fog
 
         def remove
           requires :serverid, :version, :ip
-          connection.ip_remove(
+          service.ip_remove(
             :serverid  => serverid,
             :ipversion => version,
             :ipaddress => ip
diff --git a/lib/fog/glesys/models/compute/ips.rb b/lib/fog/glesys/models/compute/ips.rb
index 82d088cd0..c6f3c218a 100644
--- a/lib/fog/glesys/models/compute/ips.rb
+++ b/lib/fog/glesys/models/compute/ips.rb
@@ -12,22 +12,22 @@ module Fog
         attribute :serverid
 
         def all
-          data = connection.ip_list_own.body['response']['iplist']
+          data = service.ip_list_own.body['response']['iplist']
           load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          
-          self.new( :serverid => identifier )          
 
-          data  = connection.ip_list_own(:serverid => identifier).body['response']
+          self.new( :serverid => identifier )
+
+          data  = service.ip_list_own(:serverid => identifier).body['response']
           if data['iplist'].empty?
-            nil 
+            nil
           else
             new(data['iplist'].first)
-          end 
-        end 
+          end
+        end
 
         def new(attributes = {})
           super({ :serverid => serverid }.merge!(attributes))
diff --git a/lib/fog/glesys/models/compute/server.rb b/lib/fog/glesys/models/compute/server.rb
index 78c84c995..a96a6f468 100644
--- a/lib/fog/glesys/models/compute/server.rb
+++ b/lib/fog/glesys/models/compute/server.rb
@@ -32,22 +32,22 @@ module Fog
 
         def start
           requires :identity
-          connection.start(:serverid => identity)
+          service.start(:serverid => identity)
         end
 
         def stop
           requires :identity
-          connection.stop(:serverid => identity)
+          service.stop(:serverid => identity)
         end
 
         def reboot
           requires :identity
-          connection.reboot(:serverid => identity)
+          service.reboot(:serverid => identity)
         end
 
         def destroy
           requires :identity
-          connection.destroy(:serverid => identity, :keepip => keepip)
+          service.destroy(:serverid => identity, :keepip => keepip)
         end
 
         def save
@@ -64,8 +64,8 @@ module Fog
             :cpucores       => cpucores     || "1",
             :rootpassword   => rootpassword,
             :transfer       => transfer     || "500",
-          } 
-          data = connection.create(options)
+          }
+          data = service.create(options)
           merge_attributes(data.body['response']['server'])
           data.status == 200 ? true : false
         end
diff --git a/lib/fog/glesys/models/compute/servers.rb b/lib/fog/glesys/models/compute/servers.rb
index a3280ad11..6a4b26e93 100644
--- a/lib/fog/glesys/models/compute/servers.rb
+++ b/lib/fog/glesys/models/compute/servers.rb
@@ -10,16 +10,16 @@ module Fog
         model Fog::Compute::Glesys::Server
 
         def all
-          data = connection.list_servers.body['response']['servers']
-          load(data) 
+          data = service.list_servers.body['response']['servers']
+          load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
 
           begin
-            details = connection.server_details(identifier).body['response']
-            status  = connection.server_status(identifier).body['response']
+            details = service.server_details(identifier).body['response']
+            status  = service.server_status(identifier).body['response']
 
             if details.empty? || status.empty?
               nil
diff --git a/lib/fog/glesys/models/compute/template.rb b/lib/fog/glesys/models/compute/template.rb
index f342ebfa5..97a88fd25 100644
--- a/lib/fog/glesys/models/compute/template.rb
+++ b/lib/fog/glesys/models/compute/template.rb
@@ -16,7 +16,7 @@ module Fog
         attribute :min_disk_size
 
         def list
-          connection.template_list
+          service.template_list
         end
 
       end
diff --git a/lib/fog/glesys/models/compute/templates.rb b/lib/fog/glesys/models/compute/templates.rb
index 65abb2440..1d1a4d1a2 100644
--- a/lib/fog/glesys/models/compute/templates.rb
+++ b/lib/fog/glesys/models/compute/templates.rb
@@ -10,8 +10,8 @@ module Fog
         model Fog::Glesys::Compute::Template
 
         def all
-          openvz = connection.template_list.body['response']['templates']['OpenVZ']
-          xen    = connection.template_list.body['response']['templates']['Xen']
+          openvz = service.template_list.body['response']['templates']['OpenVZ']
+          xen    = service.template_list.body['response']['templates']['Xen']
 
           load(xen+openvz)
         end
diff --git a/lib/fog/go_grid/models/compute/image.rb b/lib/fog/go_grid/models/compute/image.rb
index 74841aa17..89430027a 100644
--- a/lib/fog/go_grid/models/compute/image.rb
+++ b/lib/fog/go_grid/models/compute/image.rb
@@ -36,7 +36,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.grid_server_delete(id)
+          service.grid_server_delete(id)
           true
         end
 
@@ -48,7 +48,7 @@ module Fog
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :server_id
 
-          data = connection.grid_server_add(server_id, 'name' => name)
+          data = service.grid_server_add(server_id, 'name' => name)
           merge_attributes(data.body['image'])
           true
         end
diff --git a/lib/fog/go_grid/models/compute/images.rb b/lib/fog/go_grid/models/compute/images.rb
index 548a586ea..366191734 100644
--- a/lib/fog/go_grid/models/compute/images.rb
+++ b/lib/fog/go_grid/models/compute/images.rb
@@ -12,7 +12,7 @@ module Fog
         attribute :server
 
         def all
-          data = connection.grid_image_list.body['list']
+          data = service.grid_image_list.body['list']
           load(data)
           if server
             self.replace(self.select {|image| image.server_id == server.id})
@@ -20,7 +20,7 @@ module Fog
         end
 
         def get(image_id)
-          response = connection.grid_image_get.body['list'][image_id]
+          response = service.grid_image_get.body['list'][image_id]
           new(data)
         rescue Fog::Compute::GoGrid::NotFound
           nil
diff --git a/lib/fog/go_grid/models/compute/password.rb b/lib/fog/go_grid/models/compute/password.rb
index 183e430c7..4de125c8a 100644
--- a/lib/fog/go_grid/models/compute/password.rb
+++ b/lib/fog/go_grid/models/compute/password.rb
@@ -10,7 +10,7 @@ module Fog
 
         attribute :server_id
         attribute :applicationtype
-        attribute :username	
+        attribute :username
         attribute :password_id,	:aliases => 'id'
         attribute :password
         attribute :server
@@ -21,13 +21,13 @@ module Fog
 
         def destroy
           requires :id
-          connection.grid_server_destroy(id)
+          service.grid_server_destroy(id)
           true
         end
 
         def image
           requires :image_id
-          connection.grid_image_get(image_id)
+          service.grid_image_get(image_id)
         end
 
         def ready?
@@ -37,7 +37,7 @@ module Fog
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :password_id
-          data = connection.support_password_list()
+          data = service.support_password_list()
           merge_attributes(data.body)
           true
         end
diff --git a/lib/fog/go_grid/models/compute/passwords.rb b/lib/fog/go_grid/models/compute/passwords.rb
index 719207561..9c58d791b 100644
--- a/lib/fog/go_grid/models/compute/passwords.rb
+++ b/lib/fog/go_grid/models/compute/passwords.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::GoGrid::Password
 
         def all
-          data = connection.support_password_list.body['list']
+          data = service.support_password_list.body['list']
           load(data)
         end
 
@@ -21,8 +21,8 @@ module Fog
         end
 
         def get(id)
-          #if server_id && server = connection.grid_server_get(server_id).body['list']
-          if id && server = connection.support_password_get(id).body['list']
+          #if server_id && server = service.grid_server_get(server_id).body['list']
+          if id && server = service.support_password_get(id).body['list']
             new(server)
           end
         rescue Fog::Compute::GoGrid::NotFound
diff --git a/lib/fog/go_grid/models/compute/server.rb b/lib/fog/go_grid/models/compute/server.rb
index a7feae635..742d359dd 100644
--- a/lib/fog/go_grid/models/compute/server.rb
+++ b/lib/fog/go_grid/models/compute/server.rb
@@ -27,13 +27,13 @@ module Fog
 
         def destroy
           requires :id
-          connection.grid_server_delete(id)
+          service.grid_server_delete(id)
           true
         end
 
         def image
           requires :image_id
-          connection.grid_image_get(:image => image_id)
+          service.grid_image_get(:image => image_id)
         end
 
         def private_ip_address
@@ -65,7 +65,7 @@ module Fog
             'image'       => image_id
           }
           options = options.reject {|key, value| value.nil?}
-          data = connection.grid_server_add(image, public_ip_address, name, memory, options)
+          data = service.grid_server_add(image, public_ip_address, name, memory, options)
           merge_attributes(data.body)
           true
         end
diff --git a/lib/fog/go_grid/models/compute/servers.rb b/lib/fog/go_grid/models/compute/servers.rb
index 28635f027..11230e5d5 100644
--- a/lib/fog/go_grid/models/compute/servers.rb
+++ b/lib/fog/go_grid/models/compute/servers.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::GoGrid::Server
 
         def all
-          data = connection.grid_server_list.body['list']
+          data = service.grid_server_list.body['list']
           load(data)
         end
 
@@ -22,7 +22,7 @@ module Fog
         end
 
         def get(server_id)
-          if server_id && server = connection.grid_server_get(server_id).body['list'].first
+          if server_id && server = service.grid_server_get(server_id).body['list'].first
             new(server)
           end
         rescue Fog::Compute::GoGrid::NotFound
diff --git a/lib/fog/google/models/storage/directories.rb b/lib/fog/google/models/storage/directories.rb
index 1747fbbd7..bba238ac1 100644
--- a/lib/fog/google/models/storage/directories.rb
+++ b/lib/fog/google/models/storage/directories.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Storage::Google::Directory
 
         def all
-         data = connection.get_service.body['Buckets']
+         data = service.get_service.body['Buckets']
          load(data)
         end
 
@@ -21,7 +21,7 @@ module Fog
             :max_keys   => 'max-keys',
             :prefix     => 'prefix'
           })
-          data = connection.get_bucket(key, options).body
+          data = service.get_bucket(key, options).body
           directory = new(:key => data['Name'])
           options = {}
           for k, v in data
diff --git a/lib/fog/google/models/storage/directory.rb b/lib/fog/google/models/storage/directory.rb
index f9435b5dc..a80f2cc0e 100644
--- a/lib/fog/google/models/storage/directory.rb
+++ b/lib/fog/google/models/storage/directory.rb
@@ -21,7 +21,7 @@ module Fog
 
         def destroy
           requires :key
-          connection.delete_bucket(key)
+          service.delete_bucket(key)
           true
         rescue Excon::Errors::NotFound
           false
@@ -31,7 +31,7 @@ module Fog
           @files ||= begin
             Fog::Storage::Google::Files.new(
               :directory    => self,
-              :connection   => connection
+              :service   => service
             )
           end
         end
@@ -47,7 +47,7 @@ module Fog
 
         def public_url
           requires :key
-          if connection.get_bucket_acl(key).body['AccessControlList'].detect {|entry| entry['Scope']['type'] == 'AllUsers' && entry['Permission'] == 'READ'}
+          if service.get_bucket_acl(key).body['AccessControlList'].detect {|entry| entry['Scope']['type'] == 'AllUsers' && entry['Permission'] == 'READ'}
             if key.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
               "https://#{key}.storage.googleapis.com"
             else
@@ -67,7 +67,7 @@ module Fog
           if @location
             options['LocationConstraint'] = @location
           end
-          connection.put_bucket(key, options)
+          service.put_bucket(key, options)
           true
         end
 
diff --git a/lib/fog/google/models/storage/file.rb b/lib/fog/google/models/storage/file.rb
index 258d6db79..3b66e578d 100644
--- a/lib/fog/google/models/storage/file.rb
+++ b/lib/fog/google/models/storage/file.rb
@@ -47,15 +47,15 @@ module Fog
 
         def copy(target_directory_key, target_file_key)
           requires :directory, :key
-          connection.copy_object(directory.key, key, target_directory_key, target_file_key)
-          target_directory = connection.directories.new(:key => target_directory_key)
+          service.copy_object(directory.key, key, target_directory_key, target_file_key)
+          target_directory = service.directories.new(:key => target_directory_key)
           target_directory.files.get(target_file_key)
         end
 
         def destroy
           requires :directory, :key
           begin
-            connection.delete_object(directory.key, key)
+            service.delete_object(directory.key, key)
           rescue Excon::Errors::NotFound
           end
           true
@@ -92,7 +92,7 @@ module Fog
 
         def public_url
           requires :directory, :key
-          if connection.get_object_acl(directory.key, key).body['AccessControlList'].detect {|entry| entry['Scope']['type'] == 'AllUsers' && entry['Permission'] == 'READ'}
+          if service.get_object_acl(directory.key, key).body['AccessControlList'].detect {|entry| entry['Scope']['type'] == 'AllUsers' && entry['Permission'] == 'READ'}
             if directory.key.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
               "https://#{directory.key}.storage.googleapis.com/#{key}"
             else
@@ -117,7 +117,7 @@ module Fog
           options['Expires'] = expires if expires
           options.merge(metadata)
 
-          data = connection.put_object(directory.key, key, body, options)
+          data = service.put_object(directory.key, key, body, options)
           merge_attributes(data.headers.reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)})
           self.content_length = Fog::Storage.get_body_size(body)
           self.content_type ||= Fog::Storage.get_content_type(body)
diff --git a/lib/fog/google/models/storage/files.rb b/lib/fog/google/models/storage/files.rb
index a5cc6d290..91305d06d 100644
--- a/lib/fog/google/models/storage/files.rb
+++ b/lib/fog/google/models/storage/files.rb
@@ -60,7 +60,7 @@ module Fog
 
         def get(key, options = {}, &block)
           requires :directory
-          data = connection.get_object(directory.key, key, options, &block)
+          data = service.get_object(directory.key, key, options, &block)
           file_data = data.headers.merge({
             :body => data.body,
             :key  => key
@@ -72,17 +72,17 @@ module Fog
 
         def get_http_url(key, expires)
           requires :directory
-          connection.get_object_http_url(directory.key, key, expires)
+          service.get_object_http_url(directory.key, key, expires)
         end
 
         def get_https_url(key, expires)
           requires :directory
-          connection.get_object_https_url(directory.key, key, expires)
+          service.get_object_https_url(directory.key, key, expires)
         end
 
         def head(key, options = {})
           requires :directory
-          data = connection.head_object(directory.key, key, options)
+          data = service.head_object(directory.key, key, options)
           file_data = data.headers.merge({
             :key => key
           })
diff --git a/lib/fog/hp.rb b/lib/fog/hp.rb
index 9609c94df..1ea08c2fb 100644
--- a/lib/fog/hp.rb
+++ b/lib/fog/hp.rb
@@ -138,7 +138,7 @@ module Fog
       request_body['auth']['tenantId'] = "#{@hp_tenant_id}" if @hp_tenant_id
 
       ### Make the call to CS to get auth token and service catalog
-      response = connection.request(
+      response = service.request(
         {
           :expects => 200,
           :headers => {
diff --git a/lib/fog/hp/models/compute/address.rb b/lib/fog/hp/models/compute/address.rb
index 378cbe1e2..ec843e6df 100644
--- a/lib/fog/hp/models/compute/address.rb
+++ b/lib/fog/hp/models/compute/address.rb
@@ -21,7 +21,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.release_address(id)
+          service.release_address(id)
           true
         end
 
@@ -35,7 +35,7 @@ module Fog
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
-          data = connection.allocate_address.body['floating_ip']
+          data = service.allocate_address.body['floating_ip']
           new_attributes = data.reject {|key,value| !['id', 'instance_id', 'ip', 'fixed_ip'].include?(key)}
           merge_attributes(new_attributes)
           if @server
@@ -52,14 +52,14 @@ module Fog
           else
             @server = nil
             self.instance_id = new_server.id
-            connection.associate_address(instance_id, ip)
+            service.associate_address(instance_id, ip)
           end
         end
 
         def disassociate
           @server = nil
           if persisted?
-            connection.disassociate_address(instance_id, ip)
+            service.disassociate_address(instance_id, ip)
           end
           self.instance_id = nil
         end
diff --git a/lib/fog/hp/models/compute/addresses.rb b/lib/fog/hp/models/compute/addresses.rb
index 9408a8765..1d75e62c9 100644
--- a/lib/fog/hp/models/compute/addresses.rb
+++ b/lib/fog/hp/models/compute/addresses.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::HP::Address
 
         def all
-          data = connection.list_addresses.body['floating_ips']
+          data = service.list_addresses.body['floating_ips']
           load(data)
         end
 
         def get(address_id)
-          if address = connection.get_address(address_id).body['floating_ip']
+          if address = service.get_address(address_id).body['floating_ip']
             new(address)
           end
         rescue Fog::Compute::HP::NotFound
diff --git a/lib/fog/hp/models/compute/flavors.rb b/lib/fog/hp/models/compute/flavors.rb
index 038ded3ee..e20b1526b 100644
--- a/lib/fog/hp/models/compute/flavors.rb
+++ b/lib/fog/hp/models/compute/flavors.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::HP::Flavor
 
         def all
-          data = connection.list_flavors_detail.body['flavors']
+          data = service.list_flavors_detail.body['flavors']
           load(data)
         end
 
         def get(flavor_id)
-          data = connection.get_flavor_details(flavor_id).body['flavor']
+          data = service.get_flavor_details(flavor_id).body['flavor']
           new(data)
         rescue Fog::Compute::HP::NotFound
           nil
diff --git a/lib/fog/hp/models/compute/image.rb b/lib/fog/hp/models/compute/image.rb
index a66865d14..31923f5f1 100644
--- a/lib/fog/hp/models/compute/image.rb
+++ b/lib/fog/hp/models/compute/image.rb
@@ -16,13 +16,13 @@ module Fog
         attribute :minDisk,     :aliases => 'min_disk'
         attribute :minRam,      :aliases => 'min_ram'
         attribute :server,   :aliases => 'server'
-        attribute :metadata       
+        attribute :metadata
         attribute :links
 
         def destroy
           requires :id
 
-          connection.delete_image(id)
+          service.delete_image(id)
           true
         end
 
diff --git a/lib/fog/hp/models/compute/images.rb b/lib/fog/hp/models/compute/images.rb
index 941ed958a..66e21ab6f 100644
--- a/lib/fog/hp/models/compute/images.rb
+++ b/lib/fog/hp/models/compute/images.rb
@@ -12,7 +12,7 @@ module Fog
         attribute :server
 
         def all
-          data = connection.list_images_detail.body['images']
+          data = service.list_images_detail.body['images']
           load(data)
           if server
             self.replace(self.select {|image| image.server.id == server.id})
@@ -21,7 +21,7 @@ module Fog
         end
 
         def get(image_id)
-          data = connection.get_image_details(image_id).body['image']
+          data = service.get_image_details(image_id).body['image']
           new(data)
         rescue Fog::Compute::HP::NotFound
           nil
diff --git a/lib/fog/hp/models/compute/key_pair.rb b/lib/fog/hp/models/compute/key_pair.rb
index 43adc0ae3..eb7e994d5 100644
--- a/lib/fog/hp/models/compute/key_pair.rb
+++ b/lib/fog/hp/models/compute/key_pair.rb
@@ -18,7 +18,7 @@ module Fog
         def destroy
           requires :name
 
-          connection.delete_key_pair(name)
+          service.delete_key_pair(name)
           true
         end
 
@@ -26,9 +26,9 @@ module Fog
           requires :name
 
           data = if public_key
-            connection.create_key_pair(name, public_key).body['keypair']
+            service.create_key_pair(name, public_key).body['keypair']
           else
-            connection.create_key_pair(name).body['keypair']
+            service.create_key_pair(name).body['keypair']
           end
           new_attributes = data.reject {|key,value| !['fingerprint', 'public_key', 'name', 'private_key', 'user_id'].include?(key)}
           merge_attributes(new_attributes)
diff --git a/lib/fog/hp/models/compute/key_pairs.rb b/lib/fog/hp/models/compute/key_pairs.rb
index 134a4c1a1..ba4c2af4f 100644
--- a/lib/fog/hp/models/compute/key_pairs.rb
+++ b/lib/fog/hp/models/compute/key_pairs.rb
@@ -11,7 +11,7 @@ module Fog
 
         def all
           items = []
-          connection.list_key_pairs.body['keypairs'].each do |kp|
+          service.list_key_pairs.body['keypairs'].each do |kp|
             items = items + kp.map { |key, value| value }
           end
           load(items)
@@ -28,4 +28,4 @@ module Fog
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/hp/models/compute/security_group.rb b/lib/fog/hp/models/compute/security_group.rb
index a855569fd..d6e6d9ad8 100644
--- a/lib/fog/hp/models/compute/security_group.rb
+++ b/lib/fog/hp/models/compute/security_group.rb
@@ -16,25 +16,25 @@ module Fog
         def destroy
           requires :id
 
-          connection.delete_security_group(id)
+          service.delete_security_group(id)
           true
         end
 
         def save
           requires :name, :description
 
-          data = connection.create_security_group(name, description)
+          data = service.create_security_group(name, description)
           merge_attributes(data.body['security_group'])
           true
         end
 
         def create_rule(range, ip_protocol = "tcp", cidr = "0.0.0.0/0", group_id=nil)
           requires :id
-          connection.create_security_group_rule(id, ip_protocol, range.min, range.max, cidr, group_id)
+          service.create_security_group_rule(id, ip_protocol, range.min, range.max, cidr, group_id)
         end
 
         def delete_rule(rule_id)
-          connection.delete_security_group_rule(rule_id)
+          service.delete_security_group_rule(rule_id)
           true
         end
 
diff --git a/lib/fog/hp/models/compute/security_groups.rb b/lib/fog/hp/models/compute/security_groups.rb
index 1951c8640..f8f40a0c3 100644
--- a/lib/fog/hp/models/compute/security_groups.rb
+++ b/lib/fog/hp/models/compute/security_groups.rb
@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::HP::SecurityGroup
 
         def all
-          items = connection.list_security_groups.body['security_groups']
+          items = service.list_security_groups.body['security_groups']
           load(items)
         end
 
         def get(security_group_id)
           if security_group_id
-            sec_group = connection.get_security_group(security_group_id).body['security_group']
+            sec_group = service.get_security_group(security_group_id).body['security_group']
             new(sec_group)
           end
         rescue Fog::Compute::HP::NotFound
@@ -26,4 +26,4 @@ module Fog
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/hp/models/compute/server.rb b/lib/fog/hp/models/compute/server.rb
index ab198e6ca..0771d1a96 100644
--- a/lib/fog/hp/models/compute/server.rb
+++ b/lib/fog/hp/models/compute/server.rb
@@ -43,19 +43,19 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_server(id)
+          service.delete_server(id)
           true
         end
 
         def images
           requires :id
-          connection.images(:server => self)
+          service.images(:server => self)
         end
 
         def key_pair
           requires :key_name
 
-          connection.key_pairs.get(key_name)
+          service.key_pairs.get(key_name)
         end
 
         def key_pair=(new_keypair)
@@ -111,53 +111,53 @@ module Fog
           @security_groups = new_security_groups
         end
 
-        def security_groups   
+        def security_groups
           @security_groups
         end
-        
+
         def ready?
           self.state == 'ACTIVE'
         end
 
         def change_password(admin_password)
           requires :id
-          connection.change_password_server(id, admin_password)
+          service.change_password_server(id, admin_password)
           true
         end
 
         def reboot(type = 'SOFT')
           requires :id
-          connection.reboot_server(id, type)
+          service.reboot_server(id, type)
           true
         end
 
         def rebuild(image_id, name, admin_pass=nil, metadata=nil, personality=nil)
           requires :id
-          connection.rebuild_server(id, image_id, name, admin_pass, metadata, personality)
+          service.rebuild_server(id, image_id, name, admin_pass, metadata, personality)
           true
         end
 
         def resize(flavor_id)
           requires :id
-          connection.resize_server(id, flavor_id)
+          service.resize_server(id, flavor_id)
           true
         end
 
         def revert_resize
           requires :id
-          connection.revert_resized_server(id)
+          service.revert_resized_server(id)
           true
         end
 
         def confirm_resize
           requires :id
-          connection.confirm_resized_server(id)
+          service.confirm_resized_server(id)
           true
         end
 
         def create_image(name, metadata={})
           requires :id
-          connection.create_image(id, name, metadata)
+          service.create_image(id, name, metadata)
         end
 
         def save
@@ -174,7 +174,7 @@ module Fog
             'security_groups' => @security_groups
           }
           options = options.reject {|key, value| value.nil?}
-          data = connection.create_server(name, flavor_id, image_id, options)
+          data = service.create_server(name, flavor_id, image_id, options)
           merge_attributes(data.body['server'])
           true
         end
diff --git a/lib/fog/hp/models/compute/servers.rb b/lib/fog/hp/models/compute/servers.rb
index 38b1462f6..a0de0f1f6 100644
--- a/lib/fog/hp/models/compute/servers.rb
+++ b/lib/fog/hp/models/compute/servers.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::HP::Server
 
         def all
-          data = connection.list_servers_detail.body['servers']
+          data = service.list_servers_detail.body['servers']
           load(data)
         end
 
@@ -22,7 +22,7 @@ module Fog
         end
 
         def get(server_id)
-          if server = connection.get_server_details(server_id).body['server']
+          if server = service.get_server_details(server_id).body['server']
             new(server)
           end
         rescue Fog::Compute::HP::NotFound
diff --git a/lib/fog/hp/models/storage/directories.rb b/lib/fog/hp/models/storage/directories.rb
index ad5b72fe0..6fa3bcad7 100644
--- a/lib/fog/hp/models/storage/directories.rb
+++ b/lib/fog/hp/models/storage/directories.rb
@@ -10,14 +10,14 @@ module Fog
         model Fog::Storage::HP::Directory
 
         def all
-          data = connection.get_containers.body
+          data = service.get_containers.body
           load(data)
         end
 
         def get(key, options = {})
           read_header = nil
           write_header = nil
-          data = connection.get_container(key, options)
+          data = service.get_container(key, options)
           directory = new(:key => key)
           for key, value in data.headers
             if ['X-Container-Bytes-Used', 'X-Container-Object-Count'].include?(key)
@@ -31,7 +31,7 @@ module Fog
           end
           # set the acl on the directory based on the headers
           if !(read_header.nil? && write_header.nil?)
-            directory.acl = connection.header_to_acl(read_header, write_header)
+            directory.acl = service.header_to_acl(read_header, write_header)
           end
           directory.files.merge_attributes(options)
           directory.files.instance_variable_set(:@loaded, true)
diff --git a/lib/fog/hp/models/storage/directory.rb b/lib/fog/hp/models/storage/directory.rb
index d08846221..313da36dd 100644
--- a/lib/fog/hp/models/storage/directory.rb
+++ b/lib/fog/hp/models/storage/directory.rb
@@ -25,11 +25,11 @@ module Fog
 
         def destroy
           requires :key
-          connection.delete_container(key)
+          service.delete_container(key)
           # If CDN service is available, try to delete the container if it was CDN-enabled
           if cdn_enabled?
             begin
-              connection.cdn.delete_container(key)
+              service.cdn.delete_container(key)
             rescue Fog::CDN::HP::NotFound
               # ignore if cdn container not found
             end
@@ -43,7 +43,7 @@ module Fog
           @files ||= begin
             Fog::Storage::HP::Files.new(
               :directory    => self,
-              :connection   => connection
+              :service   => service
             )
           end
         end
@@ -68,9 +68,9 @@ module Fog
         def public_url
           requires :key
           @public_url ||= begin
-            begin response = connection.head_container(key)
+            begin response = service.head_container(key)
               # escape the key to cover for special char. in container names
-              url = "#{connection.url}/#{Fog::HP.escape(key)}"
+              url = "#{service.url}/#{Fog::HP.escape(key)}"
             rescue Fog::Storage::HP::NotFound => err
               nil
             end
@@ -79,7 +79,7 @@ module Fog
 
         def cdn_enable=(new_cdn_enable)
           @cdn_enable ||= false
-          if (!connection.cdn.nil? && connection.cdn.enabled?)
+          if (!service.cdn.nil? && service.cdn.enabled?)
             @cdn_enable = new_cdn_enable
           else
             # since cdn service is not activated, container cannot be cdn-enabled
@@ -88,8 +88,8 @@ module Fog
         end
 
         def cdn_enabled?
-          if (!connection.cdn.nil? && connection.cdn.enabled?)
-            begin response = connection.cdn.head_container(key)
+          if (!service.cdn.nil? && service.cdn.enabled?)
+            begin response = service.cdn.head_container(key)
               cdn_header = response.headers.fetch('X-Cdn-Enabled', nil)
               if (!cdn_header.nil? && cdn_header == 'True')
                 @cdn_enable = true
@@ -108,9 +108,9 @@ module Fog
           requires :key
           @cdn_public_url ||= begin
             # return the CDN public url from the appropriate uri from the header
-            begin response = connection.cdn.head_container(key)
+            begin response = service.cdn.head_container(key)
               if response.headers['X-Cdn-Enabled'] == 'True'
-                if connection.hp_cdn_ssl == true
+                if service.hp_cdn_ssl == true
                   response.headers.fetch('X-Cdn-Ssl-Uri', nil)
                 else
                   response.headers.fetch('X-Cdn-Uri', nil)
@@ -126,25 +126,25 @@ module Fog
           requires :key
           options = {}
           if @acl
-            options.merge!(connection.acl_to_header(@acl))
+            options.merge!(service.acl_to_header(@acl))
           end
-          connection.put_container(key, options)
+          service.put_container(key, options)
           # Added an extra check to see if CDN is enabled for the container
-          if (!connection.cdn.nil? && connection.cdn.enabled?)
+          if (!service.cdn.nil? && service.cdn.enabled?)
             # If CDN available, set the container to be CDN-enabled or not based on if it is marked as cdn_enable.
             if @cdn_enable
               # check to make sure that the container exists. If yes, cdn enable it.
-              begin response = connection.cdn.head_container(key)
+              begin response = service.cdn.head_container(key)
                 ### Deleting a container from CDN is much more expensive than flipping the bit to disable it
-                connection.cdn.post_container(key, {'X-CDN-Enabled' => 'True'})
+                service.cdn.post_container(key, {'X-CDN-Enabled' => 'True'})
               rescue Fog::CDN::HP::NotFound => err
-                connection.cdn.put_container(key)
+                service.cdn.put_container(key)
               end
             else
               # check to make sure that the container exists. If yes, cdn disable it.
-              begin response = connection.cdn.head_container(key)
+              begin response = service.cdn.head_container(key)
                 ### Deleting a container from CDN is much more expensive than flipping the bit to disable it
-                connection.cdn.post_container(key, {'X-CDN-Enabled' => 'False'})
+                service.cdn.post_container(key, {'X-CDN-Enabled' => 'False'})
               rescue Fog::CDN::HP::NotFound => err
                 # just continue, as container is not cdn-enabled.
               end
diff --git a/lib/fog/hp/models/storage/file.rb b/lib/fog/hp/models/storage/file.rb
index f47537e3f..2988ea7f0 100644
--- a/lib/fog/hp/models/storage/file.rb
+++ b/lib/fog/hp/models/storage/file.rb
@@ -31,14 +31,14 @@ module Fog
 
         def copy(target_directory_key, target_file_key)
           requires :directory, :key
-          target_directory = connection.directories.new(:key => target_directory_key)
-          connection.put_object(target_directory_key, target_file_key, nil, {'X-Copy-From' => "/#{directory.key}/#{key}" })
+          target_directory = service.directories.new(:key => target_directory_key)
+          service.put_object(target_directory_key, target_file_key, nil, {'X-Copy-From' => "/#{directory.key}/#{key}" })
           target_directory.files.get(target_file_key)
         end
 
         def destroy
           requires :directory, :key
-          connection.delete_object(directory.key, key)
+          service.delete_object(directory.key, key)
           true
         end
 
@@ -68,7 +68,7 @@ module Fog
         def save(options = {})
           requires :body, :directory, :key
           options['Content-Type'] = content_type if content_type
-          data = connection.put_object(directory.key, key, body, options)
+          data = service.put_object(directory.key, key, body, options)
           merge_attributes(data.headers)
           self.content_length = Fog::Storage.get_body_size(body)
           true
diff --git a/lib/fog/hp/models/storage/files.rb b/lib/fog/hp/models/storage/files.rb
index 99cd28329..23f490512 100644
--- a/lib/fog/hp/models/storage/files.rb
+++ b/lib/fog/hp/models/storage/files.rb
@@ -54,7 +54,7 @@ module Fog
 
         def get(key, &block)
           requires :directory
-          data = connection.get_object(directory.key, key, &block)
+          data = service.get_object(directory.key, key, &block)
           file_data = data.headers.merge({
             :body => data.body,
             :key  => key
@@ -82,7 +82,7 @@ module Fog
 
         def head(key, options = {})
           requires :directory
-          data = connection.head_object(directory.key, key)
+          data = service.head_object(directory.key, key)
           file_data = data.headers.merge({
             :key => key
           })
diff --git a/lib/fog/ibm/models/compute/address.rb b/lib/fog/ibm/models/compute/address.rb
index 1b6ef9580..ce40ddc81 100644
--- a/lib/fog/ibm/models/compute/address.rb
+++ b/lib/fog/ibm/models/compute/address.rb
@@ -37,7 +37,7 @@ module Fog
 
         def save
           requires :offering_id, :location
-          data = connection.create_address(location, offering_id,
+          data = service.create_address(location, offering_id,
                                            :vlan_id => vlan_id,
                                            :ip => ip)
           merge_attributes(data.body)
@@ -54,7 +54,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_address(id).body['success']
+          service.delete_address(id).body['success']
         end
       end
     end
diff --git a/lib/fog/ibm/models/compute/addresses.rb b/lib/fog/ibm/models/compute/addresses.rb
index aee809932..68a849a0d 100644
--- a/lib/fog/ibm/models/compute/addresses.rb
+++ b/lib/fog/ibm/models/compute/addresses.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::IBM::Address
 
         def all
-          load(connection.list_addresses.body['addresses'])
+          load(service.list_addresses.body['addresses'])
         end
 
         def get(address_id)
           begin
-            address = connection.list_addresses.body
+            address = service.list_addresses.body
             new(address['addresses'].find{|address| address['id'] == address_id.to_s })
           rescue Fog::Compute::IBM::NotFound
             nil
diff --git a/lib/fog/ibm/models/compute/image.rb b/lib/fog/ibm/models/compute/image.rb
index e70031c27..f8eb83362 100644
--- a/lib/fog/ibm/models/compute/image.rb
+++ b/lib/fog/ibm/models/compute/image.rb
@@ -42,7 +42,7 @@ module Fog
 
         def save
           requires :id, :volume_id
-          data = connection.create_image(id, volume_id)
+          data = service.create_image(id, volume_id)
           merge_attributes(data.body)
           data.body['success']
         end
@@ -56,12 +56,12 @@ module Fog
         end
 
         def clone(name, description)
-          connection.clone_image(id, name, description).body['ImageID']
+          service.clone_image(id, name, description).body['ImageID']
         end
 
         def destroy
           requires :id
-          connection.delete_image(id).body['success']
+          service.delete_image(id).body['success']
         end
 
       end
diff --git a/lib/fog/ibm/models/compute/images.rb b/lib/fog/ibm/models/compute/images.rb
index c077f7efd..5c2304355 100644
--- a/lib/fog/ibm/models/compute/images.rb
+++ b/lib/fog/ibm/models/compute/images.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::IBM::Image
 
         def all
-          load(connection.list_images.body['images'])
+          load(service.list_images.body['images'])
         end
 
         def get(image_id)
           begin
-            new(connection.get_image(image_id).body)
+            new(service.get_image(image_id).body)
           rescue Fog::Compute::IBM::NotFound
             nil
           end
diff --git a/lib/fog/ibm/models/compute/key.rb b/lib/fog/ibm/models/compute/key.rb
index a22b363c8..819f16602 100644
--- a/lib/fog/ibm/models/compute/key.rb
+++ b/lib/fog/ibm/models/compute/key.rb
@@ -12,13 +12,13 @@ module Fog
 
         def save
           requires :name
-          data = connection.create_key(name, public_key)
+          data = service.create_key(name, public_key)
           merge_attributes(data.body)
           data.body['keyName'] == name
         end
 
         def destroy
-          data = connection.delete_key(identity)
+          data = service.delete_key(identity)
           data.body['success']
         end
 
diff --git a/lib/fog/ibm/models/compute/keys.rb b/lib/fog/ibm/models/compute/keys.rb
index b040c4807..253aa0434 100644
--- a/lib/fog/ibm/models/compute/keys.rb
+++ b/lib/fog/ibm/models/compute/keys.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::IBM::Key
 
         def all
-          load(connection.list_keys.body['keys'])
+          load(service.list_keys.body['keys'])
         end
 
         def get(key_id)
           begin
-            new(connection.get_key(key_id).body)
+            new(service.get_key(key_id).body)
           rescue Fog::Compute::IBM::NotFound
             nil
           end
@@ -26,7 +26,7 @@ module Fog
         end
 
         def default=(key_name)
-          connection.modify_key(key_name, 'default' => true)
+          service.modify_key(key_name, 'default' => true)
         end
 
       end
diff --git a/lib/fog/ibm/models/compute/locations.rb b/lib/fog/ibm/models/compute/locations.rb
index d19716087..eba4cd0e8 100644
--- a/lib/fog/ibm/models/compute/locations.rb
+++ b/lib/fog/ibm/models/compute/locations.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::IBM::Location
 
         def all
-          load(connection.list_locations.body['locations'])
+          load(service.list_locations.body['locations'])
         end
 
         def get(location_id)
           begin
-            new(connection.get_location(location_id).body)
+            new(service.get_location(location_id).body)
           rescue Fog::Compute::IBM::NotFound
             nil
           end
diff --git a/lib/fog/ibm/models/compute/server.rb b/lib/fog/ibm/models/compute/server.rb
index eb5c81914..d335b36e8 100644
--- a/lib/fog/ibm/models/compute/server.rb
+++ b/lib/fog/ibm/models/compute/server.rb
@@ -59,7 +59,7 @@ module Fog
 
         def save
           requires :name, :image_id, :instance_type, :location_id
-          data = connection.create_instance(name, image_id, instance_type, location_id,
+          data = service.create_instance(name, image_id, instance_type, location_id,
                                             :key_name => key_name,
                                             :vlan_id => vlan_id,
                                             :secondary_ip => secondary_ip)
@@ -82,17 +82,17 @@ module Fog
 
         def reboot
           requires :id
-          connection.modify_instance(id, 'state' => 'restart').body['success']
+          service.modify_instance(id, 'state' => 'restart').body['success']
         end
 
         def destroy
           requires :id
-          connection.delete_instance(id).body['success']
+          service.delete_instance(id).body['success']
         end
 
         def rename(name)
           requires :id
-          if connection.modify_instance(id, 'name' => name).body["success"]
+          if service.modify_instance(id, 'name' => name).body["success"]
             attributes[:name] = name
           else
             return false
@@ -102,7 +102,7 @@ module Fog
 
         def allocate_ip(wait_for_ready=true)
           requires :location_id
-          new_ip = connection.addresses.new(:location => location_id)
+          new_ip = service.addresses.new(:location => location_id)
           new_ip.save
           new_ip.wait_for(Fog::IBM.timeout) { ready? } if wait_for_ready
           secondary_ip << new_ip
@@ -112,7 +112,7 @@ module Fog
         def addresses
           addys = secondary_ip.map {|ip| Fog::Compute[:ibm].addresses.new(ip) }
           # Set an ID, in case someone tries to save
-          addys << connection.addresses.new(attributes[:primary_ip].merge(
+          addys << service.addresses.new(attributes[:primary_ip].merge(
             :id => "0",
             :location => location_id,
             :state => 3
@@ -122,13 +122,13 @@ module Fog
 
         def attach(volume_id)
           requires :id
-          data = connection.modify_instance(id, {'type' => 'attach', 'storageID' => volume_id})
+          data = service.modify_instance(id, {'type' => 'attach', 'storageID' => volume_id})
           data.body
         end
 
         def detach(volume_id)
           requires :id
-          data = connection.modify_instance(id, {'type' => 'detach', 'storageID' => volume_id})
+          data = service.modify_instance(id, {'type' => 'detach', 'storageID' => volume_id})
           data.body
         end
 
@@ -143,7 +143,7 @@ module Fog
         # Sets expiration time - Pass an instance of Time.
         def expire_at(time)
           expiry_time = (time.tv_sec * 1000).to_i
-          data = connection.modify_instance(id, 'expirationTime' => expiry_time)
+          data = service.modify_instance(id, 'expirationTime' => expiry_time)
           if data.body['expirationTime'] == expiry_time
             attributes[:expires_at] = expiry_time
             true
@@ -159,12 +159,12 @@ module Fog
 
         def image
           requires :image_id
-          connection.images.get(image_id)
+          service.images.get(image_id)
         end
 
         def location
           requires :location_id
-          connection.locations.get(location_id)
+          service.locations.get(location_id)
         end
 
         def public_hostname
@@ -182,7 +182,7 @@ module Fog
            :name => name + " as of " + Time.now.strftime("%Y-%m-%d %H:%M"),
            :description => ""
          }.merge(opts)
-         connection.create_image(id, options[:name], options[:description]).body
+         service.create_image(id, options[:name], options[:description]).body
         end
         alias :create_image :to_image
       end
diff --git a/lib/fog/ibm/models/compute/servers.rb b/lib/fog/ibm/models/compute/servers.rb
index 0a6055fbf..af38fb3e4 100644
--- a/lib/fog/ibm/models/compute/servers.rb
+++ b/lib/fog/ibm/models/compute/servers.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::IBM::Server
 
         def all
-          load(connection.list_instances.body['instances'])
+          load(service.list_instances.body['instances'])
         end
 
         def get(server_id)
           begin
-            new(connection.get_instance(server_id).body)
+            new(service.get_instance(server_id).body)
           rescue Fog::Compute::IBM::NotFound
             nil
           end
diff --git a/lib/fog/ibm/models/compute/vlans.rb b/lib/fog/ibm/models/compute/vlans.rb
index 3760a762a..58b75e116 100644
--- a/lib/fog/ibm/models/compute/vlans.rb
+++ b/lib/fog/ibm/models/compute/vlans.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::IBM::Vlan
 
         def all
-          load(connection.list_vlans.body['vlan'])
+          load(service.list_vlans.body['vlan'])
         end
 
         def get(vlan_id)
           begin
-            vlan = connection.list_vlans.body
+            vlan = service.list_vlans.body
             new(vlan['vlan'].find{|vlan| vlan['id'] == vlan_id.to_s })
           rescue Fog::Compute::IBM::NotFound
             nil
diff --git a/lib/fog/ibm/models/storage/offerings.rb b/lib/fog/ibm/models/storage/offerings.rb
index 3b8960908..009cc5ad3 100644
--- a/lib/fog/ibm/models/storage/offerings.rb
+++ b/lib/fog/ibm/models/storage/offerings.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Storage::IBM::Offering
 
         def all
-          load(connection.list_offerings.body['volumes'])
+          load(service.list_offerings.body['volumes'])
         end
 
       end
diff --git a/lib/fog/ibm/models/storage/volume.rb b/lib/fog/ibm/models/storage/volume.rb
index 4befcd48d..49f94c1b7 100644
--- a/lib/fog/ibm/models/storage/volume.rb
+++ b/lib/fog/ibm/models/storage/volume.rb
@@ -46,12 +46,12 @@ module Fog
 
         def attach(instance_id)
           requires :id
-          connection.attach_volume(instance_id, id).body['success']
+          service.attach_volume(instance_id, id).body['success']
         end
 
         def detach(instance_id)
           requires :id
-          connection.detach_volume(instance_id, id).body['success']
+          service.detach_volume(instance_id, id).body['success']
         end
 
         def created_at
@@ -60,7 +60,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_volume(id)
+          service.delete_volume(id)
           true
         end
 
@@ -83,7 +83,7 @@ module Fog
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :name, :offering_id, :format, :location_id, :size
-          data = connection.create_volume(name, offering_id, format, location_id, size)
+          data = service.create_volume(name, offering_id, format, location_id, size)
           merge_attributes(data.body)
           true
         end
diff --git a/lib/fog/ibm/models/storage/volumes.rb b/lib/fog/ibm/models/storage/volumes.rb
index 4cc88420e..3bba5211c 100644
--- a/lib/fog/ibm/models/storage/volumes.rb
+++ b/lib/fog/ibm/models/storage/volumes.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Storage::IBM::Volume
 
         def all
-          load(connection.list_volumes.body['volumes'])
+          load(service.list_volumes.body['volumes'])
         end
 
         def get(volume_id)
           begin
-            new(connection.get_volume(volume_id).body)
+            new(service.get_volume(volume_id).body)
           rescue Fog::Storage::IBM::NotFound
             nil
           end
diff --git a/lib/fog/joyent/models/compute/flavors.rb b/lib/fog/joyent/models/compute/flavors.rb
index 3e6946672..782a3513b 100644
--- a/lib/fog/joyent/models/compute/flavors.rb
+++ b/lib/fog/joyent/models/compute/flavors.rb
@@ -10,11 +10,11 @@ module Fog
         model Fog::Compute::Joyent::Flavor
 
         def all
-          load(connection.list_packages().body)
+          load(service.list_packages().body)
         end
 
         def get(id)
-          data = connection.get_package(id).body
+          data = service.get_package(id).body
           new(data)
         end
 
diff --git a/lib/fog/joyent/models/compute/images.rb b/lib/fog/joyent/models/compute/images.rb
index 8aead5ac6..3cd5137ee 100644
--- a/lib/fog/joyent/models/compute/images.rb
+++ b/lib/fog/joyent/models/compute/images.rb
@@ -10,11 +10,11 @@ module Fog
         model Fog::Compute::Joyent::Image
 
         def all
-          load(connection.list_datasets().body)
+          load(service.list_datasets().body)
         end
 
         def get(id)
-          data = connection.get_dataset(id).body
+          data = service.get_dataset(id).body
           new(data)
         end
 
diff --git a/lib/fog/joyent/models/compute/key.rb b/lib/fog/joyent/models/compute/key.rb
index 0cdf7ce6d..eac59ab5c 100644
--- a/lib/fog/joyent/models/compute/key.rb
+++ b/lib/fog/joyent/models/compute/key.rb
@@ -11,7 +11,7 @@ module Fog
 
         def destroy
           requires :name
-          self.connection.delete_key(name)
+          service.delete_key(name)
         end
       end
     end
diff --git a/lib/fog/joyent/models/compute/keys.rb b/lib/fog/joyent/models/compute/keys.rb
index 7ab1d9dfb..c9a0ed10d 100644
--- a/lib/fog/joyent/models/compute/keys.rb
+++ b/lib/fog/joyent/models/compute/keys.rb
@@ -8,12 +8,12 @@ module Fog
         model Fog::Compute::Joyent::Key
 
         def all
-          data = connection.list_keys.body
+          data = service.list_keys.body
           load(data)
         end
 
         def get(keyname)
-          data = connection.get_key(keyname).body
+          data = service.get_key(keyname).body
           if data
             new(data)
           else
@@ -25,7 +25,7 @@ module Fog
           raise ArgumentError, "option [name] required" unless params.key?(:name)
           raise ArgumentError, "option [key] required" unless params.key?(:key)
 
-          self.connection.create_key(params)
+          service.create_key(params)
         end
 
       end
diff --git a/lib/fog/joyent/models/compute/server.rb b/lib/fog/joyent/models/compute/server.rb
index af6a48b6a..69bcb1012 100644
--- a/lib/fog/joyent/models/compute/server.rb
+++ b/lib/fog/joyent/models/compute/server.rb
@@ -33,44 +33,44 @@ module Fog
 
         def destroy
           requires :id
-          self.connection.delete_machine(id)
+          service.delete_machine(id)
           true
         end
 
         def start
           requires :id
-          self.connection.start_machine(id)
+          service.start_machine(id)
           self.wait_for { ready? }
           true
         end
 
         def stop
           requires :id
-          self.connection.stop_machine(id)
+          service.stop_machine(id)
           self.wait_for { stopped? }
           true
         end
 
         def resize(flavor)
           requires :id
-          self.connection.resize_machine(id, flavor)
+          service.resize_machine(id, flavor)
           true
         end
 
         def reboot
           requires :id
-          self.connection.reboot_machine(id)
+          service.reboot_machine(id)
           true
         end
 
         def snapshots
           requires :id
-          self.connection.snapshots.all(id)
+          service.snapshots.all(id)
         end
 
         def update_metadata(data = {})
           requires :id
-          self.connection.update_machine_metadata(self.id, data)
+          service.update_machine_metadata(self.id, data)
           self.reload
           true
         end
@@ -79,38 +79,38 @@ module Fog
           raise ArgumentError, "Must provide a key name to delete" if keyname.nil? || keyname.empty?
           requires :id
 
-          self.connection.delete_machine_metadata(self.id, keyname)
+          service.delete_machine_metadata(self.id, keyname)
           true
         end
 
         def delete_all_metadata
           requires :id
-          self.connection.delete_all_machine_metadata(self.id)
+          service.delete_all_machine_metadata(self.id)
           true
         end
 
         def tags
           requires :id
-          self.connection.list_machine_tags(id).body
+          service.list_machine_tags(id).body
         end
 
         def add_tags(tags_hash = {})
           requires :id
-          self.connection.add_machine_tags(self.id, tags_hash).body
+          service.add_machine_tags(self.id, tags_hash).body
         end
 
         def delete_tag(tagname)
           requires :id
 
           raise ArgumentError, "Must provide a tag name to delete" if tagname.nil? || tagname.empty?
-          self.connection.delete_machine_tag(self.id, tagname)
+          service.delete_machine_tag(self.id, tagname)
           true
         end
 
         def delete_all_tags
           requires :id
 
-          self.connection.delete_all_machine_tags(self.id)
+          service.delete_all_machine_tags(self.id)
           true
         end
 
diff --git a/lib/fog/joyent/models/compute/servers.rb b/lib/fog/joyent/models/compute/servers.rb
index 46a2c4568..5bed4f8f9 100644
--- a/lib/fog/joyent/models/compute/servers.rb
+++ b/lib/fog/joyent/models/compute/servers.rb
@@ -9,11 +9,11 @@ module Fog
         model Fog::Compute::Joyent::Server
 
         def all
-          load(self.connection.list_machines().body)
+          load(service.list_machines().body)
         end
 
         def create(params = {})
-          data = self.connection.create_machine(params).body
+          data = service.create_machine(params).body
           server = new(data)
           server
         end
@@ -25,7 +25,7 @@ module Fog
         end
 
         def get(machine_id)
-          data = self.connection.get_machine(machine_id).body
+          data = service.get_machine(machine_id).body
           new(data)
         end
 
diff --git a/lib/fog/joyent/models/compute/snapshot.rb b/lib/fog/joyent/models/compute/snapshot.rb
index 068a0f3b2..be2717d96 100644
--- a/lib/fog/joyent/models/compute/snapshot.rb
+++ b/lib/fog/joyent/models/compute/snapshot.rb
@@ -14,14 +14,14 @@ module Fog
           requires :name
           requires :machine_id
 
-          self.connection.snapshots.get(self.machine_id, self.name)
+          service.snapshots.get(self.machine_id, self.name)
         end
 
         def start
           requires :name
           requires :machine_id
 
-          self.connection.start_machine_from_snapshot(self.machine_id, self.name)
+          service.start_machine_from_snapshot(self.machine_id, self.name)
           true
         end
 
@@ -29,14 +29,14 @@ module Fog
           requires :name
           requires :machine_id
 
-          self.connection.delete_machine_snapshot(self.machine_id, self.name)
+          service.delete_machine_snapshot(self.machine_id, self.name)
           true
         end
 
         def machine
           requires :machine_id
 
-          self.connection.servers.get(self.machine_id)
+          service.servers.get(self.machine_id)
         end
 
       end
diff --git a/lib/fog/joyent/models/compute/snapshots.rb b/lib/fog/joyent/models/compute/snapshots.rb
index d371c559a..946ce0b57 100644
--- a/lib/fog/joyent/models/compute/snapshots.rb
+++ b/lib/fog/joyent/models/compute/snapshots.rb
@@ -8,13 +8,13 @@ module Fog
         model Fog::Compute::Joyent::Snapshot
 
         def create(machine_id, snapshot_name)
-          data = self.connection.create_machine_snapshot(machine_id, snapshot_name).body
+          data = self.service.create_machine_snapshot(machine_id, snapshot_name).body
           data['machine_id'] = machine_id
           new(data)
         end
 
         def all(machine_id)
-          data = self.connection.list_machine_snapshots(machine_id).body.map do |m|
+          data = service.list_machine_snapshots(machine_id).body.map do |m|
             m["machine_id"] = machine_id
             m
           end
@@ -22,7 +22,7 @@ module Fog
         end
 
         def get(machine_id, snapshot_name)
-          data = self.connection.get_machine_snapshot(machine_id, snapshot_name).body
+          data = service.get_machine_snapshot(machine_id, snapshot_name).body
           if data
             data["machine_id"] = machine_id
             new(data)
diff --git a/lib/fog/libvirt/models/compute/interface.rb b/lib/fog/libvirt/models/compute/interface.rb
index a8a7beb73..cc01fedba 100644
--- a/lib/fog/libvirt/models/compute/interface.rb
+++ b/lib/fog/libvirt/models/compute/interface.rb
@@ -15,7 +15,7 @@ module Fog
         end
 
         def shutdown
-          connection.destroy_interface(mac)
+          service.destroy_interface(mac)
         end
 
         def active?
diff --git a/lib/fog/libvirt/models/compute/interfaces.rb b/lib/fog/libvirt/models/compute/interfaces.rb
index 643b81889..d01d22cfd 100644
--- a/lib/fog/libvirt/models/compute/interfaces.rb
+++ b/lib/fog/libvirt/models/compute/interfaces.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Libvirt::Interface
 
         def all(filter={})
-          load(connection.list_interfaces(filter))
+          load(service.list_interfaces(filter))
         end
 
         def get(name)
diff --git a/lib/fog/libvirt/models/compute/network.rb b/lib/fog/libvirt/models/compute/network.rb
index 36b94fee4..122181c6f 100644
--- a/lib/fog/libvirt/models/compute/network.rb
+++ b/lib/fog/libvirt/models/compute/network.rb
@@ -23,7 +23,7 @@ module Fog
         end
 
         def shutdown
-          connection.destroy_network(uuid)
+          service.destroy_network(uuid)
         end
 
       end
diff --git a/lib/fog/libvirt/models/compute/networks.rb b/lib/fog/libvirt/models/compute/networks.rb
index 5c410d073..233e433e4 100644
--- a/lib/fog/libvirt/models/compute/networks.rb
+++ b/lib/fog/libvirt/models/compute/networks.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Libvirt::Network
 
         def all(filter={})
-          load(connection.list_networks(filter))
+          load(service.list_networks(filter))
         end
 
         def get(uuid)
diff --git a/lib/fog/libvirt/models/compute/nic.rb b/lib/fog/libvirt/models/compute/nic.rb
index 2c412e209..a9b278c20 100644
--- a/lib/fog/libvirt/models/compute/nic.rb
+++ b/lib/fog/libvirt/models/compute/nic.rb
@@ -28,14 +28,14 @@ module Fog
         def save
           raise Fog::Errors::Error.new('Creating a new nic is not yet implemented. Contributions welcome!')
           #requires :server
-          #connection.attach_nic(domain , self)
+          #service.attach_nic(domain , self)
         end
 
         def destroy
           raise Fog::Errors::Error.new('Destroying an interface is not yet implemented. Contributions welcome!')
           #requires :server
           ##detach the nic
-          #connection.detach_nic(domain, mac)
+          #service.detach_nic(domain, mac)
         end
 
         private
diff --git a/lib/fog/libvirt/models/compute/nodes.rb b/lib/fog/libvirt/models/compute/nodes.rb
index e345aecd7..f1386c7f9 100644
--- a/lib/fog/libvirt/models/compute/nodes.rb
+++ b/lib/fog/libvirt/models/compute/nodes.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Libvirt::Node
 
         def all(filter={ })
-          load(connection.get_node_info)
+          load(service.get_node_info)
         end
 
         def get
diff --git a/lib/fog/libvirt/models/compute/pool.rb b/lib/fog/libvirt/models/compute/pool.rb
index 002ac6af0..1d9b568df 100644
--- a/lib/fog/libvirt/models/compute/pool.rb
+++ b/lib/fog/libvirt/models/compute/pool.rb
@@ -26,20 +26,20 @@ module Fog
 
         def save
           raise Fog::Errors::Error.new('Creating a new pool requires proper xml') unless xml
-          self.uuid = (persistent ? connection.define_pool(xml) : connection.create_pool(xml)).uuid
+          self.uuid = (persistent ? service.define_pool(xml) : service.create_pool(xml)).uuid
           reload
         end
 
         # Start the pool = make it active
         # Performs a libvirt create (= start)
         def start
-          connection.pool_action uuid, :create
+          service.pool_action uuid, :create
         end
 
         # Stop the pool = make it non-active
         # Performs a libvirt destroy (= stop)
         def stop
-          connection.pool_action uuid, :destroy
+          service.pool_action uuid, :destroy
         end
 
         # Shuts down the pool
@@ -49,15 +49,15 @@ module Fog
 
         # Build this storage pool
         def build
-          connection.pool_action uuid, :build
+          service.pool_action uuid, :build
         end
 
         # Destroys the storage pool
         def destroy
           # Shutdown pool if active
-          connection.pool_action uuid, :destroy if active?
+          service.pool_action uuid, :destroy if active?
           # If this is a persistent domain we need to undefine it
-          connection.pool_action uuid, :undefine if persistent?
+          service.pool_action uuid, :undefine if persistent?
         end
 
         # Is the pool active or not?
@@ -77,7 +77,7 @@ module Fog
 
         # Retrieves the volumes of this pool
         def volumes
-          connection.list_pool_volumes uuid
+          service.list_pool_volumes uuid
         end
 
       end
diff --git a/lib/fog/libvirt/models/compute/pools.rb b/lib/fog/libvirt/models/compute/pools.rb
index 9a5421803..78e16720d 100644
--- a/lib/fog/libvirt/models/compute/pools.rb
+++ b/lib/fog/libvirt/models/compute/pools.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Libvirt::Pool
 
         def all(filter = {})
-          load(connection.list_pools(filter))
+          load(service.list_pools(filter))
         end
 
         def get(uuid)
diff --git a/lib/fog/libvirt/models/compute/server.rb b/lib/fog/libvirt/models/compute/server.rb
index 7cae11e3a..422cca2fd 100644
--- a/lib/fog/libvirt/models/compute/server.rb
+++ b/lib/fog/libvirt/models/compute/server.rb
@@ -60,7 +60,7 @@ module Fog
           raise Fog::Errors::Error.new('Saving an existing server may create a duplicate') unless new?
           create_or_clone_volume unless xml or @volumes
           @xml ||= to_xml
-          self.id = (persistent ? connection.define_domain(xml) : connection.create_domain(xml)).uuid
+          self.id = (persistent ? service.define_domain(xml) : service.create_domain(xml)).uuid
           reload
         rescue => e
           raise Fog::Errors::Error.new("Error saving the server: #{e}")
@@ -68,7 +68,7 @@ module Fog
 
         def start
           return true if active?
-          connection.vm_action(uuid, :create)
+          service.vm_action(uuid, :create)
           reload
           true
         end
@@ -83,29 +83,29 @@ module Fog
 
         def destroy(options={ :destroy_volumes => false})
           poweroff unless stopped?
-          connection.vm_action(uuid, :undefine)
+          service.vm_action(uuid, :undefine)
           volumes.each { |vol| vol.destroy } if options[:destroy_volumes]
           true
         end
 
         def reboot
-          connection.vm_action(uuid, :reboot)
+          service.vm_action(uuid, :reboot)
         end
 
         def poweroff
-          connection.vm_action(uuid, :destroy)
+          service.vm_action(uuid, :destroy)
         end
 
         def shutdown
-          connection.vm_action(uuid, :shutdown)
+          service.vm_action(uuid, :shutdown)
         end
 
         def resume
-          connection.vm_action(uuid, :resume)
+          service.vm_action(uuid, :resume)
         end
 
         def suspend
-          connection.vm_action(uuid, :suspend)
+          service.vm_action(uuid, :suspend)
         end
 
         def stopped?
@@ -123,7 +123,7 @@ module Fog
 
         def volumes
           # lazy loading of volumes
-          @volumes ||= (@volumes_path || []).map{|path| connection.volumes.all(:path => path).first }
+          @volumes ||= (@volumes_path || []).map{|path| service.volumes.all(:path => path).first }
         end
 
         def private_ip_address
@@ -146,9 +146,9 @@ module Fog
 
         def ssh_proxy
           # if this is a direct connection, we don't need a proxy to be set.
-          return nil unless @connection.uri.ssh_enabled?
-          user_string= connection.uri.user ? "-l #{connection.uri.user}" : ""
-          Net::SSH::Proxy::Command.new("ssh #{user_string} #{connection.uri.host} nc %h %p")
+          return nil unless connection.uri.ssh_enabled?
+          user_string= service.uri.user ? "-l #{service.uri.user}" : ""
+          Net::SSH::Proxy::Command.new("ssh #{user_string} #{service.uri.host} nc %h %p")
         end
 
         # Transfers a file
@@ -197,7 +197,7 @@ module Fog
         end
 
         def update_display attrs = {}
-          connection.update_display attrs.merge(:uuid => uuid)
+          service.update_display attrs.merge(:uuid => uuid)
           reload
         end
 
@@ -214,32 +214,32 @@ module Fog
         # It returns an array of public and private ip addresses
         # Currently only one ip address is returned, but in the future this could be multiple
         # if the server has multiple network interface
-        def addresses(connection=connection, options={})
+        def addresses(service=service, options={})
           mac=self.mac
 
           # Aug 24 17:34:41 juno arpwatch: new station 10.247.4.137 52:54:00:88:5a:0a eth0.4
           # Aug 24 17:37:19 juno arpwatch: changed ethernet address 10.247.4.137 52:54:00:27:33:00 (52:54:00:88:5a:0a) eth0.4
           # Check if another ip_command string was provided
-          ip_command_global=connection.ip_command.nil? ? 'grep $mac /var/log/arpwatch.log|sed -e "s/new station//"|sed -e "s/changed ethernet address//g" |sed -e "s/reused old ethernet //" |tail -1 |cut -d ":" -f 4-| cut -d " " -f 3' : connection.ip_command
+          ip_command_global=service.ip_command.nil? ? 'grep $mac /var/log/arpwatch.log|sed -e "s/new station//"|sed -e "s/changed ethernet address//g" |sed -e "s/reused old ethernet //" |tail -1 |cut -d ":" -f 4-| cut -d " " -f 3' : service.ip_command
           ip_command_local=options[:ip_command].nil? ? ip_command_global : options[:ip_command]
 
           ip_command="mac=#{mac}; server_name=#{name}; "+ip_command_local
 
           ip_address=nil
 
-          if connection.uri.ssh_enabled?
+          if service.uri.ssh_enabled?
 
-            # Retrieve the parts we need from the connection to setup our ssh options
-            user=connection.uri.user #could be nil
-            host=connection.uri.host
-            keyfile=connection.uri.keyfile
-            port=connection.uri.port
+            # Retrieve the parts we need from the service to setup our ssh options
+            user=service.uri.user #could be nil
+            host=service.uri.host
+            keyfile=service.uri.keyfile
+            port=service.uri.port
 
             # Setup the options
             ssh_options={}
             ssh_options[:keys]=[ keyfile ] unless keyfile.nil?
             ssh_options[:port]=port unless keyfile.nil?
-            ssh_options[:paranoid]=true if connection.uri.no_verify?
+            ssh_options[:paranoid]=true if service.uri.no_verify?
 
 
             begin
@@ -261,7 +261,7 @@ module Fog
 
           else
             # It's not ssh enabled, so we assume it is
-            if connection.uri.transport=="tls"
+            if service.uri.transport=="tls"
               raise Fog::Errors::Error.new("TlS remote transport is not currently supported, only ssh")
             end
 
@@ -310,15 +310,15 @@ module Fog
 
         def initialize_nics
           if nics
-            nics.map! { |nic| nic.is_a?(Hash) ? connection.nics.new(nic) : nic }
+            nics.map! { |nic| nic.is_a?(Hash) ? service.nics.new(nic) : nic }
           else
-            self.nics = [connection.nics.new({:type => network_interface_type, :bridge => network_bridge_name, :network => network_nat_network})]
+            self.nics = [service.nics.new({:type => network_interface_type, :bridge => network_bridge_name, :network => network_nat_network})]
           end
         end
 
         def initialize_volumes
           if attributes[:volumes] && !attributes[:volumes].empty?
-            @volumes = attributes[:volumes].map { |vol| vol.is_a?(Hash) ? connection.volumes.new(vol) : vol }
+            @volumes = attributes[:volumes].map { |vol| vol.is_a?(Hash) ? service.volumes.new(vol) : vol }
           end
         end
 
@@ -326,7 +326,7 @@ module Fog
           options = {:name => volume_name || default_volume_name}
           # Check if a disk template was specified
           if volume_template_name
-            template_volume = connection.volumes.all(:name => volume_template_name).first
+            template_volume = service.volumes.all(:name => volume_template_name).first
             raise Fog::Errors::Error.new("Template #{volume_template_name} not found") unless template_volume
             begin
               volume = template_volume.clone("#{options[:name]}")
@@ -341,7 +341,7 @@ module Fog
             options[:allocation]  = volume_allocation  if volume_allocation
 
             begin
-              volume = connection.volumes.create(options)
+              volume = service.volumes.create(options)
             rescue => e
               raise Fog::Errors::Error.new("Error creating the volume : #{e}")
             end
diff --git a/lib/fog/libvirt/models/compute/servers.rb b/lib/fog/libvirt/models/compute/servers.rb
index d68a9d347..e2fc2798c 100644
--- a/lib/fog/libvirt/models/compute/servers.rb
+++ b/lib/fog/libvirt/models/compute/servers.rb
@@ -10,11 +10,11 @@ module Fog
         model Fog::Compute::Libvirt::Server
 
         def all(filter={})
-          load(connection.list_domains(filter))
+          load(service.list_domains(filter))
         end
 
         def get(uuid)
-          data = connection.list_domains(:uuid => uuid)
+          data = service.list_domains(:uuid => uuid)
           new data.first if data
         end
 
diff --git a/lib/fog/libvirt/models/compute/volume.rb b/lib/fog/libvirt/models/compute/volume.rb
index e5652c6e4..1663e24d4 100644
--- a/lib/fog/libvirt/models/compute/volume.rb
+++ b/lib/fog/libvirt/models/compute/volume.rb
@@ -38,17 +38,17 @@ module Fog
 
           raise Fog::Errors::Error.new('Reserving an existing volume may create a duplicate') if key
           @xml ||= to_xml
-          self.path = connection.create_volume(pool_name, xml).path
+          self.path = service.create_volume(pool_name, xml).path
         end
 
         # Destroy a volume
         def destroy
-          connection.volume_action key, :delete
+          service.volume_action key, :delete
         end
 
         # Wipes a volume , zeroes disk
         def wipe
-          connection.volume_action key, :wipe
+          service.volume_action key, :wipe
         end
 
         # Clones this volume to the name provided
@@ -75,10 +75,10 @@ module Fog
         # Try to guess the default/first pool of no pool_name was specified
         def default_pool_name
           name = "default"
-          return name unless (connection.pools.all(:name => name)).empty?
+          return name unless (service.pools.all(:name => name)).empty?
 
           # we default to the first pool we find.
-          first_pool = connection.pools.first
+          first_pool = service.pools.first
 
           raise Fog::Errors::Error.new('No storage pools are defined') unless first_pool
           first_pool.name
diff --git a/lib/fog/libvirt/models/compute/volumes.rb b/lib/fog/libvirt/models/compute/volumes.rb
index c31477e3e..512f498d2 100644
--- a/lib/fog/libvirt/models/compute/volumes.rb
+++ b/lib/fog/libvirt/models/compute/volumes.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Libvirt::Volume
 
         def all(filter = {})
-          load(connection.list_volumes(filter))
+          load(service.list_volumes(filter))
         end
 
         def get(key)
diff --git a/lib/fog/linode/models/compute/data_centers.rb b/lib/fog/linode/models/compute/data_centers.rb
index f8fa6470f..377d7bf82 100644
--- a/lib/fog/linode/models/compute/data_centers.rb
+++ b/lib/fog/linode/models/compute/data_centers.rb
@@ -13,9 +13,9 @@ module Fog
 
         private
         def datacenters(id=nil)
-          connection.avail_datacenters.body['DATA'].map { |datacenter| map_datacenter datacenter }
+          service.avail_datacenters.body['DATA'].map { |datacenter| map_datacenter datacenter }
         end
-        
+
         def map_datacenter(datacenter)
           datacenter = datacenter.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
           datacenter.merge! :id => datacenter[:datacenterid], :name => datacenter[:location]
diff --git a/lib/fog/linode/models/compute/disk.rb b/lib/fog/linode/models/compute/disk.rb
index fdeb20a6b..b870b4d1b 100644
--- a/lib/fog/linode/models/compute/disk.rb
+++ b/lib/fog/linode/models/compute/disk.rb
@@ -14,11 +14,11 @@ module Fog
           @type, @image, @stack_script, @name, @password, @size =
             attributes.values_at :type, :image, :stack_script, :name, :password, :size
           create_disk
-        end        
+        end
 
         def destroy
           requires :identity, :server
-          connection.linode_disk_delete server.id, id
+          service.linode_disk_delete server.id, id
         end
 
         def server
@@ -40,18 +40,18 @@ module Fog
         end
 
         def create_disk_type
-          self.id = connection.linode_disk_create(server.id, "#{@name}_#{@type}", @type, @size).body['DATA']['DiskID']
+          self.id = service.linode_disk_create(server.id, "#{@name}_#{@type}", @type, @size).body['DATA']['DiskID']
           reload
         end
 
         def create_disk_from_image
-          disk = connection.linode_disk_createfromdistribution server.id, @image.id, "#{@name}_main", @size, @password
+          disk = service.linode_disk_createfromdistribution server.id, @image.id, "#{@name}_main", @size, @password
           self.id = disk.body['DATA']['DiskID']
           reload
-        end        
+        end
 
         def create_disk_from_stack_script
-          disk = connection.linode_disk_createfromstackscript(server.id, @stack_script.id, @image.id,
+          disk = service.linode_disk_createfromstackscript(server.id, @stack_script.id, @image.id,
                                                               "#{@name}_main", @size, @password, @stack_script.options)
           self.id = disk.body['DATA']['DiskID']
           reload
diff --git a/lib/fog/linode/models/compute/disks.rb b/lib/fog/linode/models/compute/disks.rb
index 8df817162..06ff71c0c 100644
--- a/lib/fog/linode/models/compute/disks.rb
+++ b/lib/fog/linode/models/compute/disks.rb
@@ -27,9 +27,9 @@ module Fog
 
         private
         def disks(linode_id, id=nil)
-          connection.linode_disk_list(linode_id, id).body['DATA'].map { |disk| map_disk disk }
+          service.linode_disk_list(linode_id, id).body['DATA'].map { |disk| map_disk disk }
         end
-        
+
         def map_disk(disk)
           disk = disk.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
           disk.merge! :id => disk[:diskid], :name => disk[:label], :server_id => disk[:linodeid]
diff --git a/lib/fog/linode/models/compute/flavors.rb b/lib/fog/linode/models/compute/flavors.rb
index dbb7ddaf4..d989b484d 100644
--- a/lib/fog/linode/models/compute/flavors.rb
+++ b/lib/fog/linode/models/compute/flavors.rb
@@ -19,9 +19,9 @@ module Fog
 
         private
         def flavors(id=nil)
-          connection.avail_linodeplans(id).body['DATA'].map { |flavor| map_flavor flavor }
+          service.avail_linodeplans(id).body['DATA'].map { |flavor| map_flavor flavor }
         end
-        
+
         def map_flavor(flavor)
           flavor = flavor.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
           flavor.merge! :id => flavor[:planid], :name => flavor[:label]
diff --git a/lib/fog/linode/models/compute/images.rb b/lib/fog/linode/models/compute/images.rb
index 37b2b8fda..19d349abd 100644
--- a/lib/fog/linode/models/compute/images.rb
+++ b/lib/fog/linode/models/compute/images.rb
@@ -19,9 +19,9 @@ module Fog
 
         private
         def images(id=nil)
-          connection.avail_distributions(id).body['DATA'].map { |image| map_image image }
+          service.avail_distributions(id).body['DATA'].map { |image| map_image image }
         end
-        
+
         def map_image(image)
           image = image.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
           image.merge!(:id => image[:distributionid], :name => image[:label], :image_size => image[:minimagesize],
diff --git a/lib/fog/linode/models/compute/ip.rb b/lib/fog/linode/models/compute/ip.rb
index 9db59e1db..b0faa7e54 100644
--- a/lib/fog/linode/models/compute/ip.rb
+++ b/lib/fog/linode/models/compute/ip.rb
@@ -11,8 +11,8 @@ module Fog
         def save
           requires :server
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
-          
-          connection.linode_ip_addprivate server.id
+
+          service.linode_ip_addprivate server.id
           server.ips.all.find { |ip| !ip.public }
         end
 
diff --git a/lib/fog/linode/models/compute/ips.rb b/lib/fog/linode/models/compute/ips.rb
index 73aceb384..1448f958e 100644
--- a/lib/fog/linode/models/compute/ips.rb
+++ b/lib/fog/linode/models/compute/ips.rb
@@ -27,9 +27,9 @@ module Fog
 
         private
         def ips(linode_id, id=nil)
-          connection.linode_ip_list(linode_id, id).body['DATA'].map { |ip| map_ip ip }
+          service.linode_ip_list(linode_id, id).body['DATA'].map { |ip| map_ip ip }
         end
-        
+
         def map_ip(ip)
           ip = ip.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
           ip.merge! :id => ip[:ipaddressid], :ip => ip[:ipaddress], :public => ip[:ispublic]==1
diff --git a/lib/fog/linode/models/compute/kernels.rb b/lib/fog/linode/models/compute/kernels.rb
index c48d5b5b8..a730b8550 100644
--- a/lib/fog/linode/models/compute/kernels.rb
+++ b/lib/fog/linode/models/compute/kernels.rb
@@ -19,9 +19,9 @@ module Fog
 
         private
         def kernels(id=nil)
-          connection.avail_kernels(id).body['DATA'].map { |kernel| map_kernel kernel }
+          service.avail_kernels(id).body['DATA'].map { |kernel| map_kernel kernel }
         end
-        
+
         def map_kernel(kernel)
           kernel = kernel.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
           kernel.merge! :id => kernel[:kernelid], :name => kernel[:label]
diff --git a/lib/fog/linode/models/compute/server.rb b/lib/fog/linode/models/compute/server.rb
index ab4d1bc00..161d0037f 100644
--- a/lib/fog/linode/models/compute/server.rb
+++ b/lib/fog/linode/models/compute/server.rb
@@ -15,7 +15,7 @@ module Fog
         end
 
         def ips
-          Fog::Compute::Linode::Ips.new :server => self, :connection => connection
+          Fog::Compute::Linode::Ips.new :server => self, :service => service
         end
 
         def public_ip_address
@@ -23,7 +23,7 @@ module Fog
         end
 
         def disks
-          Fog::Compute::Linode::Disks.new :server => self, :connection => connection
+          Fog::Compute::Linode::Disks.new :server => self, :service => service
         end
 
         def disks?
@@ -31,15 +31,15 @@ module Fog
         end
 
         def reboot
-          connection.linode_reboot id
+          service.linode_reboot id
         end
 
         def shutdown
-          connection.linode_shutdown id
+          service.linode_shutdown id
         end
 
         def boot
-          connection.linode_boot id, config
+          service.linode_boot id, config
         end
 
         def save
@@ -60,20 +60,20 @@ module Fog
 
         def destroy
           requires :identity
-          connection.linode_shutdown id
+          service.linode_shutdown id
           disks.each { |disk| disk.destroy }
           wait_for { not disks? }
-          connection.linode_delete id
+          service.linode_delete id
         end
 
         private
         def config
-          connection.linode_config_list(id).body['DATA'].first['ConfigID']
+          service.linode_config_list(id).body['DATA'].first['ConfigID']
         end
 
         def create_linode
-          self.id = connection.linode_create(@data_center.id, @flavor.id, @payment_terms).body['DATA']['LinodeID']
-          connection.linode_update id, :label => @name
+          self.id = service.linode_create(@data_center.id, @flavor.id, @payment_terms).body['DATA']['LinodeID']
+          service.linode_update id, :label => @name
           ips.create
           reload
         end
@@ -85,11 +85,11 @@ module Fog
         end
 
         def create_config
-          @config = connection.linode_config_create(id, @kernel.id, @name, "#{@disk.id},#{@swap.id},,,,,,,").body['DATA']['ConfigID']
+          @config = service.linode_config_create(id, @kernel.id, @name, "#{@disk.id},#{@swap.id},,,,,,,").body['DATA']['ConfigID']
         end
 
         def boot_linode
-          connection.linode_boot id, @config
+          service.linode_boot id, @config
         end
       end
     end
diff --git a/lib/fog/linode/models/compute/servers.rb b/lib/fog/linode/models/compute/servers.rb
index e1b4163af..bef8b6327 100644
--- a/lib/fog/linode/models/compute/servers.rb
+++ b/lib/fog/linode/models/compute/servers.rb
@@ -19,9 +19,9 @@ module Fog
 
         private
         def servers(id=nil)
-          connection.linode_list(id).body['DATA'].map { |server| map_server server }
+          service.linode_list(id).body['DATA'].map { |server| map_server server }
         end
-        
+
         def map_server(server)
           server = server.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
           server.merge! :id => server[:linodeid], :name => server[:label]
diff --git a/lib/fog/linode/models/compute/stack_scripts.rb b/lib/fog/linode/models/compute/stack_scripts.rb
index 3b523b1b6..0ee60dace 100644
--- a/lib/fog/linode/models/compute/stack_scripts.rb
+++ b/lib/fog/linode/models/compute/stack_scripts.rb
@@ -15,13 +15,13 @@ module Fog
           new stackscripts(id).first
         rescue Fog::Compute::Linode::NotFound
           nil
-        end        
+        end
 
         private
         def stackscripts(id=nil)
-          connection.stackscript_list(id).body['DATA'].map { |script| map_stackscript script }
+          service.stackscript_list(id).body['DATA'].map { |script| map_stackscript script }
         end
-        
+
         def map_stackscript(script)
           script = script.each_with_object({}) { |(k, v), h| h[k.downcase.to_sym] = v  }
           script.merge! :id => script[:stackscriptid], :name => script[:label]
diff --git a/lib/fog/linode/models/dns/record.rb b/lib/fog/linode/models/dns/record.rb
index 03c2d1bed..ac96267ce 100644
--- a/lib/fog/linode/models/dns/record.rb
+++ b/lib/fog/linode/models/dns/record.rb
@@ -29,7 +29,7 @@ module Fog
 
         def destroy
           requires :identity, :zone
-          connection.domain_resource_delete(zone.id, identity)
+          service.domain_resource_delete(zone.id, identity)
           true
         end
 
@@ -42,25 +42,25 @@ module Fog
           options = {}
           # * options<~Hash>
           #   * weight<~Integer>: default: 5
-          #   * port<~Integer>: default: 80 
-          #   * protocol<~String>: The protocol to append to an SRV record. Ignored on other record 
+          #   * port<~Integer>: default: 80
+          #   * protocol<~String>: The protocol to append to an SRV record. Ignored on other record
           #                        types. default: udp
           options[:name]      = name if name
           options[:priority]  = priority if priority
           options[:target]    = value if value
           options[:ttl_sec]   = ttl if ttl
           response = unless identity
-            connection.domain_resource_create(zone.identity, type, options)
+            service.domain_resource_create(zone.identity, type, options)
           else
             options[:type] = type if type
-            connection.domain_resource_update(zone.identity, identity, options)
+            service.domain_resource_update(zone.identity, identity, options)
           end
           merge_attributes(response.body['DATA'])
           true
         end
 
         private
-        
+
         def zone=(new_zone)
           @zone = new_zone
         end
diff --git a/lib/fog/linode/models/dns/records.rb b/lib/fog/linode/models/dns/records.rb
index 84323d545..33b41e83f 100644
--- a/lib/fog/linode/models/dns/records.rb
+++ b/lib/fog/linode/models/dns/records.rb
@@ -13,12 +13,12 @@ module Fog
 
         def all
           requires :zone
-          data = connection.domain_resource_list(zone.id).body['DATA']
+          data = service.domain_resource_list(zone.id).body['DATA']
           load(data)
         end
 
         def get(record_id)
-          if data = connection.domain_resource_list(zone.id, record_id).body['DATA'].first
+          if data = service.domain_resource_list(zone.id, record_id).body['DATA'].first
             new(data)
           else
             nil
diff --git a/lib/fog/linode/models/dns/zone.rb b/lib/fog/linode/models/dns/zone.rb
index 570ec9ac0..24fde20e2 100644
--- a/lib/fog/linode/models/dns/zone.rb
+++ b/lib/fog/linode/models/dns/zone.rb
@@ -30,15 +30,15 @@ module Fog
 
         def destroy
           requires :identity
-          connection.domain_delete(identity)
+          service.domain_delete(identity)
           true
         end
 
         def records
           @records ||= begin
             Fog::DNS::Linode::Records.new(
-              :zone       => self,
-              :connection => connection
+              :zone    => self,
+              :service => service
             )
           end
         end
@@ -61,17 +61,17 @@ module Fog
           #   * refresh_sec<~Integer> numeric, default: '0'
           #   * retry_sec<~Integer> numeric, default: '0'
           #   * expire_sec<~Integer> numeric, default: '0'
-          #   * status<~Integer> 0, 1, or 2 (disabled, active, edit mode), default: 1 
+          #   * status<~Integer> 0, 1, or 2 (disabled, active, edit mode), default: 1
           #   * master_ips<~String> When type=slave, the zone's master DNS servers list, semicolon separated
           options[:description] = description if description
           options[:soa_email]   = email if email
           options[:ttl_sec]     = ttl if ttl
           response = unless identity
-            connection.domain_create(domain, type, options)
+            service.domain_create(domain, type, options)
           else
             options[:domain]  = domain if domain
             options[:type]    = type if type
-            connection.domain_update(identity, options)
+            service.domain_update(identity, options)
           end
           merge_attributes(response.body['DATA'])
           true
diff --git a/lib/fog/linode/models/dns/zones.rb b/lib/fog/linode/models/dns/zones.rb
index ffac2fb9e..fd2e08549 100644
--- a/lib/fog/linode/models/dns/zones.rb
+++ b/lib/fog/linode/models/dns/zones.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::DNS::Linode::Zone
 
         def all
-          data = connection.domain_list.body['DATA']
+          data = service.domain_list.body['DATA']
           load(data)
         end
 
         def get(zone_id)
-          if data = connection.domain_list(zone_id).body['DATA'].first
+          if data = service.domain_list(zone_id).body['DATA'].first
             new(data)
           else
             nil
diff --git a/lib/fog/local/models/storage/directories.rb b/lib/fog/local/models/storage/directories.rb
index cf0725718..e80876647 100644
--- a/lib/fog/local/models/storage/directories.rb
+++ b/lib/fog/local/models/storage/directories.rb
@@ -10,8 +10,8 @@ module Fog
         model Fog::Storage::Local::Directory
 
         def all
-          data = Dir.entries(connection.local_root).select do |entry|
-            entry[0...1] != '.' && ::File.directory?(connection.path_to(entry))
+          data = Dir.entries(service.local_root).select do |entry|
+            entry[0...1] != '.' && ::File.directory?(service.path_to(entry))
           end.map do |entry|
             {:key => entry}
           end
@@ -19,7 +19,7 @@ module Fog
         end
 
         def get(key)
-          if ::File.directory?(connection.path_to(key))
+          if ::File.directory?(service.path_to(key))
             new(:key => key)
           else
             nil
diff --git a/lib/fog/local/models/storage/directory.rb b/lib/fog/local/models/storage/directory.rb
index 7e22ae678..4ce8e3fd0 100644
--- a/lib/fog/local/models/storage/directory.rb
+++ b/lib/fog/local/models/storage/directory.rb
@@ -24,7 +24,7 @@ module Fog
           @files ||= begin
             Fog::Storage::Local::Files.new(
               :directory    => self,
-              :connection   => connection
+              :service   => service
             )
           end
         end
@@ -47,7 +47,7 @@ module Fog
         private
 
         def path
-          connection.path_to(key)
+          service.path_to(key)
         end
 
       end
diff --git a/lib/fog/local/models/storage/file.rb b/lib/fog/local/models/storage/file.rb
index 3140f72b0..cbad0231e 100644
--- a/lib/fog/local/models/storage/file.rb
+++ b/lib/fog/local/models/storage/file.rb
@@ -40,8 +40,8 @@ module Fog
 
         def copy(target_directory_key, target_file_key, options={})
           requires :directory, :key
-          connection.copy_object(directory.key, key, target_directory_key, target_file_key)
-          target_directory = connection.directories.new(:key => target_directory_key)
+          service.copy_object(directory.key, key, target_directory_key, target_file_key)
+          target_directory = service.directories.new(:key => target_directory_key)
           target_directory.files.get(target_file_key)
         end
 
@@ -55,7 +55,7 @@ module Fog
               next
             end
             # don't delete the containing directory or higher
-            if dir_path == connection.path_to(directory.key)
+            if dir_path == service.path_to(directory.key)
               break
             end
             pwd = Dir.pwd
@@ -77,11 +77,11 @@ module Fog
         def public_url
           requires :directory, :key
 
-          if connection.endpoint
+          if service.endpoint
             escaped_directory = URI.escape(directory.key)
             escaped_key = URI.escape(key)
 
-            ::File.join(connection.endpoint, escaped_directory, escaped_key)
+            ::File.join(service.endpoint, escaped_directory, escaped_key)
           else
             nil
           end
@@ -121,7 +121,7 @@ module Fog
         end
 
         def path
-          connection.path_to(::File.join(directory.key, key))
+          service.path_to(::File.join(directory.key, key))
         end
 
       end
diff --git a/lib/fog/local/models/storage/files.rb b/lib/fog/local/models/storage/files.rb
index f3543a204..a2871e441 100644
--- a/lib/fog/local/models/storage/files.rb
+++ b/lib/fog/local/models/storage/files.rb
@@ -15,7 +15,7 @@ module Fog
           requires :directory
           if directory.collection.get(directory.key)
             pwd = Dir.pwd
-            Dir.chdir(connection.path_to(directory.key))
+            Dir.chdir(service.path_to(directory.key))
             data = Dir.glob('**/*').reject do |file|
               ::File.directory?(file)
             end.map do |key|
@@ -78,7 +78,7 @@ module Fog
         private
 
         def file_path(key)
-          connection.path_to(::File.join(directory.key, key))
+          service.path_to(::File.join(directory.key, key))
         end
 
       end
diff --git a/lib/fog/ninefold/models/compute/address.rb b/lib/fog/ninefold/models/compute/address.rb
index 9c50fa7bd..8dd50e1b8 100644
--- a/lib/fog/ninefold/models/compute/address.rb
+++ b/lib/fog/ninefold/models/compute/address.rb
@@ -35,19 +35,19 @@ module Fog
 
         def destroy
           requires :identity
-          self.jobid = extract_job_id(connection.disassociate_ip_address(:id => identity))
+          self.jobid = extract_job_id(service.disassociate_ip_address(:id => identity))
           true
         end
 
         def enable_static_nat(server)
           server.kind_of?(Integer) ? serverid = server : serverid = server.identity
-          res = connection.enable_static_nat(:virtualmachineid => serverid, :ipaddressid => identity)
+          res = service.enable_static_nat(:virtualmachineid => serverid, :ipaddressid => identity)
           reload
           to_boolean(res['success'])
         end
 
         def disable_static_nat()
-          self.jobid = extract_job_id(connection.disable_static_nat(:ipaddressid => identity))
+          self.jobid = extract_job_id(service.disable_static_nat(:ipaddressid => identity))
           true
         end
 
@@ -59,7 +59,7 @@ module Fog
         end
 
         def ready?
-          if jobid && connection.query_async_job_result(:jobid => jobid)['jobstatus'] == 0
+          if jobid && service.query_async_job_result(:jobid => jobid)['jobstatus'] == 0
             false
           else # No running job, we are ready. Refresh data.
             reload
@@ -77,7 +77,7 @@ module Fog
             :account => account,
             :domainid => domainid
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.associate_ip_address(options)
+          data = service.associate_ip_address(options)
           merge_attributes(data)
           true
         end
diff --git a/lib/fog/ninefold/models/compute/addresses.rb b/lib/fog/ninefold/models/compute/addresses.rb
index a1b7e1982..15f7e7880 100644
--- a/lib/fog/ninefold/models/compute/addresses.rb
+++ b/lib/fog/ninefold/models/compute/addresses.rb
@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::Ninefold::Address
 
         def all
-          data = connection.list_public_ip_addresses
+          data = service.list_public_ip_addresses
           load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.list_public_ip_addresses(:id => identifier)
+          data = service.list_public_ip_addresses(:id => identifier)
           if data.empty?
             nil
           else
diff --git a/lib/fog/ninefold/models/compute/flavors.rb b/lib/fog/ninefold/models/compute/flavors.rb
index d678e5e4d..4212ab350 100644
--- a/lib/fog/ninefold/models/compute/flavors.rb
+++ b/lib/fog/ninefold/models/compute/flavors.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ninefold::Flavor
 
         def all
-          data = connection.list_service_offerings
+          data = service.list_service_offerings
           load(data)
         end
 
         def get(identifier)
-          data = connection.list_service_offerings(:id => identifier)
+          data = service.list_service_offerings(:id => identifier)
           if data.empty?
             nil
           else
diff --git a/lib/fog/ninefold/models/compute/images.rb b/lib/fog/ninefold/models/compute/images.rb
index 5258c920a..41ea91343 100644
--- a/lib/fog/ninefold/models/compute/images.rb
+++ b/lib/fog/ninefold/models/compute/images.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ninefold::Image
 
         def all(offering = 'executable')
-          data = connection.list_templates(:templatefilter => offering)
+          data = service.list_templates(:templatefilter => offering)
           load(data)
         end
 
         def get(identifier, offering = 'executable')
-          data = connection.list_templates(:templatefilter => offering, :id => identifier)
+          data = service.list_templates(:templatefilter => offering, :id => identifier)
           if data.empty?
             nil
           else
diff --git a/lib/fog/ninefold/models/compute/ip_forwarding_rule.rb b/lib/fog/ninefold/models/compute/ip_forwarding_rule.rb
index 4fa74fd43..3853c4237 100644
--- a/lib/fog/ninefold/models/compute/ip_forwarding_rule.rb
+++ b/lib/fog/ninefold/models/compute/ip_forwarding_rule.rb
@@ -25,12 +25,12 @@ module Fog
 
         def destroy
           requires :identity
-          self.jobid = extract_job_id(connection.delete_ip_forwarding_rule(:id => identity))
+          self.jobid = extract_job_id(service.delete_ip_forwarding_rule(:id => identity))
           true
         end
 
         def ready?
-          if jobid && connection.query_async_job_result(:jobid => jobid)['jobstatus'] == 0
+          if jobid && service.query_async_job_result(:jobid => jobid)['jobstatus'] == 0
             false
           else # No running job, we are ready. Refresh data.
             reload
@@ -58,7 +58,7 @@ module Fog
             :startport => startport,
             :endport => endport
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.create_ip_forwarding_rule(options)
+          data = service.create_ip_forwarding_rule(options)
           merge_attributes(data)
           true
         end
diff --git a/lib/fog/ninefold/models/compute/ip_forwarding_rules.rb b/lib/fog/ninefold/models/compute/ip_forwarding_rules.rb
index af835e54c..ae0826cdc 100644
--- a/lib/fog/ninefold/models/compute/ip_forwarding_rules.rb
+++ b/lib/fog/ninefold/models/compute/ip_forwarding_rules.rb
@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::Ninefold::IpForwardingRule
 
         def all
-          data = connection.list_ip_forwarding_rules
+          data = service.list_ip_forwarding_rules
           load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.list_ip_forwarding_rules(:id => identifier)
+          data = service.list_ip_forwarding_rules(:id => identifier)
           if data.empty?
             nil
           else
diff --git a/lib/fog/ninefold/models/compute/server.rb b/lib/fog/ninefold/models/compute/server.rb
index 46fbb087d..42d709b36 100644
--- a/lib/fog/ninefold/models/compute/server.rb
+++ b/lib/fog/ninefold/models/compute/server.rb
@@ -82,43 +82,43 @@ module Fog
 
         def reboot
           requires :identity
-          self.jobid = extract_job_id(connection.reboot_virtual_machine(:id => identity))
+          self.jobid = extract_job_id(service.reboot_virtual_machine(:id => identity))
           puts "jobid: " + jobid.to_s
           true
         end
 
         def start
           requires :identity
-          self.jobid = extract_job_id(connection.start_virtual_machine(:id => identity))
+          self.jobid = extract_job_id(service.start_virtual_machine(:id => identity))
           true
         end
 
         def stop
           requires :identity
-          self.jobid = extract_job_id(connection.stop_virtual_machine(:id => identity))
+          self.jobid = extract_job_id(service.stop_virtual_machine(:id => identity))
           true
         end
 
         def destroy
           requires :identity
-          self.jobid = extract_job_id(connection.destroy_virtual_machine(:id => identity))
+          self.jobid = extract_job_id(service.destroy_virtual_machine(:id => identity))
           true
         end
 
         def flavor
           requires :flavor_id
-          connection.flavors.get(flavor_id)
+          service.flavors.get(flavor_id)
         end
 
         def image
           requires :image_id
-          connection.images.get(image_id)
+          service.images.get(image_id)
         end
 
         def ready?
           if jobid
             # we do this by polling the last job id status.
-            res = connection.query_async_job_result(:jobid => jobid)
+            res = service.query_async_job_result(:jobid => jobid)
             if res['jobstatus'] == 0
               false
             else
@@ -138,7 +138,7 @@ module Fog
 
           unless networkids
             # No network specified, use first in this zone.
-            networks = connection.list_networks(:zoneid => zoneid)
+            networks = service.list_networks(:zoneid => zoneid)
             if networks.empty?
               raise "No networks. Please create one, or specify a network ID"
             else
@@ -164,7 +164,7 @@ module Fog
             :size => size,
             :userdata => userdata
           }.delete_if {|k,v| v.nil? || v == "" }
-          data = connection.deploy_virtual_machine(options)
+          data = service.deploy_virtual_machine(options)
           merge_attributes(data)
           true
         end
diff --git a/lib/fog/ninefold/models/compute/servers.rb b/lib/fog/ninefold/models/compute/servers.rb
index 01e2ec109..6293bbde2 100644
--- a/lib/fog/ninefold/models/compute/servers.rb
+++ b/lib/fog/ninefold/models/compute/servers.rb
@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::Ninefold::Server
 
         def all
-          data = connection.list_virtual_machines
+          data = service.list_virtual_machines
           load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          data = connection.list_virtual_machines(:id => identifier)
+          data = service.list_virtual_machines(:id => identifier)
           if data.empty?
             nil
           else
diff --git a/lib/fog/openstack/models/compute/address.rb b/lib/fog/openstack/models/compute/address.rb
index 5c71ed233..c6a47b7b4 100644
--- a/lib/fog/openstack/models/compute/address.rb
+++ b/lib/fog/openstack/models/compute/address.rb
@@ -21,7 +21,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.release_address(id)
+          service.release_address(id)
           true
         end
 
@@ -35,7 +35,7 @@ module Fog
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
-          data = connection.allocate_address(pool).body['floating_ip']
+          data = service.allocate_address(pool).body['floating_ip']
           new_attributes = data.reject {|key,value| !['id', 'instance_id', 'ip', 'fixed_ip'].include?(key)}
           merge_attributes(new_attributes)
           if @server
@@ -52,14 +52,14 @@ module Fog
           else
             @server = nil
             self.instance_id = new_server.id
-            connection.associate_address(instance_id, ip)
+            service.associate_address(instance_id, ip)
           end
         end
 
         def disassociate
           @server = nil
           if persisted?
-            connection.disassociate_address(instance_id, ip)
+            service.disassociate_address(instance_id, ip)
           end
           self.instance_id = nil
         end
diff --git a/lib/fog/openstack/models/compute/addresses.rb b/lib/fog/openstack/models/compute/addresses.rb
index 8e183ea92..90525bb5f 100644
--- a/lib/fog/openstack/models/compute/addresses.rb
+++ b/lib/fog/openstack/models/compute/addresses.rb
@@ -10,11 +10,11 @@ module Fog
         model Fog::Compute::OpenStack::Address
 
         def all
-          load(connection.list_all_addresses.body['floating_ips'])
+          load(service.list_all_addresses.body['floating_ips'])
         end
 
         def get(address_id)
-          if address = connection.get_address(address_id).body['floating_ip']
+          if address = service.get_address(address_id).body['floating_ip']
             new(address)
           end
         rescue Fog::Compute::OpenStack::NotFound
@@ -22,7 +22,7 @@ module Fog
         end
 
         def get_address_pools
-          connection.list_address_pools.body['floating_ip_pools']
+          service.list_address_pools.body['floating_ip_pools']
         end
 
       end
diff --git a/lib/fog/openstack/models/compute/flavor.rb b/lib/fog/openstack/models/compute/flavor.rb
index 9779dfc07..d97c006ad 100644
--- a/lib/fog/openstack/models/compute/flavor.rb
+++ b/lib/fog/openstack/models/compute/flavor.rb
@@ -18,7 +18,8 @@ module Fog
         attribute :disabled, :aliases => 'OS-FLV-DISABLED:disabled'
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
@@ -29,13 +30,13 @@ module Fog
           attributes[:disabled] = self.disabled || false
           attributes[:swap] = self.swap || 0
           attributes[:rxtx_factor] = self.rxtx_factor || 1.0
-          merge_attributes(connection.create_flavor(self.attributes).body['flavor'])
+          merge_attributes(service.create_flavor(self.attributes).body['flavor'])
           self
         end
 
         def destroy
           requires :id
-          connection.delete_flavor(self.id)
+          service.delete_flavor(self.id)
           true
         end
       end
diff --git a/lib/fog/openstack/models/compute/flavors.rb b/lib/fog/openstack/models/compute/flavors.rb
index 6f9d2a768..8692bfa51 100644
--- a/lib/fog/openstack/models/compute/flavors.rb
+++ b/lib/fog/openstack/models/compute/flavors.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::OpenStack::Flavor
 
         def all
-          data = connection.list_flavors_detail.body['flavors']
+          data = service.list_flavors_detail.body['flavors']
           load(data)
         end
 
         def get(flavor_id)
-          data = connection.get_flavor_details(flavor_id).body['flavor']
+          data = service.get_flavor_details(flavor_id).body['flavor']
           new(data)
         rescue Fog::Compute::OpenStack::NotFound
           nil
diff --git a/lib/fog/openstack/models/compute/host.rb b/lib/fog/openstack/models/compute/host.rb
index aeda3fe0c..09448799d 100644
--- a/lib/fog/openstack/models/compute/host.rb
+++ b/lib/fog/openstack/models/compute/host.rb
@@ -12,12 +12,13 @@ module Fog
         attribute :details
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
         def details
-          connection.get_host_details(self.host_name).body['host']
+          service.get_host_details(self.host_name).body['host']
         end
 
       end
diff --git a/lib/fog/openstack/models/compute/hosts.rb b/lib/fog/openstack/models/compute/hosts.rb
index d56804167..ee1409c91 100644
--- a/lib/fog/openstack/models/compute/hosts.rb
+++ b/lib/fog/openstack/models/compute/hosts.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::OpenStack::Host
 
         def all
-          data = connection.list_hosts.body['hosts']
+          data = service.list_hosts.body['hosts']
           load(data)
         end
 
         def get(host_name)
-          if host = connection.get_host_details(host_name).body['host']
+          if host = service.get_host_details(host_name).body['host']
             new({
               'host_name' => host_name,
               'details' => host}
diff --git a/lib/fog/openstack/models/compute/image.rb b/lib/fog/openstack/models/compute/image.rb
index 0b5646a99..0a9ff3ad1 100644
--- a/lib/fog/openstack/models/compute/image.rb
+++ b/lib/fog/openstack/models/compute/image.rb
@@ -21,14 +21,15 @@ module Fog
         attribute :links
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
         def metadata
           @metadata ||= begin
             Fog::Compute::OpenStack::Metadata.new({
-              :connection => connection,
+              :service => service,
               :parent => self
             })
           end
@@ -42,7 +43,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_image(id)
+          service.delete_image(id)
           true
         end
 
diff --git a/lib/fog/openstack/models/compute/images.rb b/lib/fog/openstack/models/compute/images.rb
index c77a206db..a5815c734 100644
--- a/lib/fog/openstack/models/compute/images.rb
+++ b/lib/fog/openstack/models/compute/images.rb
@@ -12,7 +12,7 @@ module Fog
         attribute :server
 
         def all
-          data = connection.list_images_detail.body['images']
+          data = service.list_images_detail.body['images']
           load(data)
           if server
             self.replace(self.select {|image| image.server_id == server.id})
@@ -20,7 +20,7 @@ module Fog
         end
 
         def get(image_id)
-          data = connection.get_image_details(image_id).body['image']
+          data = service.get_image_details(image_id).body['image']
           new(data)
         rescue Fog::Compute::OpenStack::NotFound
           nil
diff --git a/lib/fog/openstack/models/compute/key_pair.rb b/lib/fog/openstack/models/compute/key_pair.rb
index 81c4522ed..466d5450a 100644
--- a/lib/fog/openstack/models/compute/key_pair.rb
+++ b/lib/fog/openstack/models/compute/key_pair.rb
@@ -19,7 +19,7 @@ module Fog
         def destroy
           requires :name
 
-          connection.delete_key_pair(name)
+          service.delete_key_pair(name)
           true
         end
 
@@ -27,9 +27,9 @@ module Fog
           requires :name
 
           data = if public_key
-            connection.create_key_pair(name, public_key).body['keypair']
+            service.create_key_pair(name, public_key).body['keypair']
           else
-            connection.create_key_pair(name).body['keypair']
+            service.create_key_pair(name).body['keypair']
           end
           new_attributes = data.reject {|key,value| !['fingerprint', 'public_key', 'name', 'private_key', 'user_id'].include?(key)}
           merge_attributes(new_attributes)
diff --git a/lib/fog/openstack/models/compute/key_pairs.rb b/lib/fog/openstack/models/compute/key_pairs.rb
index b8f62afde..be92e7be2 100644
--- a/lib/fog/openstack/models/compute/key_pairs.rb
+++ b/lib/fog/openstack/models/compute/key_pairs.rb
@@ -11,7 +11,7 @@ module Fog
 
         def all
           items = Array.new
-          connection.list_key_pairs.body['keypairs'].each do |kp|
+          service.list_key_pairs.body['keypairs'].each do |kp|
             items = items + kp.values
           end
           load(items)
diff --git a/lib/fog/openstack/models/compute/metadata.rb b/lib/fog/openstack/models/compute/metadata.rb
index bb3c4c614..246cd08c8 100644
--- a/lib/fog/openstack/models/compute/metadata.rb
+++ b/lib/fog/openstack/models/compute/metadata.rb
@@ -16,7 +16,7 @@ module Fog
 
         def all
           requires :parent
-          metadata = connection.list_metadata(collection_name, @parent.id).body['metadata']
+          metadata = service.list_metadata(collection_name, @parent.id).body['metadata']
           metas = []
           metadata.each_pair {|k,v| metas << {"key" => k, "value" => v} }
           load(metas)
@@ -24,7 +24,7 @@ module Fog
 
         def get(key)
           requires :parent
-          data = connection.get_meta(collection_name, @parent.id, key).body["meta"]
+          data = service.get_meta(collection_name, @parent.id, key).body["meta"]
           metas = []
           data.each_pair {|k,v| metas << {"key" => k, "value" => v} }
           new(metas[0])
@@ -34,12 +34,12 @@ module Fog
 
         def update(data=nil)
           requires :parent
-          connection.update_metadata(collection_name, @parent.id, meta_hash(data))
+          service.update_metadata(collection_name, @parent.id, meta_hash(data))
         end
 
         def set(data=nil)
           requires :parent
-          connection.set_metadata(collection_name, @parent.id, meta_hash(data))
+          service.set_metadata(collection_name, @parent.id, meta_hash(data))
         end
 
         def new(attributes = {})
diff --git a/lib/fog/openstack/models/compute/metadatum.rb b/lib/fog/openstack/models/compute/metadatum.rb
index 8bd57678e..8a4e62515 100644
--- a/lib/fog/openstack/models/compute/metadatum.rb
+++ b/lib/fog/openstack/models/compute/metadatum.rb
@@ -13,13 +13,13 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_meta(collection_name, @parent.id, key)
+          service.delete_meta(collection_name, @parent.id, key)
           true
         end
 
         def save
           requires :identity, :value
-          connection.update_meta(collection_name, @parent.id, key, value)
+          service.update_meta(collection_name, @parent.id, key, value)
           true
         end
 
diff --git a/lib/fog/openstack/models/compute/security_group.rb b/lib/fog/openstack/models/compute/security_group.rb
index 7b629e35c..9ecb2a6f4 100644
--- a/lib/fog/openstack/models/compute/security_group.rb
+++ b/lib/fog/openstack/models/compute/security_group.rb
@@ -16,7 +16,7 @@ module Fog
 
         def save
           requires :name, :description
-          data = connection.create_security_group(name, description)
+          data = service.create_security_group(name, description)
           merge_attributes(data.body['security_group'])
           true
         end
@@ -24,17 +24,17 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_security_group(id)
+          service.delete_security_group(id)
           true
         end
 
         def create_security_group_rule(min, max, ip_protocol = "tcp", cidr = "0.0.0.0/0", group_id = nil)
           requires :id
-          connection.create_security_group_rule(id, ip_protocol, min, max, cidr, group_id)
+          service.create_security_group_rule(id, ip_protocol, min, max, cidr, group_id)
         end
 
         def delete_security_group_rule(rule_id)
-          connection.delete_security_group_rule(rule_id)
+          service.delete_security_group_rule(rule_id)
           true
         end
 
diff --git a/lib/fog/openstack/models/compute/security_groups.rb b/lib/fog/openstack/models/compute/security_groups.rb
index 735ce519f..a55ff2232 100644
--- a/lib/fog/openstack/models/compute/security_groups.rb
+++ b/lib/fog/openstack/models/compute/security_groups.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::OpenStack::SecurityGroup
 
         def all
-          load(connection.list_security_groups.body['security_groups'])
+          load(service.list_security_groups.body['security_groups'])
         end
 
         def get(security_group_id)
           if security_group_id
-            new(connection.get_security_group(security_group_id).body['security_group'])
+            new(service.get_security_group(security_group_id).body['security_group'])
           end
         rescue Fog::Compute::OpenStack::NotFound
           nil
diff --git a/lib/fog/openstack/models/compute/server.rb b/lib/fog/openstack/models/compute/server.rb
index 501519a57..b66599feb 100644
--- a/lib/fog/openstack/models/compute/server.rb
+++ b/lib/fog/openstack/models/compute/server.rb
@@ -44,7 +44,8 @@ module Fog
 
 
         def initialize(attributes={})
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           attributes[:metadata] = {}
 
           self.security_groups = attributes.delete(:security_groups)
@@ -58,7 +59,7 @@ module Fog
         def metadata
           @metadata ||= begin
             Fog::Compute::OpenStack::Metadata.new({
-              :connection => connection,
+              :service => service,
               :parent => self
             })
           end
@@ -76,13 +77,13 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_server(id)
+          service.delete_server(id)
           true
         end
 
         def images
           requires :id
-          connection.images(:server => self)
+          service.images(:server => self)
         end
 
         def private_ip_address
@@ -127,42 +128,42 @@ module Fog
 
         def change_password(admin_password)
           requires :id
-          connection.change_server_password(id, admin_password)
+          service.change_server_password(id, admin_password)
           true
         end
 
         def rebuild(image_ref, name, admin_pass=nil, metadata=nil, personality=nil)
           requires :id
-          connection.rebuild_server(id, image_ref, name, admin_pass, metadata, personality)
+          service.rebuild_server(id, image_ref, name, admin_pass, metadata, personality)
           true
         end
 
         def resize(flavor_ref)
           requires :id
-          connection.resize_server(id, flavor_ref)
+          service.resize_server(id, flavor_ref)
           true
         end
 
         def revert_resize
           requires :id
-          connection.revert_resize_server(id)
+          service.revert_resize_server(id)
           true
         end
 
         def confirm_resize
           requires :id
-          connection.confirm_resize_server(id)
+          service.confirm_resize_server(id)
           true
         end
 
         def security_groups
           requires :id
 
-          groups = connection.list_security_groups(id).body['security_groups']
+          groups = service.list_security_groups(id).body['security_groups']
 
           groups.map do |group|
             sg = Fog::Compute::OpenStack::SecurityGroup.new group
-            sg.connection = connection
+            sg.connection = service
             sg
           end
         end
@@ -173,43 +174,43 @@ module Fog
 
         def reboot(type = 'SOFT')
           requires :id
-          connection.reboot_server(id, type)
+          service.reboot_server(id, type)
           true
         end
 
         def create_image(name, metadata={})
           requires :id
-          connection.create_image(id, name, metadata)
+          service.create_image(id, name, metadata)
         end
 
         def console(log_length = nil)
           requires :id
-          connection.get_console_output(id, log_length)
+          service.get_console_output(id, log_length)
         end
 
         def migrate
           requires :id
-          connection.migrate_server(id)
+          service.migrate_server(id)
         end
 
         def live_migrate(host, block_migration, disk_over_commit)
           requires :id
-          connection.live_migrate_server(id, host, block_migration, disk_over_commit)
+          service.live_migrate_server(id, host, block_migration, disk_over_commit)
         end
 
         def associate_address(floating_ip)
           requires :id
-          connection.associate_address id, floating_ip
+          service.associate_address id, floating_ip
         end
 
         def disassociate_address(floating_ip)
           requires :id
-          connection.disassociate_address id, floating_ip
+          service.disassociate_address id, floating_ip
         end
 
         def reset_vm_state(vm_state)
           requires :id
-          connection.reset_server_state id, vm_state
+          service.reset_server_state id, vm_state
         end
 
         def min_count=(new_min_count)
@@ -221,7 +222,7 @@ module Fog
         end
 
         def networks
-          connection.networks(:server => self)
+          service.networks(:server => self)
         end
 
         # TODO: Implement /os-volumes-boot support with 'block_device_mapping'
@@ -244,7 +245,7 @@ module Fog
             'os:scheduler_hints' => @os_scheduler_hints
           }
           options = options.reject {|key, value| value.nil?}
-          data = connection.create_server(name, image_ref, flavor_ref, options)
+          data = service.create_server(name, image_ref, flavor_ref, options)
           merge_attributes(data.body['server'])
           true
         end
diff --git a/lib/fog/openstack/models/compute/servers.rb b/lib/fog/openstack/models/compute/servers.rb
index f3579612b..db28b9908 100644
--- a/lib/fog/openstack/models/compute/servers.rb
+++ b/lib/fog/openstack/models/compute/servers.rb
@@ -18,7 +18,7 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          data = connection.list_servers_detail(filters).body['servers']
+          data = service.list_servers_detail(filters).body['servers']
           load(data)
         end
 
@@ -30,7 +30,7 @@ module Fog
         end
 
         def get(server_id)
-          if server = connection.get_server_details(server_id).body['server']
+          if server = service.get_server_details(server_id).body['server']
             new(server)
           end
         rescue Fog::Compute::OpenStack::NotFound
diff --git a/lib/fog/openstack/models/compute/snapshot.rb b/lib/fog/openstack/models/compute/snapshot.rb
index 2d40ac72b..52c301631 100644
--- a/lib/fog/openstack/models/compute/snapshot.rb
+++ b/lib/fog/openstack/models/compute/snapshot.rb
@@ -18,20 +18,21 @@ module Fog
 
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
         def save(force=false)
           requires :volume_id, :name, :description
-          data = connection.create_volume_snapshot(volume_id, name, description, force)
+          data = service.create_volume_snapshot(volume_id, name, description, force)
           merge_attributes(data.body['snapshot'])
           true
         end
 
         def destroy
           requires :id
-          connection.delete_snapshot(id)
+          service.delete_snapshot(id)
           true
         end
 
diff --git a/lib/fog/openstack/models/compute/snapshots.rb b/lib/fog/openstack/models/compute/snapshots.rb
index 84285e3f2..468712ea7 100644
--- a/lib/fog/openstack/models/compute/snapshots.rb
+++ b/lib/fog/openstack/models/compute/snapshots.rb
@@ -9,11 +9,11 @@ module Fog
         model Fog::Compute::OpenStack::Snapshot
 
         def all(detailed=true)
-          load(connection.list_snapshots(detailed).body['snapshots'])
+          load(service.list_snapshots(detailed).body['snapshots'])
         end
 
         def get(snapshot_id)
-          if snapshot = connection.get_snapshot_details(snapshot_id).body['snapshot']
+          if snapshot = service.get_snapshot_details(snapshot_id).body['snapshot']
             new(snapshot)
           end
         rescue Fog::Compute::OpenStack::NotFound
diff --git a/lib/fog/openstack/models/compute/tenant.rb b/lib/fog/openstack/models/compute/tenant.rb
index 6575e22a4..d78bd44f9 100644
--- a/lib/fog/openstack/models/compute/tenant.rb
+++ b/lib/fog/openstack/models/compute/tenant.rb
@@ -16,7 +16,7 @@ module Fog
 
         def usage(start_date, end_date)
           requires :id
-          connection.get_usage(self.id, start_date, end_date).body['tenant_usage']
+          service.get_usage(self.id, start_date, end_date).body['tenant_usage']
         end
       end # class Tenant
     end # class OpenStack
diff --git a/lib/fog/openstack/models/compute/tenants.rb b/lib/fog/openstack/models/compute/tenants.rb
index 0ec499dff..6299b96a9 100644
--- a/lib/fog/openstack/models/compute/tenants.rb
+++ b/lib/fog/openstack/models/compute/tenants.rb
@@ -8,11 +8,11 @@ module Fog
         model Fog::Compute::OpenStack::Tenant
 
         def all
-          load(connection.list_tenants.body['tenants'])
+          load(service.list_tenants.body['tenants'])
         end
 
         def usages(start_date = nil, end_date = nil, details = false)
-          connection.list_usages(start_date, end_date, details).body['tenant_usages']
+          service.list_usages(start_date, end_date, details).body['tenant_usages']
         end
 
         def find_by_id(id)
diff --git a/lib/fog/openstack/models/compute/volume.rb b/lib/fog/openstack/models/compute/volume.rb
index de09e469b..a838f7dc8 100644
--- a/lib/fog/openstack/models/compute/volume.rb
+++ b/lib/fog/openstack/models/compute/volume.rb
@@ -21,33 +21,34 @@ module Fog
 
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
         def save
           requires :name, :description, :size
-          data = connection.create_volume(name, description, size, attributes)
+          data = service.create_volume(name, description, size, attributes)
           merge_attributes(data.body['volume'])
           true
         end
 
         def destroy
           requires :id
-          connection.delete_volume(id)
+          service.delete_volume(id)
           true
         end
 
         def attach(server_id, name)
           requires :id
-          data = connection.attach_volume(id, server_id, name)
+          data = service.attach_volume(id, server_id, name)
           merge_attributes(:attachments => attachments << data.body['volumeAttachment'])
           true
         end
 
         def detach(server_id, attachment_id)
           requires :id
-          connection.detach_volume(server_id, attachment_id)
+          service.detach_volume(server_id, attachment_id)
           true
         end
       end
diff --git a/lib/fog/openstack/models/compute/volumes.rb b/lib/fog/openstack/models/compute/volumes.rb
index b84f383b2..9a83b1a3c 100644
--- a/lib/fog/openstack/models/compute/volumes.rb
+++ b/lib/fog/openstack/models/compute/volumes.rb
@@ -9,11 +9,11 @@ module Fog
         model Fog::Compute::OpenStack::Volume
 
         def all(detailed=true)
-          load(connection.list_volumes(detailed).body['volumes'])
+          load(service.list_volumes(detailed).body['volumes'])
         end
 
         def get(volume_id)
-          if volume = connection.get_volume_details(volume_id).body['volume']
+          if volume = service.get_volume_details(volume_id).body['volume']
             new(volume)
           end
         rescue Fog::Compute::OpenStack::NotFound
diff --git a/lib/fog/openstack/models/identity/ec2_credential.rb b/lib/fog/openstack/models/identity/ec2_credential.rb
index 245f15e64..d203a5908 100644
--- a/lib/fog/openstack/models/identity/ec2_credential.rb
+++ b/lib/fog/openstack/models/identity/ec2_credential.rb
@@ -11,14 +11,15 @@ module Fog
         attribute :user_id
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
         def destroy
           requires :access
           requires :user_id
-          connection.delete_ec2_credential user_id, access
+          service.delete_ec2_credential user_id, access
           true
         end
 
@@ -31,7 +32,7 @@ module Fog
 
           requires :user_id, :tenant_id
 
-          data = connection.create_ec2_credential user_id, tenant_id
+          data = service.create_ec2_credential user_id, tenant_id
 
           merge_attributes(data.body['credential'])
 
diff --git a/lib/fog/openstack/models/identity/ec2_credentials.rb b/lib/fog/openstack/models/identity/ec2_credentials.rb
index 4dc3321d8..b5676c0a3 100644
--- a/lib/fog/openstack/models/identity/ec2_credentials.rb
+++ b/lib/fog/openstack/models/identity/ec2_credentials.rb
@@ -12,7 +12,7 @@ module Fog
         def all
           user_id = user ? user.id : nil
 
-          ec2_credentials = connection.list_ec2_credentials(user_id)
+          ec2_credentials = service.list_ec2_credentials(user_id)
 
           load(ec2_credentials.body['credentials'])
         end
@@ -38,9 +38,9 @@ module Fog
             self.find { |ec2_credential| ec2_credential.access == access_key }
 
           unless ec2_credential then
-            response = connection.get_ec2_credential(user_id, access_key)
+            response = service.get_ec2_credential(user_id, access_key)
             body = response.body['credential']
-            body = body.merge 'connection' => connection
+            body = body.merge 'service' => service
 
             ec2_credential = Fog::Identity::OpenStack::EC2Credential.new(body)
           end
diff --git a/lib/fog/openstack/models/identity/role.rb b/lib/fog/openstack/models/identity/role.rb
index 640210250..caaaf39a9 100644
--- a/lib/fog/openstack/models/identity/role.rb
+++ b/lib/fog/openstack/models/identity/role.rb
@@ -9,14 +9,14 @@ module Fog
 
         def save
           requires :name
-          data = connection.create_role(name)
+          data = service.create_role(name)
           merge_attributes(data.body['role'])
           true
         end
 
         def destroy
           requires :id
-          connection.delete_role(id)
+          service.delete_role(id)
           true
         end
 
@@ -35,9 +35,9 @@ module Fog
           tenant_id = get_id(tenant)
           case ops
           when :add
-            connection.create_user_role(tenant_id, user_id, id).status == 200
+            service.create_user_role(tenant_id, user_id, id).status == 200
           when :remove
-            connection.delete_user_role(tenant_id, user_id, id).status == 200
+            service.delete_user_role(tenant_id, user_id, id).status == 200
           end
         end
 
diff --git a/lib/fog/openstack/models/identity/roles.rb b/lib/fog/openstack/models/identity/roles.rb
index 75c288b58..25a44f6c6 100644
--- a/lib/fog/openstack/models/identity/roles.rb
+++ b/lib/fog/openstack/models/identity/roles.rb
@@ -8,11 +8,11 @@ module Fog
         model Fog::Identity::OpenStack::Role
 
         def all
-          load(connection.list_roles.body['roles'])
+          load(service.list_roles.body['roles'])
         end
 
         def get(id)
-          connection.get_role(id)
+          service.get_role(id)
         end
 
       end
diff --git a/lib/fog/openstack/models/identity/tenant.rb b/lib/fog/openstack/models/identity/tenant.rb
index b16cadc6d..acdea9299 100644
--- a/lib/fog/openstack/models/identity/tenant.rb
+++ b/lib/fog/openstack/models/identity/tenant.rb
@@ -15,26 +15,26 @@ module Fog
         end
 
         def roles_for(user)
-          connection.roles(
+          service.roles(
             :tenant => self,
             :user   => user)
         end
 
         def users
           requires :id
-          connection.users(:tenant_id => self.id)
+          service.users(:tenant_id => self.id)
         end
 
         def destroy
           requires :id
-          connection.delete_tenant(self.id)
+          service.delete_tenant(self.id)
           true
         end
 
         def update(attr = nil)
           requires :id
           merge_attributes(
-            connection.update_tenant(self.id, attr || attributes).body['tenant'])
+            service.update_tenant(self.id, attr || attributes).body['tenant'])
           self
         end
 
@@ -45,16 +45,16 @@ module Fog
 
         def create
           merge_attributes(
-            connection.create_tenant(attributes).body['tenant'])
+            service.create_tenant(attributes).body['tenant'])
           self
         end
 
         def grant_user_role(user_id, role_id)
-          connection.add_user_to_tenant(self.id, user_id, role_id)
+          service.add_user_to_tenant(self.id, user_id, role_id)
         end
 
         def revoke_user_role(user_id, role_id)
-          connection.remove_user_from_tenant(self.id, user_id, role_id)
+          service.remove_user_from_tenant(self.id, user_id, role_id)
         end
       end # class Tenant
     end # class OpenStack
diff --git a/lib/fog/openstack/models/identity/tenants.rb b/lib/fog/openstack/models/identity/tenants.rb
index 6fc3454e5..5d67e5a6d 100644
--- a/lib/fog/openstack/models/identity/tenants.rb
+++ b/lib/fog/openstack/models/identity/tenants.rb
@@ -8,15 +8,15 @@ module Fog
         model Fog::Identity::OpenStack::Tenant
 
         def all
-          load(connection.list_tenants.body['tenants'])
+          load(service.list_tenants.body['tenants'])
         end
 
         def find_by_id(id)
           cached_tenant = self.find {|tenant| tenant.id == id}
           return cached_tenant if cached_tenant
-          tenant_hash = connection.get_tenant(id).body['tenant']
+          tenant_hash = service.get_tenant(id).body['tenant']
           Fog::Identity::OpenStack::Tenant.new(
-            tenant_hash.merge(:connection => connection))
+            tenant_hash.merge(:service => service))
         end
 
         def destroy(id)
diff --git a/lib/fog/openstack/models/identity/user.rb b/lib/fog/openstack/models/identity/user.rb
index b75843ef0..55407b44b 100644
--- a/lib/fog/openstack/models/identity/user.rb
+++ b/lib/fog/openstack/models/identity/user.rb
@@ -15,20 +15,21 @@ module Fog
         attr_accessor :email, :name, :tenant_id, :enabled, :password
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
         def ec2_credentials
           requires :id
-          connection.ec2_credentials(:user => self)
+          service.ec2_credentials(:user => self)
         end
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :name, :tenant_id, :password
           enabled = true if enabled.nil?
-          data = connection.create_user(name, password, email, tenant_id, enabled)
+          data = service.create_user(name, password, email, tenant_id, enabled)
           merge_attributes(data.body['user'])
           true
         end
@@ -36,7 +37,7 @@ module Fog
         def update(options = {})
           requires :id
           options.merge('id' => id)
-          response = connection.update_user(id, options)
+          response = service.update_user(id, options)
           true
         end
 
@@ -55,12 +56,12 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_user(id)
+          service.delete_user(id)
           true
         end
 
         def roles(tenant_id = self.tenant_id)
-          connection.list_roles_for_user_on_tenant(tenant_id, self.id).body['roles']
+          service.list_roles_for_user_on_tenant(tenant_id, self.id).body['roles']
         end
       end # class User
     end # class OpenStack
diff --git a/lib/fog/openstack/models/identity/users.rb b/lib/fog/openstack/models/identity/users.rb
index 0a16a1168..209de7620 100644
--- a/lib/fog/openstack/models/identity/users.rb
+++ b/lib/fog/openstack/models/identity/users.rb
@@ -10,14 +10,14 @@ module Fog
         attribute :tenant_id
 
         def all
-          load(connection.list_users(tenant_id).body['users'])
+          load(service.list_users(tenant_id).body['users'])
         end
 
         def find_by_id(id)
           self.find {|user| user.id == id} ||
             Fog::Identity::OpenStack::User.new(
-              connection.get_user_by_id(id).body['user'].merge(
-                'connection' => connection
+              service.get_user_by_id(id).body['user'].merge(
+                'service' => service
               )
             )
         end
diff --git a/lib/fog/openstack/models/image/image.rb b/lib/fog/openstack/models/image/image.rb
index 0c1943290..a6636203e 100644
--- a/lib/fog/openstack/models/image/image.rb
+++ b/lib/fog/openstack/models/image/image.rb
@@ -32,7 +32,8 @@ module Fog
 
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
@@ -43,45 +44,45 @@ module Fog
 
         def create
           requires :name
-          merge_attributes(connection.create_image(self.attributes).body['image'])
+          merge_attributes(service.create_image(self.attributes).body['image'])
           self
         end
 
         def update
           requires :name
-          merge_attributes(connection.update_image(self.attributes).body['image'])
+          merge_attributes(service.update_image(self.attributes).body['image'])
           self
         end
 
         def destroy
           requires :id
-          connection.delete_image(self.id)
+          service.delete_image(self.id)
           true
         end
 
         def add_member(member_id)
           requires :id
-          connection.add_member_to_image(self.id, member_id)
+          service.add_member_to_image(self.id, member_id)
         end
 
         def remove_member(member_id)
           requires :id
-          connection.remove_member_from_image(self.id, member_id)
+          service.remove_member_from_image(self.id, member_id)
         end
 
         def update_members(members)
           requires :id
-          connection.update_image_members(self.id, members)
+          service.update_image_members(self.id, members)
         end
 
         def members
           requires :id
-          connection.get_image_members(self.id).body['members']
+          service.get_image_members(self.id).body['members']
         end
 
         def metadata
           requires :id
-          connection.get_image(self.id).headers
+          service.get_image(self.id).headers
         end
 
       end
diff --git a/lib/fog/openstack/models/image/images.rb b/lib/fog/openstack/models/image/images.rb
index 4df75afe4..cf88f3c4a 100644
--- a/lib/fog/openstack/models/image/images.rb
+++ b/lib/fog/openstack/models/image/images.rb
@@ -8,11 +8,11 @@ module Fog
         model Fog::Image::OpenStack::Image
 
         def all
-          load(connection.list_public_images_detailed.body['images'])
+          load(service.list_public_images_detailed.body['images'])
         end
 
         def details
-          load(connection.list_public_images_detailed.body['images'])
+          load(service.list_public_images_detailed.body['images'])
         end
 
         def find_by_id(id)
@@ -20,12 +20,12 @@ module Fog
         end
 
         def public
-          images = load(connection.list_public_images_detailed.body['images'])
+          images = load(service.list_public_images_detailed.body['images'])
           images.delete_if{|image| image.is_public == false}
         end
 
         def private
-          images = load(connection.list_public_images_detailed.body['images'])
+          images = load(service.list_public_images_detailed.body['images'])
           images.delete_if{|image| image.is_public}
         end
 
@@ -36,7 +36,7 @@ module Fog
 
         def method_missing(method_sym, *arguments, &block)
           if method_sym.to_s =~ /^find_by_(.*)$/
-            load(connection.list_public_images_detailed($1 ,arguments.first).body['images'])
+            load(service.list_public_images_detailed($1 ,arguments.first).body['images'])
           else
             super
           end
@@ -52,7 +52,7 @@ module Fog
 
         def find_attribute(attribute,value)
           attribute = attribute.to_s.gsub("find_by_", "")
-          load(connection.list_public_images_detailed(attribute , value).body['images'])
+          load(service.list_public_images_detailed(attribute , value).body['images'])
         end
       end
     end
diff --git a/lib/fog/openstack/models/network/network.rb b/lib/fog/openstack/models/network/network.rb
index 615cd8590..5f4d7b2b9 100644
--- a/lib/fog/openstack/models/network/network.rb
+++ b/lib/fog/openstack/models/network/network.rb
@@ -14,7 +14,8 @@ module Fog
         attribute :tenant_id
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
@@ -23,24 +24,24 @@ module Fog
         end
 
         def create
-          merge_attributes(connection.create_network(self.attributes).body['network'])
+          merge_attributes(service.create_network(self.attributes).body['network'])
           self
         end
 
         def update
           requires :id
-          merge_attributes(connection.update_network(self.id,
+          merge_attributes(service.update_network(self.id,
                                                      self.attributes).body['network'])
           self
         end
 
         def destroy
           requires :id
-          connection.delete_network(self.id)
+          service.delete_network(self.id)
           true
         end
 
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/openstack/models/network/networks.rb b/lib/fog/openstack/models/network/networks.rb
index 11979963f..f6d0bc75d 100644
--- a/lib/fog/openstack/models/network/networks.rb
+++ b/lib/fog/openstack/models/network/networks.rb
@@ -17,11 +17,11 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          load(connection.list_networks(filters).body['networks'])
+          load(service.list_networks(filters).body['networks'])
         end
 
         def get(network_id)
-          if network = connection.get_network(network_id).body['network']
+          if network = service.get_network(network_id).body['network']
             new(network)
           end
         rescue Fog::Network::OpenStack::NotFound
@@ -31,4 +31,4 @@ module Fog
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/openstack/models/network/port.rb b/lib/fog/openstack/models/network/port.rb
index 8b4a2ddb0..62b95dd9c 100644
--- a/lib/fog/openstack/models/network/port.rb
+++ b/lib/fog/openstack/models/network/port.rb
@@ -17,7 +17,8 @@ module Fog
         attribute :tenant_id
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
@@ -28,25 +29,25 @@ module Fog
 
         def create
           requires :network_id
-          merge_attributes(connection.create_port(self.network_id,
+          merge_attributes(service.create_port(self.network_id,
                                                   self.attributes).body['port'])
           self
         end
 
         def update
           requires :id, :network_id
-          merge_attributes(connection.update_port(self.id,
+          merge_attributes(service.update_port(self.id,
                                                   self.attributes).body['port'])
           self
         end
 
         def destroy
           requires :id
-          connection.delete_port(self.id)
+          service.delete_port(self.id)
           true
         end
 
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/openstack/models/network/ports.rb b/lib/fog/openstack/models/network/ports.rb
index 6adc7f154..efac0ae19 100644
--- a/lib/fog/openstack/models/network/ports.rb
+++ b/lib/fog/openstack/models/network/ports.rb
@@ -17,11 +17,11 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          load(connection.list_ports(filters).body['ports'])
+          load(service.list_ports(filters).body['ports'])
         end
 
         def get(port_id)
-          if port = connection.get_port(port_id).body['port']
+          if port = service.get_port(port_id).body['port']
             new(port)
           end
         rescue Fog::Network::OpenStack::NotFound
@@ -31,4 +31,4 @@ module Fog
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/openstack/models/network/subnet.rb b/lib/fog/openstack/models/network/subnet.rb
index 9aad40f46..1557383fe 100644
--- a/lib/fog/openstack/models/network/subnet.rb
+++ b/lib/fog/openstack/models/network/subnet.rb
@@ -18,7 +18,8 @@ module Fog
         attribute :tenant_id
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
@@ -29,7 +30,7 @@ module Fog
 
         def create
           requires :network_id, :cidr, :ip_version
-          merge_attributes(connection.create_subnet(self.network_id,
+          merge_attributes(service.create_subnet(self.network_id,
                                                     self.cidr,
                                                     self.ip_version,
                                                     self.attributes).body['subnet'])
@@ -38,18 +39,18 @@ module Fog
 
         def update
           requires :id, :network_id, :cidr, :ip_version
-          merge_attributes(connection.update_subnet(self.id,
+          merge_attributes(service.update_subnet(self.id,
                                                     self.attributes).body['subnet'])
           self
         end
 
         def destroy
           requires :id
-          connection.delete_subnet(self.id)
+          service.delete_subnet(self.id)
           true
         end
 
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/openstack/models/network/subnets.rb b/lib/fog/openstack/models/network/subnets.rb
index fdca9a15f..9000f5d40 100644
--- a/lib/fog/openstack/models/network/subnets.rb
+++ b/lib/fog/openstack/models/network/subnets.rb
@@ -17,11 +17,11 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          load(connection.list_subnets(filters).body['subnets'])
+          load(service.list_subnets(filters).body['subnets'])
         end
 
         def get(subnet_id)
-          if subnet = connection.get_subnet(subnet_id).body['subnet']
+          if subnet = service.get_subnet(subnet_id).body['subnet']
             new(subnet)
           end
         rescue Fog::Network::OpenStack::NotFound
@@ -31,4 +31,4 @@ module Fog
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/openstack/models/volume/volume.rb b/lib/fog/openstack/models/volume/volume.rb
index 27047365c..6f81934bc 100644
--- a/lib/fog/openstack/models/volume/volume.rb
+++ b/lib/fog/openstack/models/volume/volume.rb
@@ -20,20 +20,21 @@ module Fog
 
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
         def save
           requires :display_name, :size
-          data = connection.create_volume(display_name, display_description, size, attributes)
+          data = service.create_volume(display_name, display_description, size, attributes)
           merge_attributes(data.body['volume'])
           true
         end
 
         def destroy
           requires :id
-          connection.delete_volume(id)
+          service.delete_volume(id)
           true
         end
 
diff --git a/lib/fog/openstack/models/volume/volumes.rb b/lib/fog/openstack/models/volume/volumes.rb
index 7bb8e6cda..47faf8a4f 100644
--- a/lib/fog/openstack/models/volume/volumes.rb
+++ b/lib/fog/openstack/models/volume/volumes.rb
@@ -9,11 +9,11 @@ module Fog
         model Fog::Volume::OpenStack::Volume
 
         def all(detailed=true)
-          load(connection.list_volumes(detailed).body['volumes'])
+          load(service.list_volumes(detailed).body['volumes'])
         end
 
         def find_by_id(volume_id)
-          if volume = connection.get_volume_details(volume_id).body['volume']
+          if volume = service.get_volume_details(volume_id).body['volume']
             new(volume)
           end
         rescue Fog::Volume::OpenStack::NotFound
diff --git a/lib/fog/ovirt/models/compute/cluster.rb b/lib/fog/ovirt/models/compute/cluster.rb
index 815a9ece9..e5ce654e6 100644
--- a/lib/fog/ovirt/models/compute/cluster.rb
+++ b/lib/fog/ovirt/models/compute/cluster.rb
@@ -10,7 +10,7 @@ module Fog
         attribute :raw
 
         def networks
-          connection.list_networks(id)
+          service.list_networks(id)
         end
 
         def to_s
diff --git a/lib/fog/ovirt/models/compute/clusters.rb b/lib/fog/ovirt/models/compute/clusters.rb
index 41fc5c63c..c6d6b9f94 100644
--- a/lib/fog/ovirt/models/compute/clusters.rb
+++ b/lib/fog/ovirt/models/compute/clusters.rb
@@ -10,11 +10,11 @@ module Fog
         model Fog::Compute::Ovirt::Cluster
 
         def all(filters = {})
-          load connection.list_clusters(filters)
+          load service.list_clusters(filters)
         end
 
         def get(id)
-          new connection.get_cluster(id)
+          new service.get_cluster(id)
         end
 
       end
diff --git a/lib/fog/ovirt/models/compute/interfaces.rb b/lib/fog/ovirt/models/compute/interfaces.rb
index c663e3a7b..982328273 100644
--- a/lib/fog/ovirt/models/compute/interfaces.rb
+++ b/lib/fog/ovirt/models/compute/interfaces.rb
@@ -14,16 +14,16 @@ module Fog
         def all(filters = {})
           requires :vm
           if vm.is_a? Fog::Compute::Ovirt::Server
-            load connection.list_vm_interfaces(vm.id)
+            load service.list_vm_interfaces(vm.id)
           elsif vm.is_a? Fog::Compute::Ovirt::Template
-            load connection.list_template_interfaces(vm.id)
+            load service.list_template_interfaces(vm.id)
           else
             raise 'interfaces should have vm or template'
           end
         end
 
         def get(id)
-          new connection.get_interface(id)
+          new service.get_interface(id)
         end
 
      end
diff --git a/lib/fog/ovirt/models/compute/server.rb b/lib/fog/ovirt/models/compute/server.rb
index 162889ad7..5fb902cc4 100644
--- a/lib/fog/ovirt/models/compute/server.rb
+++ b/lib/fog/ovirt/models/compute/server.rb
@@ -46,51 +46,51 @@ module Fog
 
         def interfaces
           attributes[:interfaces] ||= id.nil? ? [] : Fog::Compute::Ovirt::Interfaces.new(
-              :connection => connection,
+              :service => service,
               :vm => self
           )
         end
 
         def add_interface attrs
           wait_for { stopped? } if attrs[:blocking]
-          connection.add_interface(id, attrs)
+          service.add_interface(id, attrs)
         end
 
         def update_interface attrs
           wait_for { stopped? } if attrs[:blocking]
-          connection.update_interface(id, attrs)
+          service.update_interface(id, attrs)
         end
 
         def destroy_interface attrs
           wait_for { stopped? } if attrs[:blocking]
-          connection.destroy_interface(id, attrs)
+          service.destroy_interface(id, attrs)
         end
 
         def volumes
           attributes[:volumes] ||= id.nil? ? [] : Fog::Compute::Ovirt::Volumes.new(
-              :connection => connection,
+              :service => service,
               :vm => self
           )
         end
 
         def add_volume attrs
           wait_for { stopped? } if attrs[:blocking]
-          connection.add_volume(id, attrs)
+          service.add_volume(id, attrs)
         end
 
         def destroy_volume attrs
           wait_for { stopped? } if attrs[:blocking]
-          connection.destroy_volume(id, attrs)
+          service.destroy_volume(id, attrs)
         end
 
         def start(options = {})
           wait_for { stopped? } if options[:blocking]
-          connection.vm_action(:id =>id, :action => :start)
+          service.vm_action(:id =>id, :action => :start)
           reload
         end
 
         def stop(options = {})
-          connection.vm_action(:id =>id, :action => :stop)
+          service.vm_action(:id =>id, :action => :stop)
           reload
         end
 
@@ -100,26 +100,26 @@ module Fog
         end
 
         def suspend(options = {})
-          connection.vm_action(:id =>id, :action => :suspend)
+          service.vm_action(:id =>id, :action => :suspend)
           reload
         end
 
         def destroy(options = {})
           (stop unless stopped?) rescue nil #ignore failure, destroy the machine anyway.
           wait_for { stopped? }
-          connection.destroy_vm(:id => id)
+          service.destroy_vm(:id => id)
         end
 
         def ticket(options = {})
           raise "Can not set console ticket, Server is not ready. Server status: #{status}" unless ready?
-          connection.vm_ticket(id, options)
+          service.vm_ticket(id, options)
         end
 
         def save
           if persisted?
-            connection.update_vm(attributes)
+            service.update_vm(attributes)
           else
-            self.id = connection.create_vm(attributes).id
+            self.id = service.create_vm(attributes).id
           end
           reload
         end
diff --git a/lib/fog/ovirt/models/compute/servers.rb b/lib/fog/ovirt/models/compute/servers.rb
index a0232ee81..2f5e09537 100644
--- a/lib/fog/ovirt/models/compute/servers.rb
+++ b/lib/fog/ovirt/models/compute/servers.rb
@@ -10,11 +10,11 @@ module Fog
         model Fog::Compute::Ovirt::Server
 
         def all(filters = {})
-          load connection.list_virtual_machines(filters)
+          load service.list_virtual_machines(filters)
         end
 
         def get(id)
-          new connection.get_virtual_machine(id)
+          new service.get_virtual_machine(id)
         end
 
         def bootstrap(new_attributes = {})
diff --git a/lib/fog/ovirt/models/compute/template.rb b/lib/fog/ovirt/models/compute/template.rb
index 239cae5c3..cfe56f9ed 100644
--- a/lib/fog/ovirt/models/compute/template.rb
+++ b/lib/fog/ovirt/models/compute/template.rb
@@ -24,14 +24,14 @@ module Fog
 
         def interfaces
           attributes[:interfaces] ||= id.nil? ? [] : Fog::Compute::Ovirt::Interfaces.new(
-              :connection => connection,
+              :service => service,
               :vm => self
           )
         end
 
         def volumes
           attributes[:volumes] ||= id.nil? ? [] : Fog::Compute::Ovirt::Volumes.new(
-              :connection => connection,
+              :service => service,
               :vm => self
           )
         end
@@ -41,12 +41,12 @@ module Fog
         end
 
         def destroy(options = {})
-          connection.client.destroy_template(id)
+          service.client.destroy_template(id)
         end
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
-          connection.client.create_template(attributes)
+          service.client.create_template(attributes)
         end
 
         def to_s
diff --git a/lib/fog/ovirt/models/compute/templates.rb b/lib/fog/ovirt/models/compute/templates.rb
index 6a6bf906a..389159e56 100644
--- a/lib/fog/ovirt/models/compute/templates.rb
+++ b/lib/fog/ovirt/models/compute/templates.rb
@@ -10,11 +10,11 @@ module Fog
         model Fog::Compute::Ovirt::Template
 
         def all(filters = {})
-          load connection.list_templates(filters)
+          load service.list_templates(filters)
         end
 
         def get(id)
-          new connection.get_template(id)
+          new service.get_template(id)
         end
 
       end
diff --git a/lib/fog/ovirt/models/compute/volumes.rb b/lib/fog/ovirt/models/compute/volumes.rb
index 42fd894aa..1d1d9b14f 100644
--- a/lib/fog/ovirt/models/compute/volumes.rb
+++ b/lib/fog/ovirt/models/compute/volumes.rb
@@ -14,16 +14,16 @@ module Fog
         def all(filters = {})
           requires :vm
           if vm.is_a? Fog::Compute::Ovirt::Server
-            load connection.list_vm_volumes(vm.id)
+            load service.list_vm_volumes(vm.id)
           elsif vm.is_a? Fog::Compute::Ovirt::Template
-            load connection.list_template_volumes(vm.id)
+            load service.list_template_volumes(vm.id)
           else
             raise 'volumes should have vm or template'
           end
         end
 
         def get(id)
-          new connection.get_volume(id)
+          new service.get_volume(id)
         end
 
      end
diff --git a/lib/fog/rackspace/models/block_storage/snapshot.rb b/lib/fog/rackspace/models/block_storage/snapshot.rb
index 2d3af9bd5..d98f3a550 100644
--- a/lib/fog/rackspace/models/block_storage/snapshot.rb
+++ b/lib/fog/rackspace/models/block_storage/snapshot.rb
@@ -27,7 +27,7 @@ module Fog
         def save(force = false)
           requires :volume_id
           raise IdentifierTaken.new('Resaving may cause a duplicate snapshot to be created') if persisted?
-          data = connection.create_snapshot(volume_id, {
+          data = service.create_snapshot(volume_id, {
             :display_name => display_name,
             :display_description => display_description,
             :force => force
@@ -38,7 +38,7 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_snapshot(identity)
+          service.delete_snapshot(identity)
           true
         end
       end
diff --git a/lib/fog/rackspace/models/block_storage/snapshots.rb b/lib/fog/rackspace/models/block_storage/snapshots.rb
index b25d99bc3..2e2385210 100644
--- a/lib/fog/rackspace/models/block_storage/snapshots.rb
+++ b/lib/fog/rackspace/models/block_storage/snapshots.rb
@@ -9,12 +9,12 @@ module Fog
         model Fog::Rackspace::BlockStorage::Snapshot
 
         def all
-          data = connection.list_snapshots.body['snapshots']
+          data = service.list_snapshots.body['snapshots']
           load(data)
         end
 
         def get(snapshot_id)
-          data = connection.get_snapshot(snapshot_id).body['snapshot']
+          data = service.get_snapshot(snapshot_id).body['snapshot']
           new(data)
         rescue Fog::Rackspace::BlockStorage::NotFound
           nil
diff --git a/lib/fog/rackspace/models/block_storage/volume.rb b/lib/fog/rackspace/models/block_storage/volume.rb
index 1e11dcb51..5398c507a 100644
--- a/lib/fog/rackspace/models/block_storage/volume.rb
+++ b/lib/fog/rackspace/models/block_storage/volume.rb
@@ -32,18 +32,18 @@ module Fog
         end
 
         def snapshots
-          connection.snapshots.select { |s| s.volume_id == identity }
+          service.snapshots.select { |s| s.volume_id == identity }
         end
-        
+
         def create_snapshot(options={})
           requires :identity
-          connection.snapshots.create(options.merge(:volume_id => identity))
+          service.snapshots.create(options.merge(:volume_id => identity))
         end
 
         def save
           requires :size
           raise IdentifierTaken.new('Resaving may cause a duplicate volume to be created') if persisted?
-          data = connection.create_volume(size, {
+          data = service.create_volume(size, {
             :display_name => display_name,
             :display_description => display_description,
             :volume_type => volume_type,
@@ -55,7 +55,7 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_volume(identity)
+          service.delete_volume(identity)
           true
         end
       end
diff --git a/lib/fog/rackspace/models/block_storage/volume_types.rb b/lib/fog/rackspace/models/block_storage/volume_types.rb
index ca1dfa5aa..fb5290d0d 100644
--- a/lib/fog/rackspace/models/block_storage/volume_types.rb
+++ b/lib/fog/rackspace/models/block_storage/volume_types.rb
@@ -9,16 +9,16 @@ module Fog
         model Fog::Rackspace::BlockStorage::VolumeType
 
         def all
-          data = connection.list_volume_types.body['volume_types']
+          data = service.list_volume_types.body['volume_types']
           load(data)
         end
 
         def get(volume_type_id)
-          data = connection.get_volume_type(volume_type_id).body['volume_type']
+          data = service.get_volume_type(volume_type_id).body['volume_type']
           new(data)
         rescue Fog::Rackspace::BlockStorage::NotFound
           nil
-        end   
+        end
       end
     end
   end
diff --git a/lib/fog/rackspace/models/block_storage/volumes.rb b/lib/fog/rackspace/models/block_storage/volumes.rb
index 0a246d071..d8c3c29ad 100644
--- a/lib/fog/rackspace/models/block_storage/volumes.rb
+++ b/lib/fog/rackspace/models/block_storage/volumes.rb
@@ -9,12 +9,12 @@ module Fog
         model Fog::Rackspace::BlockStorage::Volume
 
         def all
-          data = connection.list_volumes.body['volumes']
+          data = service.list_volumes.body['volumes']
           load(data)
         end
 
         def get(volume_id)
-          data = connection.get_volume(volume_id).body['volume']
+          data = service.get_volume(volume_id).body['volume']
           new(data)
         rescue Fog::Rackspace::BlockStorage::NotFound
           nil
diff --git a/lib/fog/rackspace/models/compute/flavors.rb b/lib/fog/rackspace/models/compute/flavors.rb
index e7b72242c..301a0bca7 100644
--- a/lib/fog/rackspace/models/compute/flavors.rb
+++ b/lib/fog/rackspace/models/compute/flavors.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Rackspace::Flavor
 
         def all
-          data = connection.list_flavors_detail.body['flavors']
+          data = service.list_flavors_detail.body['flavors']
           load(data)
         end
 
         def get(flavor_id)
-          data = connection.get_flavor_details(flavor_id).body['flavor']
+          data = service.get_flavor_details(flavor_id).body['flavor']
           new(data)
         rescue Fog::Compute::Rackspace::NotFound
           nil
diff --git a/lib/fog/rackspace/models/compute/image.rb b/lib/fog/rackspace/models/compute/image.rb
index dbe64d947..1e423b84e 100644
--- a/lib/fog/rackspace/models/compute/image.rb
+++ b/lib/fog/rackspace/models/compute/image.rb
@@ -24,7 +24,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.delete_image(id)
+          service.delete_image(id)
           true
         end
 
@@ -36,7 +36,7 @@ module Fog
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :server_id
 
-          data = connection.create_image(server_id, 'name' => name)
+          data = service.create_image(server_id, 'name' => name)
           merge_attributes(data.body['image'])
           true
         end
diff --git a/lib/fog/rackspace/models/compute/images.rb b/lib/fog/rackspace/models/compute/images.rb
index d00862fa9..e2c18cc55 100644
--- a/lib/fog/rackspace/models/compute/images.rb
+++ b/lib/fog/rackspace/models/compute/images.rb
@@ -12,7 +12,7 @@ module Fog
         attribute :server
 
         def all
-          data = connection.list_images_detail.body['images']
+          data = service.list_images_detail.body['images']
           models = load(data)
           if server
             self.replace(self.select {|image| image.server_id == server.id})
@@ -22,7 +22,7 @@ module Fog
         end
 
         def get(image_id)
-          data = connection.get_image_details(image_id).body['image']
+          data = service.get_image_details(image_id).body['image']
           new(data)
         rescue Fog::Compute::Rackspace::NotFound
           nil
diff --git a/lib/fog/rackspace/models/compute/server.rb b/lib/fog/rackspace/models/compute/server.rb
index 1d61bcba1..e42efe373 100644
--- a/lib/fog/rackspace/models/compute/server.rb
+++ b/lib/fog/rackspace/models/compute/server.rb
@@ -28,23 +28,23 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_server(id)
+          service.delete_server(id)
           true
         end
 
         def flavor
           requires :flavor_id
-          connection.flavors.get(flavor_id)
+          service.flavors.get(flavor_id)
         end
 
         def image
           requires :image_id
-          connection.images.get(image_id)
+          service.images.get(image_id)
         end
 
         def images
           requires :id
-          connection.images(:server => self)
+          service.images(:server => self)
         end
 
         def private_ip_address
@@ -61,7 +61,7 @@ module Fog
 
         def reboot(type = 'SOFT')
           requires :id
-          connection.reboot_server(id, type)
+          service.reboot_server(id, type)
           true
         end
 
@@ -74,7 +74,7 @@ module Fog
             'personality' => personality
           }
           options = options.reject {|key, value| value.nil?}
-          data = connection.create_server(flavor_id, image_id, options)
+          data = service.create_server(flavor_id, image_id, options)
           merge_attributes(data.body['server'])
           true
         end
diff --git a/lib/fog/rackspace/models/compute/servers.rb b/lib/fog/rackspace/models/compute/servers.rb
index 4214913cc..907fff422 100644
--- a/lib/fog/rackspace/models/compute/servers.rb
+++ b/lib/fog/rackspace/models/compute/servers.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Rackspace::Server
 
         def all
-          data = connection.list_servers_detail.body['servers']
+          data = service.list_servers_detail.body['servers']
           load(data)
         end
 
@@ -22,7 +22,7 @@ module Fog
         end
 
         def get(server_id)
-          if server = connection.get_server_details(server_id).body['server']
+          if server = service.get_server_details(server_id).body['server']
             new(server)
           end
         rescue Fog::Compute::Rackspace::NotFound
diff --git a/lib/fog/rackspace/models/compute_v2/attachment.rb b/lib/fog/rackspace/models/compute_v2/attachment.rb
index a6a3193da..d5d72d941 100644
--- a/lib/fog/rackspace/models/compute_v2/attachment.rb
+++ b/lib/fog/rackspace/models/compute_v2/attachment.rb
@@ -12,14 +12,14 @@ module Fog
 
         def save
           requires :server, :identity, :device
-          data = connection.attach_volume(server.identity, identity, device)
+          data = service.attach_volume(server.identity, identity, device)
           merge_attributes(data.body['volumeAttachment'])
           true
         end
 
         def destroy
           requires :server, :identity
-          connection.delete_attachment(server.identity, identity)
+          service.delete_attachment(server.identity, identity)
           true
         end
 
diff --git a/lib/fog/rackspace/models/compute_v2/attachments.rb b/lib/fog/rackspace/models/compute_v2/attachments.rb
index 88eb0297e..f98d3ff4a 100644
--- a/lib/fog/rackspace/models/compute_v2/attachments.rb
+++ b/lib/fog/rackspace/models/compute_v2/attachments.rb
@@ -11,12 +11,12 @@ module Fog
         attr_accessor :server
 
         def all
-          data = connection.list_attachments(server.id).body['volumeAttachments']
+          data = service.list_attachments(server.id).body['volumeAttachments']
           load(data)
         end
 
         def get(volume_id)
-          data = connection.get_attachment(server.id, volume_id).body['volumeAttachment']
+          data = service.get_attachment(server.id, volume_id).body['volumeAttachment']
           data && new(data)
         end
       end
diff --git a/lib/fog/rackspace/models/compute_v2/flavors.rb b/lib/fog/rackspace/models/compute_v2/flavors.rb
index fd684caf5..bb56ae439 100644
--- a/lib/fog/rackspace/models/compute_v2/flavors.rb
+++ b/lib/fog/rackspace/models/compute_v2/flavors.rb
@@ -9,12 +9,12 @@ module Fog
         model Fog::Compute::RackspaceV2::Flavor
 
         def all
-          data = connection.list_flavors.body['flavors']
+          data = service.list_flavors.body['flavors']
           load(data)
         end
 
         def get(flavor_id)
-          data = connection.get_flavor(flavor_id).body['flavor']
+          data = service.get_flavor(flavor_id).body['flavor']
           new(data)
         rescue Fog::Compute::RackspaceV2::NotFound
           nil
diff --git a/lib/fog/rackspace/models/compute_v2/image.rb b/lib/fog/rackspace/models/compute_v2/image.rb
index b8b674b67..f5fa5c707 100644
--- a/lib/fog/rackspace/models/compute_v2/image.rb
+++ b/lib/fog/rackspace/models/compute_v2/image.rb
@@ -52,7 +52,7 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_image(identity)
+          service.delete_image(identity)
         end
       end
     end
diff --git a/lib/fog/rackspace/models/compute_v2/images.rb b/lib/fog/rackspace/models/compute_v2/images.rb
index 87586e546..650be6a83 100644
--- a/lib/fog/rackspace/models/compute_v2/images.rb
+++ b/lib/fog/rackspace/models/compute_v2/images.rb
@@ -9,12 +9,12 @@ module Fog
         model Fog::Compute::RackspaceV2::Image
 
         def all
-          data = connection.list_images.body['images']
+          data = service.list_images.body['images']
           load(data)
         end
 
         def get(image_id)
-          data = connection.get_image(image_id).body['image']
+          data = service.get_image(image_id).body['image']
           new(data)
         rescue Fog::Compute::RackspaceV2::NotFound
           nil
diff --git a/lib/fog/rackspace/models/compute_v2/server.rb b/lib/fog/rackspace/models/compute_v2/server.rb
index 6a6db2643..36a6bf669 100644
--- a/lib/fog/rackspace/models/compute_v2/server.rb
+++ b/lib/fog/rackspace/models/compute_v2/server.rb
@@ -46,7 +46,7 @@ module Fog
         
         attr_reader :password          
         def initialize(attributes={})
-          @connection = attributes[:connection]
+          @service = attributes[:service]
           super
         end  
         
@@ -54,7 +54,7 @@ module Fog
           raise "Please save server before accessing metadata" unless identity
           @metadata ||= begin
             Fog::Compute::RackspaceV2::Metadata.new({
-              :connection => connection,
+              :service => service,
               :parent => self
             })
           end
@@ -82,49 +82,49 @@ module Fog
           options[:metadata] = metadata unless @metadata.nil?
           options[:personality] = personality unless personality.nil?
 
-          data = connection.create_server(name, image_id, flavor_id, 1, 1, options)
+          data = service.create_server(name, image_id, flavor_id, 1, 1, options)
           merge_attributes(data.body['server'])
           true
         end
 
         def update
           requires :identity, :name
-          data = connection.update_server(identity, name)
+          data = service.update_server(identity, name)
           merge_attributes(data.body['server'])
           true
         end
 
         def destroy
           requires :identity
-          connection.delete_server(identity)
+          service.delete_server(identity)
           true
         end
 
         def flavor
           requires :flavor_id
-          @flavor ||= connection.flavors.get(flavor_id)
+          @flavor ||= service.flavors.get(flavor_id)
         end
 
         def image
           requires :image_id
-          @image ||= connection.images.get(image_id)
+          @image ||= service.images.get(image_id)
         end
-        
+
         def create_image(name, options = {})
           requires :identity
-          response = connection.create_image(identity, name, options)
-          response.headers["Location"].match(/\/([^\/]+$)/)[1] rescue nil          
+          response = service.create_image(identity, name, options)
+          response.headers["Location"].match(/\/([^\/]+$)/)[1] rescue nil
         end
 
         def attachments
           @attachments ||= begin
             Fog::Compute::RackspaceV2::Attachments.new({
-              :connection => connection,
+              :service => service,
               :server => self
             })
           end
         end
-        
+
         def private_ip_address
           addresses['private'].select{|a| a["version"] == 4}[0]["addr"]
         end
@@ -139,45 +139,45 @@ module Fog
 
         def reboot(type = 'SOFT')
           requires :identity
-          connection.reboot_server(identity, type)
+          service.reboot_server(identity, type)
           self.state = type == 'SOFT' ? REBOOT : HARD_REBOOT
           true
         end
 
         def resize(flavor_id)
           requires :identity
-          connection.resize_server(identity, flavor_id)
+          service.resize_server(identity, flavor_id)
           self.state = RESIZE
           true
         end
 
         def rebuild(image_id)
           requires :identity
-          connection.rebuild_server(identity, image_id)
+          service.rebuild_server(identity, image_id)
           self.state = REBUILD
           true
         end
 
         def confirm_resize
           requires :identity
-          connection.confirm_resize_server(identity)
+          service.confirm_resize_server(identity)
           true
         end
 
         def revert_resize
           requires :identity
-          connection.revert_resize_server(identity)
+          service.revert_resize_server(identity)
           true
         end
 
         def change_admin_password(password)
           requires :identity
-          connection.change_server_password(identity, password)
+          service.change_server_password(identity, password)
           self.state = PASSWORD
           @password = password
           true
         end
-        
+
         def setup(credentials = {})
           requires :public_ip_address, :identity, :public_key, :username
           Fog::SSH.new(public_ip_address, username, credentials).run([
diff --git a/lib/fog/rackspace/models/compute_v2/servers.rb b/lib/fog/rackspace/models/compute_v2/servers.rb
index ad4288e45..40d7c9cd1 100644
--- a/lib/fog/rackspace/models/compute_v2/servers.rb
+++ b/lib/fog/rackspace/models/compute_v2/servers.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::RackspaceV2::Server
 
         def all
-          data = connection.list_servers.body['servers']
+          data = service.list_servers.body['servers']
           load(data)
         end
 
@@ -22,7 +22,7 @@ module Fog
         end
 
         def get(server_id)
-          data = connection.get_server(server_id).body['server']
+          data = service.get_server(server_id).body['server']
           new(data)
         rescue Fog::Compute::RackspaceV2::NotFound
           nil
diff --git a/lib/fog/rackspace/models/databases/database.rb b/lib/fog/rackspace/models/databases/database.rb
index 2a6439a47..a9f277b9f 100644
--- a/lib/fog/rackspace/models/databases/database.rb
+++ b/lib/fog/rackspace/models/databases/database.rb
@@ -11,13 +11,13 @@ module Fog
 
         def save
           requires :identity, :instance
-          connection.create_database(instance.identity, identity, :character_set => character_set, :collate => collate)
+          service.create_database(instance.identity, identity, :character_set => character_set, :collate => collate)
           true
         end
 
         def destroy
           requires :identity, :instance
-          connection.delete_database(instance.identity, identity)
+          service.delete_database(instance.identity, identity)
           true
         end
 
diff --git a/lib/fog/rackspace/models/databases/databases.rb b/lib/fog/rackspace/models/databases/databases.rb
index 98f5e78d6..a3cc0760b 100644
--- a/lib/fog/rackspace/models/databases/databases.rb
+++ b/lib/fog/rackspace/models/databases/databases.rb
@@ -23,7 +23,7 @@ module Fog
 
         def retrieve_databases
           requires :instance
-          data = connection.list_databases(instance.id).body['databases']
+          data = service.list_databases(instance.id).body['databases']
         end
       end
     end
diff --git a/lib/fog/rackspace/models/databases/flavors.rb b/lib/fog/rackspace/models/databases/flavors.rb
index 6f2a61409..6cd938564 100644
--- a/lib/fog/rackspace/models/databases/flavors.rb
+++ b/lib/fog/rackspace/models/databases/flavors.rb
@@ -9,12 +9,12 @@ module Fog
         model Fog::Rackspace::Databases::Flavor
 
         def all
-          data = connection.list_flavors.body['flavors']
+          data = service.list_flavors.body['flavors']
           load(data)
         end
 
         def get(flavor_id)
-          data = connection.get_flavor(flavor_id).body['flavor']
+          data = service.get_flavor(flavor_id).body['flavor']
           new(data)
         rescue Fog::Rackspace::Databases::NotFound
           nil
diff --git a/lib/fog/rackspace/models/databases/instance.rb b/lib/fog/rackspace/models/databases/instance.rb
index d7f10940b..f10575a60 100644
--- a/lib/fog/rackspace/models/databases/instance.rb
+++ b/lib/fog/rackspace/models/databases/instance.rb
@@ -27,26 +27,26 @@ module Fog
 
         def save
           requires :name, :flavor_id, :volume_size
-          data = connection.create_instance(name, flavor_id, volume_size)
+          data = service.create_instance(name, flavor_id, volume_size)
           merge_attributes(data.body['instance'])
           true
         end
 
         def destroy
           requires :identity
-          connection.delete_instance(identity)
+          service.delete_instance(identity)
           true
         end
 
         def flavor
           requires :flavor_id
-          @flavor ||= connection.flavors.get(flavor_id)
+          @flavor ||= service.flavors.get(flavor_id)
         end
 
         def databases
           @databases ||= begin
             Fog::Rackspace::Databases::Databases.new({
-              :connection => connection,
+              :service => service,
               :instance => self
             })
           end
@@ -55,7 +55,7 @@ module Fog
         def users
           @users ||= begin
             Fog::Rackspace::Databases::Users.new({
-              :connection => connection,
+              :service => service,
               :instance => self
             })
           end
@@ -67,12 +67,12 @@ module Fog
 
         def root_user_enabled?
           requires :identity
-          connection.check_root_user(identity).body['rootEnabled']
+          service.check_root_user(identity).body['rootEnabled']
         end
 
         def enable_root_user
           requires :identity
-          data = connection.enable_root_user(identity).body['user']
+          data = service.enable_root_user(identity).body['user']
           @root_user = data['name']
           @root_password = data['password']
           true
@@ -80,21 +80,21 @@ module Fog
 
         def restart
           requires :identity
-          connection.restart_instance(identity)
+          service.restart_instance(identity)
           self.state = REBOOT
           true
         end
 
         def resize(flavor_id)
           requires :identity
-          connection.resize_instance(identity, flavor_id)
+          service.resize_instance(identity, flavor_id)
           self.state = RESIZE
           true
         end
 
         def resize_volume(volume_size)
           requires :identity
-          connection.resize_instance_volume(identity, volume_size)
+          service.resize_instance_volume(identity, volume_size)
           self.state = RESIZE
           true
         end
diff --git a/lib/fog/rackspace/models/databases/instances.rb b/lib/fog/rackspace/models/databases/instances.rb
index f146b91d3..31a75d5d1 100644
--- a/lib/fog/rackspace/models/databases/instances.rb
+++ b/lib/fog/rackspace/models/databases/instances.rb
@@ -9,12 +9,12 @@ module Fog
         model Fog::Rackspace::Databases::Instance
 
         def all
-          data = connection.list_instances.body['instances']
+          data = service.list_instances.body['instances']
           load(data)
         end
 
         def get(instance_id)
-          data = connection.get_instance(instance_id).body['instance']
+          data = service.get_instance(instance_id).body['instance']
           new(data)
         rescue Fog::Rackspace::Databases::NotFound
           nil
diff --git a/lib/fog/rackspace/models/databases/user.rb b/lib/fog/rackspace/models/databases/user.rb
index d39bed39c..f46744782 100644
--- a/lib/fog/rackspace/models/databases/user.rb
+++ b/lib/fog/rackspace/models/databases/user.rb
@@ -11,13 +11,13 @@ module Fog
 
         def save
           requires :identity, :instance, :password
-          connection.create_user(instance.identity, identity, password, :databases => databases)
+          service.create_user(instance.identity, identity, password, :databases => databases)
           true
         end
 
         def destroy
           requires :identity, :instance
-          connection.delete_user(instance.identity, identity)
+          service.delete_user(instance.identity, identity)
           true
         end
 
diff --git a/lib/fog/rackspace/models/databases/users.rb b/lib/fog/rackspace/models/databases/users.rb
index 7b72b5f66..ad37777a3 100644
--- a/lib/fog/rackspace/models/databases/users.rb
+++ b/lib/fog/rackspace/models/databases/users.rb
@@ -23,7 +23,7 @@ module Fog
 
         def retrieve_users
           requires :instance
-          data = connection.list_users(instance.identity).body['users']
+          data = service.list_users(instance.identity).body['users']
         end
       end
     end
diff --git a/lib/fog/rackspace/models/dns/callback.rb b/lib/fog/rackspace/models/dns/callback.rb
index 93a17b053..33c0c536f 100644
--- a/lib/fog/rackspace/models/dns/callback.rb
+++ b/lib/fog/rackspace/models/dns/callback.rb
@@ -10,7 +10,7 @@ module Fog
           retries = 5
           response = nil
           Fog.wait_for(timeout, interval) do
-            response = connection.callback job_id
+            response = service.callback job_id
             if response.body['status'] == 'COMPLETED'
               true
             elsif response.body['status'] == 'ERROR'
diff --git a/lib/fog/rackspace/models/dns/record.rb b/lib/fog/rackspace/models/dns/record.rb
index 8e9b80a7c..dafa462cf 100644
--- a/lib/fog/rackspace/models/dns/record.rb
+++ b/lib/fog/rackspace/models/dns/record.rb
@@ -24,7 +24,7 @@ module Fog
 
         def destroy
           requires :zone, :identity
-          wait_for_job connection.remove_record(@zone.identity, identity).body['jobId']
+          wait_for_job service.remove_record(@zone.identity, identity).body['jobId']
           true
         end
 
@@ -59,20 +59,20 @@ module Fog
             options[:priority] = priority
           end
 
-          response = wait_for_job connection.add_records(@zone.identity, [options]).body['jobId']
+          response = wait_for_job service.add_records(@zone.identity, [options]).body['jobId']
 
-          matching_record = response.body['response']['records'].find do |record| 
+          matching_record = response.body['response']['records'].find do |record|
             if ['A', 'AAAA'].include?(self.type.upcase)
               # If this is an A or AAAA record, match by normalized IP address value.
               (record['name'] == self.name) && (record['type'] == self.type) && (IPAddr.new(record['data']) == IPAddr.new(self.value))
             else
               # Other record types are matched by the raw value.
               (record['name'] == self.name) && (record['type'] == self.type) && (record['data'] == self.value)
-            end 
+            end
           end
-          
+
           merge_attributes(matching_record)
-          
+
           true
         end
 
@@ -86,7 +86,7 @@ module Fog
           options[:priority] = priority if priority
           options[:ttl] = ttl if ttl
 
-          wait_for_job connection.modify_record(@zone.identity, identity, options).body['jobId']
+          wait_for_job service.modify_record(@zone.identity, identity, options).body['jobId']
           true
         end
 
diff --git a/lib/fog/rackspace/models/dns/records.rb b/lib/fog/rackspace/models/dns/records.rb
index eccfc9eb6..f41dc1962 100644
--- a/lib/fog/rackspace/models/dns/records.rb
+++ b/lib/fog/rackspace/models/dns/records.rb
@@ -13,13 +13,13 @@ module Fog
 
         def all
           requires :zone
-          data = connection.list_records(zone.identity)
+          data = service.list_records(zone.identity)
           load(data.body['records'])
         end
 
         def get(record_id)
           requires :zone
-          data = connection.list_record_details(zone.identity, record_id).body
+          data = service.list_record_details(zone.identity, record_id).body
           new(data)
         #nil or empty string will trigger an argument error
         rescue ArgumentError
diff --git a/lib/fog/rackspace/models/dns/zone.rb b/lib/fog/rackspace/models/dns/zone.rb
index 928fc7a09..a1a0c8934 100644
--- a/lib/fog/rackspace/models/dns/zone.rb
+++ b/lib/fog/rackspace/models/dns/zone.rb
@@ -20,7 +20,7 @@ module Fog
         attribute :comment
 
         def destroy
-          response = connection.remove_domain(identity)
+          response = service.remove_domain(identity)
           wait_for_job response.body['jobId'], Fog.timeout
           true
         end
@@ -29,7 +29,7 @@ module Fog
           @records ||= begin
             Fog::DNS::Rackspace::Records.new(
               :zone       => self,
-              :connection => connection
+              :service => service
             )
           end
         end
@@ -49,7 +49,7 @@ module Fog
           requires :domain, :email
 
           data = { :name => domain, :email => email }
-          response = connection.create_domains([data])
+          response = service.create_domains([data])
 
           response = wait_for_job response.body['jobId']
           merge_attributes(response.body['response']['domains'].select {|domain| domain['name'] == self.domain}.first)
@@ -58,7 +58,7 @@ module Fog
         def update
           requires :ttl, :email
 
-          response = connection.modify_domain(identity, { :ttl => ttl, :comment => comment, :email => email})
+          response = service.modify_domain(identity, { :ttl => ttl, :comment => comment, :email => email})
           wait_for_job response.body['jobId']
         end
       end
diff --git a/lib/fog/rackspace/models/dns/zones.rb b/lib/fog/rackspace/models/dns/zones.rb
index 9b253d7fa..7ea7bfd8b 100644
--- a/lib/fog/rackspace/models/dns/zones.rb
+++ b/lib/fog/rackspace/models/dns/zones.rb
@@ -10,7 +10,7 @@ module Fog
 
         def all
           clear
-          data = connection.list_domains.body['domains']
+          data = service.list_domains.body['domains']
           load(data)
         end
 
@@ -19,7 +19,7 @@ module Fog
             return nil
           end
 
-          data = connection.list_domain_details(zone_id).body
+          data = service.list_domain_details(zone_id).body
           new(data)
         rescue Fog::Rackspace::Errors::NotFound
           nil
diff --git a/lib/fog/rackspace/models/identity/credentials.rb b/lib/fog/rackspace/models/identity/credentials.rb
index cfd9f23c8..b1c38c714 100644
--- a/lib/fog/rackspace/models/identity/credentials.rb
+++ b/lib/fog/rackspace/models/identity/credentials.rb
@@ -24,7 +24,7 @@ module Fog
         private
 
         def retrieve_credentials
-          data = connection.list_credentials(user.identity).body['credentials']
+          data = service.list_credentials(user.identity).body['credentials']
         end
       end
     end
diff --git a/lib/fog/rackspace/models/identity/roles.rb b/lib/fog/rackspace/models/identity/roles.rb
index 9bdff2a24..c433296f2 100644
--- a/lib/fog/rackspace/models/identity/roles.rb
+++ b/lib/fog/rackspace/models/identity/roles.rb
@@ -24,7 +24,7 @@ module Fog
         private
 
         def retrieve_roles
-          data = connection.list_user_roles(user.identity).body['roles']
+          data = service.list_user_roles(user.identity).body['roles']
         end
       end
     end
diff --git a/lib/fog/rackspace/models/identity/tenants.rb b/lib/fog/rackspace/models/identity/tenants.rb
index 78802d939..269de919e 100644
--- a/lib/fog/rackspace/models/identity/tenants.rb
+++ b/lib/fog/rackspace/models/identity/tenants.rb
@@ -20,7 +20,7 @@ module Fog
         private
 
         def retrieve_tenants
-          data = connection.list_tenants.body['tenants']
+          data = service.list_tenants.body['tenants']
         end
       end
     end
diff --git a/lib/fog/rackspace/models/identity/user.rb b/lib/fog/rackspace/models/identity/user.rb
index c61d67bbe..17192711d 100644
--- a/lib/fog/rackspace/models/identity/user.rb
+++ b/lib/fog/rackspace/models/identity/user.rb
@@ -16,9 +16,9 @@ module Fog
         def save
           requires :username, :email, :enabled
           unless persisted?
-            data = connection.create_user(username, email, enabled, :password => password)
+            data = service.create_user(username, email, enabled, :password => password)
           else
-            data = connection.update_user(identity, username, email, enabled, :password => password)
+            data = service.update_user(identity, username, email, enabled, :password => password)
           end
           merge_attributes(data.body['user'])
           true
@@ -26,14 +26,14 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_user(identity)
+          service.delete_user(identity)
           true
         end
 
         def roles
           @roles ||= begin
             Fog::Rackspace::Identity::Roles.new({
-              :connection => connection,
+              :service => service,
               :user => self
             })
           end
@@ -42,7 +42,7 @@ module Fog
         def credentials
           @credentials ||= begin
             Fog::Rackspace::Identity::Credentials.new({
-              :connection => connection,
+              :service => service,
               :user => self
             })
           end
diff --git a/lib/fog/rackspace/models/identity/users.rb b/lib/fog/rackspace/models/identity/users.rb
index 37112b0da..526629f37 100644
--- a/lib/fog/rackspace/models/identity/users.rb
+++ b/lib/fog/rackspace/models/identity/users.rb
@@ -9,12 +9,12 @@ module Fog
         model Fog::Rackspace::Identity::User
 
         def all
-          data = connection.list_users.body['users']
+          data = service.list_users.body['users']
           load(data)
         end
 
         def get(user_id)
-          data = connection.get_user_by_id(user_id).body['user']
+          data = service.get_user_by_id(user_id).body['user']
           new(data)
         rescue Excon::Errors::NotFound
           nil
@@ -23,7 +23,7 @@ module Fog
         end
 
         def get_by_name(user_name)
-          data = connection.get_user_by_name(user_name).body['user']
+          data = service.get_user_by_name(user_name).body['user']
           new(data)
         rescue Excon::Errors::NotFound
           nil
diff --git a/lib/fog/rackspace/models/load_balancers/access_rule.rb b/lib/fog/rackspace/models/load_balancers/access_rule.rb
index b1cfb03fb..34f86ae8d 100644
--- a/lib/fog/rackspace/models/load_balancers/access_rule.rb
+++ b/lib/fog/rackspace/models/load_balancers/access_rule.rb
@@ -12,17 +12,17 @@ module Fog
 
         def destroy
           requires :identity, :load_balancer
-          connection.delete_access_rule(load_balancer.identity, identity)
+          service.delete_access_rule(load_balancer.identity, identity)
           true
         end
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :load_balancer, :address, :type
-          connection.create_access_rule(load_balancer.id, address, type)
+          service.create_access_rule(load_balancer.id, address, type)
 
           #Unfortunately, access rules creation doesn't return an ID, we require a subsequent list call and comparison
-          data = connection.list_access_rules(load_balancer.id).body['accessList'].select do |ar|
+          data = service.list_access_rules(load_balancer.id).body['accessList'].select do |ar|
             ar['address'] == address && ar['type'] == type
           end.first
           merge_attributes(data)
diff --git a/lib/fog/rackspace/models/load_balancers/access_rules.rb b/lib/fog/rackspace/models/load_balancers/access_rules.rb
index 7da4acfd5..bc9ea26b9 100644
--- a/lib/fog/rackspace/models/load_balancers/access_rules.rb
+++ b/lib/fog/rackspace/models/load_balancers/access_rules.rb
@@ -21,7 +21,7 @@ module Fog
         private
         def all_raw
           requires :load_balancer
-          data = connection.list_access_rules(load_balancer.id).body['accessList']
+          data = service.list_access_rules(load_balancer.id).body['accessList']
         end
       end
     end
diff --git a/lib/fog/rackspace/models/load_balancers/load_balancer.rb b/lib/fog/rackspace/models/load_balancers/load_balancer.rb
index 844993845..c50fec505 100644
--- a/lib/fog/rackspace/models/load_balancers/load_balancer.rb
+++ b/lib/fog/rackspace/models/load_balancers/load_balancer.rb
@@ -29,15 +29,16 @@ module Fog
         attribute :nodes
 
         def initialize(attributes)
-          #HACK - Since we are hacking how sub-collections work, we have to make sure the connection is valid first.
-          @connection = attributes[:connection]
+          #HACK - Since we are hacking how sub-collections work, we have to make sure the service is valid first.
+          # Old 'connection' is renamed as service and should be used instead
+          @service = attributes[:service] || attributes[:connection]
           super
         end
 
         def access_rules
           @access_rules ||= begin
             Fog::Rackspace::LoadBalancers::AccessRules.new({
-              :connection => connection,
+              :service => service,
               :load_balancer => self})
           end
         end
@@ -49,7 +50,7 @@ module Fog
         def nodes
           @nodes ||= begin
             Fog::Rackspace::LoadBalancers::Nodes.new({
-              :connection => connection,
+              :service => service,
               :load_balancer => self})
           end
         end
@@ -60,25 +61,25 @@ module Fog
 
         def ssl_termination
           requires :identity
-          ssl_termination = connection.get_ssl_termination(identity).body['sslTermination']
+          ssl_termination = service.get_ssl_termination(identity).body['sslTermination']
         rescue Fog::Rackspace::LoadBalancers::NotFound
           nil
         end
 
         def enable_ssl_termination(securePort, privatekey, certificate, options = {})
           requires :identity
-          connection.set_ssl_termination(identity, securePort, privatekey, certificate, options)
+          service.set_ssl_termination(identity, securePort, privatekey, certificate, options)
         end
 
         def disable_ssl_termination
           requires :identity
-          connection.remove_ssl_termination(identity)
+          service.remove_ssl_termination(identity)
         end
 
         def virtual_ips
           @virtual_ips ||= begin
             Fog::Rackspace::LoadBalancers::VirtualIps.new({
-              :connection => connection,
+              :service => service,
               :load_balancer => self})
           end
         end
@@ -106,73 +107,73 @@ module Fog
 
         def enable_connection_logging
           requires :identity
-          connection.set_connection_logging identity, true
+          service.set_connection_logging identity, true
           attributes[:connection_logging] = true
         end
 
         def disable_connection_logging
           requires :identity
-          connection.set_connection_logging identity, false
+          service.set_connection_logging identity, false
           attributes[:connection_logging] = false
         end
 
         def health_monitor
           requires :identity
-          monitor = connection.get_monitor(identity).body['healthMonitor']
+          monitor = service.get_monitor(identity).body['healthMonitor']
           monitor.count == 0 ? nil : monitor
         end
 
         def enable_health_monitor(type, delay, timeout, attempsBeforeDeactivation, options = {})
           requires :identity
-          connection.set_monitor(identity, type, delay, timeout, attempsBeforeDeactivation, options)
+          service.set_monitor(identity, type, delay, timeout, attempsBeforeDeactivation, options)
           true
         end
 
         def disable_health_monitor
           requires :identity
-          connection.remove_monitor(identity)
+          service.remove_monitor(identity)
           true
         end
 
         def connection_throttling
           requires :identity
-          throttle = connection.get_connection_throttling(identity).body['connectionThrottle']
+          throttle = service.get_connection_throttling(identity).body['connectionThrottle']
           throttle.count == 0 ? nil : throttle
         end
 
         def enable_connection_throttling(max_connections, min_connections, max_connection_rate, rate_interval)
           requires :identity
-          connection.set_connection_throttling(identity, max_connections, min_connections, max_connection_rate, rate_interval)
+          service.set_connection_throttling(identity, max_connections, min_connections, max_connection_rate, rate_interval)
           true
         end
 
         def disable_connection_throttling
           requires :identity
-          connection.remove_connection_throttling(identity)
+          service.remove_connection_throttling(identity)
           true
         end
 
         def session_persistence
           requires :identity
-          persistence = connection.get_session_persistence(identity).body['sessionPersistence']
+          persistence = service.get_session_persistence(identity).body['sessionPersistence']
           persistence.count == 0 ? nil : persistence
         end
 
         def enable_session_persistence(type)
           requires :identity
-          connection.set_session_persistence(identity, type)
+          service.set_session_persistence(identity, type)
           true
         end
 
         def disable_session_persistence
           requires :identity
-          connection.remove_session_persistence(identity)
+          service.remove_session_persistence(identity)
           true
         end
 
         def destroy
           requires :identity
-          connection.delete_load_balancer(identity)
+          service.delete_load_balancer(identity)
           true
         end
 
@@ -191,22 +192,22 @@ module Fog
 
         def usage(options = {})
           requires :identity
-          connection.get_load_balancer_usage(identity, options).body
+          service.get_load_balancer_usage(identity, options).body
         end
 
         def error_page
           requires :identity
-          connection.get_error_page(identity).body['errorpage']['content']
+          service.get_error_page(identity).body['errorpage']['content']
         end
 
         def error_page=(content)
           requires :identity
-          connection.set_error_page identity, content
+          service.set_error_page identity, content
         end
 
         def reset_error_page
           requires :identity
-          connection.remove_error_page identity
+          service.remove_error_page identity
         end
 
         private
@@ -219,7 +220,7 @@ module Fog
             options = {}
           end
 
-          data = connection.create_load_balancer(name, protocol, port, virtual_ips_hash, nodes_hash, options)
+          data = service.create_load_balancer(name, protocol, port, virtual_ips_hash, nodes_hash, options)
           merge_attributes(data.body['loadBalancer'])
         end
 
@@ -230,7 +231,7 @@ module Fog
             :algorithm => algorithm,
             :protocol => protocol,
             :port => port}
-          connection.update_load_balancer(identity, options)
+          service.update_load_balancer(identity, options)
 
           #TODO - Should this bubble down to nodes? Without tracking changes this would be very inefficient.
           # For now, individual nodes will have to be saved individually after saving an LB
diff --git a/lib/fog/rackspace/models/load_balancers/load_balancers.rb b/lib/fog/rackspace/models/load_balancers/load_balancers.rb
index ae2930cdc..21aad405d 100644
--- a/lib/fog/rackspace/models/load_balancers/load_balancers.rb
+++ b/lib/fog/rackspace/models/load_balancers/load_balancers.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Rackspace::LoadBalancers::LoadBalancer
 
         def all
-          data = connection.list_load_balancers.body['loadBalancers']
+          data = service.list_load_balancers.body['loadBalancers']
           load(data)
         end
 
         def get(load_balancer_id)
-          if load_balancer = connection.get_load_balancer(load_balancer_id).body['loadBalancer']
+          if load_balancer = service.get_load_balancer(load_balancer_id).body['loadBalancer']
             new(load_balancer)
           end
         rescue Fog::Rackspace::LoadBalancers::NotFound
diff --git a/lib/fog/rackspace/models/load_balancers/node.rb b/lib/fog/rackspace/models/load_balancers/node.rb
index 216f55e30..9a77ef802 100644
--- a/lib/fog/rackspace/models/load_balancers/node.rb
+++ b/lib/fog/rackspace/models/load_balancers/node.rb
@@ -15,7 +15,7 @@ module Fog
 
         def destroy
           requires :identity, :load_balancer
-          connection.delete_node(load_balancer.identity, identity)
+          service.delete_node(load_balancer.identity, identity)
           true
         end
 
@@ -38,7 +38,7 @@ module Fog
           unless weight.nil?
             options[:weight] = weight
           end
-          data = connection.create_node(load_balancer.id, address, port, condition, options)
+          data = service.create_node(load_balancer.id, address, port, condition, options)
           merge_attributes(data.body['nodes'][0])
         end
 
@@ -50,7 +50,7 @@ module Fog
           unless weight.nil?
             options[:weight] = weight
           end
-          connection.update_node(load_balancer.id, identity, options)
+          service.update_node(load_balancer.id, identity, options)
         end
       end
     end
diff --git a/lib/fog/rackspace/models/load_balancers/nodes.rb b/lib/fog/rackspace/models/load_balancers/nodes.rb
index 2e7bcdad2..e9cffb200 100644
--- a/lib/fog/rackspace/models/load_balancers/nodes.rb
+++ b/lib/fog/rackspace/models/load_balancers/nodes.rb
@@ -11,13 +11,13 @@ module Fog
 
         def all
           requires :load_balancer
-          data = connection.list_nodes(load_balancer.id).body['nodes']
+          data = service.list_nodes(load_balancer.id).body['nodes']
           load(data)
         end
 
         def get(node_id)
           requires :load_balancer
-          if node = connection.get_node(load_balancer.id, node_id).body['node']
+          if node = service.get_node(load_balancer.id, node_id).body['node']
             new(node)
           end
         rescue Fog::Rackspace::LoadBalancers::NotFound
diff --git a/lib/fog/rackspace/models/load_balancers/virtual_ip.rb b/lib/fog/rackspace/models/load_balancers/virtual_ip.rb
index 8ceb6154a..94e14ec27 100644
--- a/lib/fog/rackspace/models/load_balancers/virtual_ip.rb
+++ b/lib/fog/rackspace/models/load_balancers/virtual_ip.rb
@@ -13,14 +13,14 @@ module Fog
 
         def destroy
           requires :identity, :load_balancer
-          connection.delete_virtual_ip(load_balancer.identity, identity)
+          service.delete_virtual_ip(load_balancer.identity, identity)
           true
         end
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :load_balancer, :type
-          data = connection.create_virtual_ip(load_balancer.id, type)
+          data = service.create_virtual_ip(load_balancer.id, type)
           merge_attributes(data.body)
           true
         end
diff --git a/lib/fog/rackspace/models/load_balancers/virtual_ips.rb b/lib/fog/rackspace/models/load_balancers/virtual_ips.rb
index 71cbcf450..07abb3353 100644
--- a/lib/fog/rackspace/models/load_balancers/virtual_ips.rb
+++ b/lib/fog/rackspace/models/load_balancers/virtual_ips.rb
@@ -24,7 +24,7 @@ module Fog
         private
         def all_raw
           requires :load_balancer
-          connection.list_virtual_ips(load_balancer.id).body['virtualIps']
+          service.list_virtual_ips(load_balancer.id).body['virtualIps']
         end
       end
     end
diff --git a/lib/fog/rackspace/models/storage/directories.rb b/lib/fog/rackspace/models/storage/directories.rb
index ce5d233d6..56248888a 100644
--- a/lib/fog/rackspace/models/storage/directories.rb
+++ b/lib/fog/rackspace/models/storage/directories.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Storage::Rackspace::Directory
 
         def all
-          data = connection.get_containers.body
+          data = service.get_containers.body
           load(data)
         end
 
@@ -19,7 +19,7 @@ module Fog
         # > fog.directories.get('video', :cdn_cname => 'http://cdn.lunenburg.org').files.first.public_url
         # => 'http://cdn.lunenburg.org/hayley-dancing.mov'
         def get(key, options = {})
-          data = connection.get_container(key, options)
+          data = service.get_container(key, options)
           directory = new(:key => key, :cdn_cname => options[:cdn_cname])
           for key, value in data.headers
             if ['X-Container-Bytes-Used', 'X-Container-Object-Count'].include?(key)
diff --git a/lib/fog/rackspace/models/storage/directory.rb b/lib/fog/rackspace/models/storage/directory.rb
index 9dd07685e..af2d850c2 100644
--- a/lib/fog/rackspace/models/storage/directory.rb
+++ b/lib/fog/rackspace/models/storage/directory.rb
@@ -15,8 +15,8 @@ module Fog
 
         def destroy
           requires :key
-          connection.delete_container(key)
-          connection.cdn.post_container(key, 'X-CDN-Enabled' => 'False')
+          service.delete_container(key)
+          service.cdn.post_container(key, 'X-CDN-Enabled' => 'False')
           true
         rescue Excon::Errors::NotFound
           false
@@ -26,7 +26,7 @@ module Fog
           @files ||= begin
             Fog::Storage::Rackspace::Files.new(
               :directory    => self,
-              :connection   => connection
+              :service   => service
             )
           end
         end
@@ -38,9 +38,9 @@ module Fog
         def public_url
           requires :key
           @public_url ||= begin
-            begin response = connection.cdn.head_container(key)
+            begin response = service.cdn.head_container(key)
               if response.headers['X-Cdn-Enabled'] == 'True'
-                if connection.rackspace_cdn_ssl == true
+                if service.rackspace_cdn_ssl == true
                   response.headers['X-Cdn-Ssl-Uri']
                 else
                   cdn_cname || response.headers['X-Cdn-Uri']
@@ -54,19 +54,19 @@ module Fog
 
         def save
           requires :key
-          connection.put_container(key)
+          service.put_container(key)
 
-          if @connection.cdn && @public
+          if service.cdn && @public
             # if public and CDN connection then update cdn to public
             uri_header = 'X-CDN-URI'
-            if connection.rackspace_cdn_ssl == true
+            if service.rackspace_cdn_ssl == true
               uri_header = 'X-CDN-SSL-URI'
             end
-            @public_url = connection.cdn.put_container(key, 'X-CDN-Enabled' => 'True').headers[uri_header]
-          elsif @connection.cdn && !@public
-            connection.cdn.put_container(key, 'X-CDN-Enabled' => 'False')
+            @public_url = service.cdn.put_container(key, 'X-CDN-Enabled' => 'True').headers[uri_header]
+          elsif service.cdn && !@public
+            service.cdn.put_container(key, 'X-CDN-Enabled' => 'False')
             @public_url = nil
-          elsif !@connection.cdn && @public
+          elsif !service.cdn && @public
             # if public but no CDN connection then error
             raise(Fog::Storage::Rackspace::Error.new("Directory can not be set as :public without a CDN provided"))
           end
diff --git a/lib/fog/rackspace/models/storage/file.rb b/lib/fog/rackspace/models/storage/file.rb
index 82117f190..6b090b530 100644
--- a/lib/fog/rackspace/models/storage/file.rb
+++ b/lib/fog/rackspace/models/storage/file.rb
@@ -36,14 +36,14 @@ module Fog
           options['Content-Type'] ||= content_type if content_type
           options['Access-Control-Allow-Origin'] ||= access_control_allow_origin if access_control_allow_origin
           options['Origin'] ||= origin if origin
-          connection.copy_object(directory.key, key, target_directory_key, target_file_key, options)
-          target_directory = connection.directories.new(:key => target_directory_key)
+          service.copy_object(directory.key, key, target_directory_key, target_file_key, options)
+          target_directory = service.directories.new(:key => target_directory_key)
           target_directory.files.get(target_file_key)
         end
 
         def destroy
           requires :directory, :key
-          connection.delete_object(directory.key, key)
+          service.delete_object(directory.key, key)
           true
         end
 
@@ -76,7 +76,7 @@ module Fog
           options['Origin'] = origin if origin
           options.merge!(metadata_to_headers)
 
-          data = connection.put_object(directory.key, key, body, options)          
+          data = service.put_object(directory.key, key, body, options)
           update_attributes_from(data)
           refresh_metadata
 
@@ -125,7 +125,7 @@ module Fog
 
         def metadata_attributes
           if last_modified
-            headers = connection.head_object(directory.key, self.key).headers
+            headers = service.head_object(directory.key, self.key).headers
             headers.reject! {|k, v| !metadata_attribute?(k)}
           else
             {}
diff --git a/lib/fog/rackspace/models/storage/files.rb b/lib/fog/rackspace/models/storage/files.rb
index 238744965..f79e3c13f 100644
--- a/lib/fog/rackspace/models/storage/files.rb
+++ b/lib/fog/rackspace/models/storage/files.rb
@@ -54,7 +54,7 @@ module Fog
 
         def get(key, &block)
           requires :directory
-          data = connection.get_object(directory.key, key, &block)
+          data = service.get_object(directory.key, key, &block)
           file_data = data.headers.merge({
             :body => data.body,
             :key  => key
@@ -73,7 +73,7 @@ module Fog
 
         def head(key, options = {})
           requires :directory
-          data = connection.head_object(directory.key, key)
+          data = service.head_object(directory.key, key)
           file_data = data.headers.merge({
             :key => key
           })
diff --git a/lib/fog/serverlove/models/compute/image.rb b/lib/fog/serverlove/models/compute/image.rb
index 557cbeaa8..335719cab 100644
--- a/lib/fog/serverlove/models/compute/image.rb
+++ b/lib/fog/serverlove/models/compute/image.rb
@@ -8,44 +8,44 @@ module Fog
 
         identity :id, :aliases => 'drive'
 
-        attribute :name   
+        attribute :name
         attribute :user
         attribute :size
         attribute :claimed
         attribute :status
         attribute :imaging
         attribute :encryption_cipher, :aliases => 'encryption:cipher'
-        
+
         def save
           attributes = {}
-          
+
           if(identity)
-            attributes = connection.update_image(identity, allowed_attributes).body
+            attributes = service.update_image(identity, allowed_attributes).body
           else
             requires :name
             requires :size
-            attributes = connection.create_image(allowed_attributes).body
+            attributes = service.create_image(allowed_attributes).body
           end
-          
+
           merge_attributes(attributes)
           self
         end
-        
+
         def load_standard_image(standard_image_uuid)
           requires :identity
-          connection.load_standard_image(identity, standard_image_uuid)
+          service.load_standard_image(identity, standard_image_uuid)
         end
-        
+
         def ready?
           status.upcase == 'ACTIVE'
         end
 
         def destroy
           requires :identity
-          connection.destroy_image(identity)
+          service.destroy_image(identity)
           self
         end
-        
+
         def allowed_attributes
           allowed = [:name, :size]
           attributes.select {|k,v| allowed.include? k}
diff --git a/lib/fog/serverlove/models/compute/images.rb b/lib/fog/serverlove/models/compute/images.rb
index d6706603d..a9a2a83f6 100644
--- a/lib/fog/serverlove/models/compute/images.rb
+++ b/lib/fog/serverlove/models/compute/images.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Serverlove::Image
 
         def all
-          data = connection.get_images.body
+          data = service.get_images.body
           load(data)
         end
 
         def get(image_id)
-          data = connection.get_image(image_id).body
+          data = service.get_image(image_id).body
           new(data)
         end
 
diff --git a/lib/fog/serverlove/models/compute/server.rb b/lib/fog/serverlove/models/compute/server.rb
index ba501476a..90a75e040 100644
--- a/lib/fog/serverlove/models/compute/server.rb
+++ b/lib/fog/serverlove/models/compute/server.rb
@@ -8,7 +8,7 @@ module Fog
       class Server < Fog::Model
 
         identity :id, :aliases => 'server'
-        
+
         attribute :name
         attribute :cpu
         attribute :mem
@@ -21,33 +21,33 @@ module Fog
         attribute :persistent
         attribute :vnc
         attribute :vnc_password, :aliases => 'vnc:password'
-        attribute :status   
+        attribute :status
         attribute :user
         attribute :started
         attribute :nic_0_model, :aliases => 'nic:0:model'
         attribute :nic_0_dhcp,  :aliases => 'nic:0:dhcp'
-        
+
         def save
           attributes = {}
-          
+
           if(identity)
-            attributes = connection.update_server(identity, allowed_attributes).body
+            attributes = service.update_server(identity, allowed_attributes).body
           else
             requires :name
             requires :cpu
-            attributes = connection.create_server(self.defaults.merge(allowed_attributes)).body
+            attributes = service.create_server(self.defaults.merge(allowed_attributes)).body
           end
-          
+
           merge_attributes(attributes)
           self
         end
 
         def destroy
           requires :identity
-          connection.destroy_server(identity)
+          service.destroy_server(identity)
           self
         end
-        
+
         def allowed_attributes
           allowed = [
                       :name, :cpu, :smp, :mem, :persistent,
@@ -57,7 +57,7 @@ module Fog
                     ]
           attributes.select {|k,v| allowed.include? k}
         end
-        
+
         def self.defaults
           # TODO: Document default settings.
           # Note that VNC password standards are strict (need explaining)
diff --git a/lib/fog/serverlove/models/compute/servers.rb b/lib/fog/serverlove/models/compute/servers.rb
index a64f5a0c0..55107f11f 100644
--- a/lib/fog/serverlove/models/compute/servers.rb
+++ b/lib/fog/serverlove/models/compute/servers.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Serverlove::Server
 
         def all
-          data = connection.get_servers.body
+          data = service.get_servers.body
           load(data)
         end
 
         def get(server_id)
-          data = connection.get_server(server_id).body
+          data = service.get_server(server_id).body
           new(data)
         end
 
diff --git a/lib/fog/storm_on_demand/models/compute/balancer.rb b/lib/fog/storm_on_demand/models/compute/balancer.rb
index 9e8476732..64bb35a3e 100644
--- a/lib/fog/storm_on_demand/models/compute/balancer.rb
+++ b/lib/fog/storm_on_demand/models/compute/balancer.rb
@@ -5,9 +5,9 @@ module Fog
     class StormOnDemand
 
       class Balancer < Fog::Model
-        
+
         identity :uniq_id
-        
+
         attribute :vip
         attribute :price
         attribute :name
@@ -20,17 +20,17 @@ module Fog
         def initialize(attributes={})
           super
         end
-        
+
         def add_node(options)
           requires :identity
-          connection.add_balancer_node({:uniq_id => identity}.merge!(options))
+          service.add_balancer_node({:uniq_id => identity}.merge!(options))
         end
-        
+
         def remove_node(options)
           requires :identity
-          connection.remove_balancer_node({:uniq_id => identity}.merge!(options))
+          service.remove_balancer_node({:uniq_id => identity}.merge!(options))
         end
-        
+
         end
 
     end
diff --git a/lib/fog/storm_on_demand/models/compute/balancers.rb b/lib/fog/storm_on_demand/models/compute/balancers.rb
index d23eeed2d..9a8d6f510 100644
--- a/lib/fog/storm_on_demand/models/compute/balancers.rb
+++ b/lib/fog/storm_on_demand/models/compute/balancers.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::StormOnDemand::Balancer
 
         def all
-          data = connection.list_balancers.body['items']
+          data = service.list_balancers.body['items']
           load(data)
         end
 
diff --git a/lib/fog/storm_on_demand/models/compute/configs.rb b/lib/fog/storm_on_demand/models/compute/configs.rb
index 42129b1b3..8932a7e59 100644
--- a/lib/fog/storm_on_demand/models/compute/configs.rb
+++ b/lib/fog/storm_on_demand/models/compute/configs.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::StormOnDemand::Config
 
         def all
-          data = connection.list_configs.body['items']
+          data = service.list_configs.body['items']
           load(data)
         end
 
diff --git a/lib/fog/storm_on_demand/models/compute/images.rb b/lib/fog/storm_on_demand/models/compute/images.rb
index 514a75d4b..ef4cd1098 100644
--- a/lib/fog/storm_on_demand/models/compute/images.rb
+++ b/lib/fog/storm_on_demand/models/compute/images.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::StormOnDemand::Image
 
         def all
-          data = connection.list_images.body['items']
+          data = service.list_images.body['items']
           load(data)
         end
 
diff --git a/lib/fog/storm_on_demand/models/compute/private_ips.rb b/lib/fog/storm_on_demand/models/compute/private_ips.rb
index 99d078f6d..8e35542c1 100644
--- a/lib/fog/storm_on_demand/models/compute/private_ips.rb
+++ b/lib/fog/storm_on_demand/models/compute/private_ips.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::StormOnDemand::PrivateIp
 
         def all
-          data = connection.list_private_ips.body['networks']
+          data = service.list_private_ips.body['networks']
           load(data)
         end
 
         def get(server_id)
-          if server_id && server = connection.get_private_ip(private_ip).body
+          if server_id && server = service.get_private_ip(private_ip).body
             new(server)
           elsif !server_id
             nil
diff --git a/lib/fog/storm_on_demand/models/compute/server.rb b/lib/fog/storm_on_demand/models/compute/server.rb
index 16da3e0c8..44db3208d 100644
--- a/lib/fog/storm_on_demand/models/compute/server.rb
+++ b/lib/fog/storm_on_demand/models/compute/server.rb
@@ -33,13 +33,13 @@ module Fog
         end
 
         def create(options)
-          data = connection.create_server(options).body['servers']
+          data = service.create_server(options).body['servers']
           load(data)
         end
 
         def destroy
           requires :identity
-          connection.delete_server(:uniq_id => identity)
+          service.delete_server(:uniq_id => identity)
           true
         end
 
@@ -49,18 +49,18 @@ module Fog
 
         def reboot
           requires :identity
-          connection.reboot_server(:uniq_id => identity)
+          service.reboot_server(:uniq_id => identity)
           true
         end
 
         def clone(options)
           requires :identity
-          connection.clone_server({:uniq_id => identity}.merge!(options))
+          service.clone_server({:uniq_id => identity}.merge!(options))
           true
         end
         def resize(options)
           requires :identity
-          connection.resize_server({:uniq_id => identity}.merge!(options))
+          service.resize_server({:uniq_id => identity}.merge!(options))
           true
         end
       end
diff --git a/lib/fog/storm_on_demand/models/compute/servers.rb b/lib/fog/storm_on_demand/models/compute/servers.rb
index 22ed90f6d..3418bec0f 100644
--- a/lib/fog/storm_on_demand/models/compute/servers.rb
+++ b/lib/fog/storm_on_demand/models/compute/servers.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::StormOnDemand::Server
 
         def all
-          data = connection.list_servers.body['items']
+          data = service.list_servers.body['items']
           load(data)
         end
 
         def get(uniq_id)
-          server = connection.get_server(:uniq_id => uniq_id).body
+          server = service.get_server(:uniq_id => uniq_id).body
           new(server)
         end
 
diff --git a/lib/fog/storm_on_demand/models/compute/stats.rb b/lib/fog/storm_on_demand/models/compute/stats.rb
index 89f746cd6..8b0a99ef5 100644
--- a/lib/fog/storm_on_demand/models/compute/stats.rb
+++ b/lib/fog/storm_on_demand/models/compute/stats.rb
@@ -9,7 +9,7 @@ module Fog
         model Fog::Compute::StormOnDemand::Stat
 
         def get(options)
-          data = connection.get_stats(options).body
+          data = service.get_stats(options).body
           load(data)
         rescue Excon::Errors::Forbidden
           nil
diff --git a/lib/fog/storm_on_demand/models/compute/templates.rb b/lib/fog/storm_on_demand/models/compute/templates.rb
index b0a9a406a..50b471259 100644
--- a/lib/fog/storm_on_demand/models/compute/templates.rb
+++ b/lib/fog/storm_on_demand/models/compute/templates.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::StormOnDemand::Template
 
         def all
-          data = connection.list_templates.body['items']
+          data = service.list_templates.body['items']
           load(data)
         end
 
diff --git a/lib/fog/terremark/models/shared/address.rb b/lib/fog/terremark/models/shared/address.rb
index 70e4ac9f8..278b5d0ad 100644
--- a/lib/fog/terremark/models/shared/address.rb
+++ b/lib/fog/terremark/models/shared/address.rb
@@ -12,7 +12,7 @@ module Fog
 
         def destroy
          requires :id
-         connection.delete_public_ip(id)
+         service.delete_public_ip(id)
          true
         end
 
diff --git a/lib/fog/terremark/models/shared/addresses.rb b/lib/fog/terremark/models/shared/addresses.rb
index decc67a83..964dbb2d7 100644
--- a/lib/fog/terremark/models/shared/addresses.rb
+++ b/lib/fog/terremark/models/shared/addresses.rb
@@ -4,13 +4,13 @@ module Fog
 
       module Mock
         def addresses(options = {})
-          Fog::Terremark::Shared::Addresses.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::Addresses.new(options.merge(:service => self))
         end
       end
 
       module Real
         def addresses(options = {})
-          Fog::Terremark::Shared::Addresses.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::Addresses.new(options.merge(:service => self))
         end
       end
 
@@ -19,11 +19,11 @@ module Fog
         model Fog::Terremark::Shared::Address
 
         def all
-          load(connection.get_public_ips(vdc_id).body['PublicIpAddresses'])
+          load(service.get_public_ips(vdc_id).body['PublicIpAddresses'])
         end
 
         def get(ip_id)
-          if ip_id && ip = connection.get_public_ip(ip_id).body
+          if ip_id && ip = service.get_public_ip(ip_id).body
             new(ip)
           elsif !ip_id
             nil
@@ -33,7 +33,7 @@ module Fog
         end
 
         def vdc_id
-          @vdc_id ||= connection.default_vdc_id
+          @vdc_id ||= service.default_vdc_id
         end
 
         private
diff --git a/lib/fog/terremark/models/shared/images.rb b/lib/fog/terremark/models/shared/images.rb
index c363622ef..47c0fc5d3 100644
--- a/lib/fog/terremark/models/shared/images.rb
+++ b/lib/fog/terremark/models/shared/images.rb
@@ -8,23 +8,23 @@ module Fog
 
       module Mock
         def images(options = {})
-          Fog::Terremark::Shared::Images.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::Images.new(options.merge(:service => self))
         end
       end
 
       module Real
         def images(options = {})
-          Fog::Terremark::Shared::Images.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::Images.new(options.merge(:service => self))
         end
       end
 
       class Images < Fog::Collection
 
 
-        model Fog::Terremark::Shared::Image 
+        model Fog::Terremark::Shared::Image
 
         def all
-          data = connection.get_catalog(vdc_id).body['CatalogItems'].select do |entity|
+          data = service.get_catalog(vdc_id).body['CatalogItems'].select do |entity|
             entity['type'] == "application/vnd.vmware.vcloud.catalogItem+xml"
           end
           load(data)
@@ -32,7 +32,7 @@ module Fog
 
 
         def vdc_id
-          @vdc_id ||= connection.default_vdc_id
+          @vdc_id ||= service.default_vdc_id
         end
 
         private
diff --git a/lib/fog/terremark/models/shared/internetservice.rb b/lib/fog/terremark/models/shared/internetservice.rb
index 156541780..3849ea006 100644
--- a/lib/fog/terremark/models/shared/internetservice.rb
+++ b/lib/fog/terremark/models/shared/internetservice.rb
@@ -16,8 +16,8 @@ module Fog
         attribute :public_ip_address_id
 
         def destroy(delete_public_ip=true)
-          connection.delete_internet_service(self.Id)
-          connection.delete_public_ip(self.PublicIpAddress["Id"]) if delete_public_ip
+          service.delete_internet_service(self.Id)
+          service.delete_public_ip(self.PublicIpAddress["Id"]) if delete_public_ip
         true
         end
 
@@ -25,8 +25,8 @@ module Fog
           requires :Name, :Protocol, :Port
           if not public_ip_address_id
             #Create the first internet service and allocate public IP
-            data = connection.create_internet_service(
-                vdc = connection.default_vdc_id,
+            data = service.create_internet_service(
+                vdc = service.default_vdc_id,
                 name = self.Name,
                 protocol = self.Protocol,
                 port = self.Port,
@@ -37,7 +37,7 @@ module Fog
             )
           else
             #create additional services to existing Public IP
-            data = connection.add_internet_service(
+            data = service.add_internet_service(
                       ip_id = public_ip_address_id,
                       name = self.Name,
                       protocol = self.Protocol,
@@ -46,7 +46,7 @@ module Fog
                         'Enabled' => 'true',
                         "Description" => self.Name
                         }
-                    )           
+                    )
             end
             merge_attributes(data.body)
             true
diff --git a/lib/fog/terremark/models/shared/internetservices.rb b/lib/fog/terremark/models/shared/internetservices.rb
index 462fdbcb1..0edb4e464 100644
--- a/lib/fog/terremark/models/shared/internetservices.rb
+++ b/lib/fog/terremark/models/shared/internetservices.rb
@@ -7,13 +7,13 @@ module Fog
 
       module Mock
         def internetservices(options = {})
-          Fog::Terremark::Shared::Servers.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::Servers.new(options.merge(:service => self))
         end
       end
 
       module Real
         def internetservices(options = {})
-          Fog::Terremark::Shared::InternetServices.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::InternetServices.new(options.merge(:service => self))
         end
       end
 
@@ -22,18 +22,18 @@ module Fog
         model Fog::Terremark::Shared::InternetService
 
         def all
-          data = connection.get_internet_services(vdc_id).body["InternetServices"]
+          data = service.get_internet_services(vdc_id).body["InternetServices"]
           load(data)
         end
 
         def get(service_id)
-          data = connection.get_internet_services(vdc_id)
+          data = service.get_internet_services(vdc_id)
           internet_service = services.body["InternetServices"].select {|item| item["Id"] == service_id}
           new(internetservice)
         end
 
         def vdc_id
-          @vdc_id ||= connection.default_vdc_id
+          @vdc_id ||= service.default_vdc_id
         end
 
       end
diff --git a/lib/fog/terremark/models/shared/network.rb b/lib/fog/terremark/models/shared/network.rb
index 96aefaee3..cdb5f4bfd 100644
--- a/lib/fog/terremark/models/shared/network.rb
+++ b/lib/fog/terremark/models/shared/network.rb
@@ -17,7 +17,7 @@ module Fog
 
         def ips
           #Until there is a real model for these ?
-          connection.get_network_ips(id).body['IpAddresses']
+          service.get_network_ips(id).body['IpAddresses']
         end
 
         private
diff --git a/lib/fog/terremark/models/shared/networks.rb b/lib/fog/terremark/models/shared/networks.rb
index 6e39c3003..7e587129c 100644
--- a/lib/fog/terremark/models/shared/networks.rb
+++ b/lib/fog/terremark/models/shared/networks.rb
@@ -4,13 +4,13 @@ module Fog
 
       module Mock
         def networks(options = {})
-          Fog::Terremark::Shared::Networks.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::Networks.new(options.merge(:service => self))
         end
       end
 
       module Real
         def networks(options = {})
-          Fog::Terremark::Shared::Networks.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::Networks.new(options.merge(:service => self))
         end
       end
 
@@ -19,14 +19,14 @@ module Fog
         model Fog::Terremark::Shared::Network
 
         def all
-          data = connection.get_vdc(vdc_id).body['AvailableNetworks'].map do |network|
-            connection.get_network(network["href"].split("/").last).body
+          data = service.get_vdc(vdc_id).body['AvailableNetworks'].map do |network|
+            service.get_network(network["href"].split("/").last).body
           end
           load(data)
         end
 
         def get(network_id)
-          if network_id && network = connection.get_network(network_id).body
+          if network_id && network = service.get_network(network_id).body
             new(network)
           elsif !network_id
             nil
@@ -36,7 +36,7 @@ module Fog
         end
 
         def vdc_id
-          @vdc_id ||= connection.default_vdc_id
+          @vdc_id ||= service.default_vdc_id
         end
 
         private
diff --git a/lib/fog/terremark/models/shared/nodeservice.rb b/lib/fog/terremark/models/shared/nodeservice.rb
index 4901a0e4c..2e42d66a7 100644
--- a/lib/fog/terremark/models/shared/nodeservice.rb
+++ b/lib/fog/terremark/models/shared/nodeservice.rb
@@ -16,12 +16,12 @@ module Fog
         attribute :InternetServiceId
 
         def destroy
-          connection.delete_node_service(self.Id)
+          service.delete_node_service(self.Id)
         end
 
         def save
          requires :Name, :Port, :InternetServiceId
-            data = connection.add_node_service(
+            data = service.add_node_service(
                 service_id = self.InternetServiceId,
                 ip = self.IpAddress,
                 name = self.Name,
@@ -29,7 +29,7 @@ module Fog
                 options = {"Enabled" => 'true',
                            "Description" => self.Name,
                 }
-            
+
             )
             merge_attributes(data.body)
             true
diff --git a/lib/fog/terremark/models/shared/nodeservices.rb b/lib/fog/terremark/models/shared/nodeservices.rb
index 68c8788ad..657e16257 100644
--- a/lib/fog/terremark/models/shared/nodeservices.rb
+++ b/lib/fog/terremark/models/shared/nodeservices.rb
@@ -7,22 +7,22 @@ module Fog
 
       module Mock
         def nodeservices(options = {})
-          Fog::Terremark::Shared::Servers.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::Servers.new(options.merge(:service => self))
         end
       end
 
       module Real
         def nodeservices(options = {})
-          Fog::Terremark::Shared::NodeServices.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::NodeServices.new(options.merge(:service => self))
         end
       end
 
       class NodeServices < Fog::Collection
 
         model Fog::Terremark::Shared::NodeService
-        
+
         def all(internet_service_id)
-          data = connection.get_node_services(internet_service_id).body["NodeServices"]
+          data = service.get_node_services(internet_service_id).body["NodeServices"]
           load(data)
         end
 
diff --git a/lib/fog/terremark/models/shared/server.rb b/lib/fog/terremark/models/shared/server.rb
index 7fcf34a77..bccc9ce4f 100644
--- a/lib/fog/terremark/models/shared/server.rb
+++ b/lib/fog/terremark/models/shared/server.rb
@@ -31,17 +31,17 @@ module Fog
         attribute :IpAddress
 
         def reload
-         merge_attributes(connection.get_vapp(id).body)
+         merge_attributes(service.get_vapp(id).body)
         end
         def destroy
           case self.status
             when VAppStatus::BEING_CREATED, VAppStatus::BEING_DEPLOYED
               return false
             when VAppStatus::POWERED_ON
-              data = connection.power_off(self.id).body
+              data = service.power_off(self.id).body
               wait_for { off? }
             end
-          connection.delete_vapp(self.id)
+          service.delete_vapp(self.id)
           true
         end
 
@@ -54,15 +54,15 @@ module Fog
         end
 
         def internet_services
-            @internet_services ||= connection.internetservices.all.select {|item| item.Name == self.name}
+            @internet_services ||= service.internetservices.all.select {|item| item.Name == self.name}
         end
-        
+
         def delete_internet_services
             #Find the internet service
 
             while (service = internet_services.pop) do
 
-              nodes = connection.nodeservices.all(service.Id)
+              nodes = service.nodeservices.all(service.Id)
               #Delete all the associated nodes
               nodes.select { |item| item.destroy }
               #Clear out the services
@@ -87,7 +87,7 @@ module Fog
         def power_on(options = {})
           requires :id
           begin
-            connection.power_on(id)
+            service.power_on(id)
           rescue Excon::Errors::InternalServerError => e
             #Frankly we shouldn't get here ...
             raise e unless e.to_s =~ /because it is already powered on/
@@ -98,7 +98,7 @@ module Fog
         def power_off
           requires :id
           begin
-            connection.power_off(id)
+            service.power_off(id)
           rescue Excon::Errors::InternalServerError => e
             #Frankly we shouldn't get here ...
             raise e unless e.to_s =~ /because it is already powered off/
@@ -109,7 +109,7 @@ module Fog
         def shutdown
           requires :id
           begin
-            connection.power_shutdown(id)
+            service.power_shutdown(id)
           rescue Excon::Errors::InternalServerError => e
             #Frankly we shouldn't get here ...
             raise e unless e.to_s =~ /because it is already powered off/
@@ -119,7 +119,7 @@ module Fog
 
         def power_reset
           requires :id
-          connection.power_reset(id)
+          service.power_reset(id)
           true
         end
 
@@ -137,7 +137,7 @@ module Fog
             for port in ports
               if not public_ip_info
                 #Create the first internet service and allocate public IP
-                inet_services = connection.internetservices.create({
+                inet_services = service.internetservices.create({
                       "Name" => self.name,
                       "Protocol" => proto,
                       "Port" => port,
@@ -147,8 +147,8 @@ module Fog
 
               else
                 #create additional services to existing Public IP
-                inet_services = connection.internetservices.create({
-                      "public_ip_address_id" => public_ip_info["Id"],                      
+                inet_services = service.internetservices.create({
+                      "public_ip_address_id" => public_ip_info["Id"],
                       "Name" => self.name,
                       "Protocol" => proto,
                       "Port" => port,
@@ -158,7 +158,7 @@ module Fog
               end
 
               #Create the associate node service to the server
-              connection.nodeservices.create({"Name" => self.name, 
+              service.nodeservices.create({"Name" => self.name,
                                            "IpAddress" => self.IpAddress,
                                            "Port" => port,
                                            "InternetServiceId" => internet_service_id
@@ -172,9 +172,9 @@ module Fog
           requires :name
           if powerOn
           end
-          data = connection.instantiate_vapp_template(
-              server_name=name, 
-              vapp_template=image, 
+          data = service.instantiate_vapp_template(
+              server_name=name,
+              vapp_template=image,
               options={
                   'ssh_key_fingerprint' => sshkeyFingerPrint,
                   'cpus' => vcpus,
diff --git a/lib/fog/terremark/models/shared/servers.rb b/lib/fog/terremark/models/shared/servers.rb
index e88b87f2c..9c90dded3 100644
--- a/lib/fog/terremark/models/shared/servers.rb
+++ b/lib/fog/terremark/models/shared/servers.rb
@@ -7,13 +7,13 @@ module Fog
 
       module Mock
         def servers(options = {})
-          Fog::Terremark::Shared::Servers.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::Servers.new(options.merge(:service => self))
         end
       end
 
       module Real
         def servers(options = {})
-          Fog::Terremark::Shared::Servers.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::Servers.new(options.merge(:service => self))
         end
       end
 
@@ -23,22 +23,22 @@ module Fog
 
         def all
           data = []
-          connection.get_vdc(vdc_id).body['ResourceEntities'].select do |entity|
-              data << connection.servers.get(entity["href"].split('/').last)
+          service.get_vdc(vdc_id).body['ResourceEntities'].select do |entity|
+              data << service.servers.get(entity["href"].split('/').last)
           end
           data
         end
 
         def get(server_id)
           if server_id
-            new(connection.get_vapp(server_id).body)
+            new(service.get_vapp(server_id).body)
           else
             nil
           end
         end
 
         def vdc_id
-          @vdc_id ||= connection.default_vdc_id
+          @vdc_id ||= service.default_vdc_id
         end
 
         private
diff --git a/lib/fog/terremark/models/shared/task.rb b/lib/fog/terremark/models/shared/task.rb
index 31307cbdb..5a4eb87d8 100644
--- a/lib/fog/terremark/models/shared/task.rb
+++ b/lib/fog/terremark/models/shared/task.rb
@@ -23,12 +23,12 @@ module Fog
           new_cancel_link = attributes.delete('Link')
 
           super
-          self.owner = connection.parse(new_owner)
+          self.owner = service.parse(new_owner)
           if new_result
-            self.result = connection.parse(new_result)
+            self.result = service.parse(new_result)
           end
-          self.error = connection.parse(new_error) if new_error
-          @cancel_link = connection.parse(new_cancel_link) if new_cancel_link
+          self.error = service.parse(new_error) if new_error
+          @cancel_link = service.parse(new_cancel_link) if new_cancel_link
         end
 
         def ready?
diff --git a/lib/fog/terremark/models/shared/tasks.rb b/lib/fog/terremark/models/shared/tasks.rb
index 9083a6ea9..b2f1ed786 100644
--- a/lib/fog/terremark/models/shared/tasks.rb
+++ b/lib/fog/terremark/models/shared/tasks.rb
@@ -7,13 +7,13 @@ module Fog
 
       module Mock
         def tasks
-          Fog::Terremark::Shared::Tasks.new(:connection => self)
+          Fog::Terremark::Shared::Tasks.new(:service => self)
         end
       end
 
       module Real
         def tasks
-          Fog::Terremark::Shared::Tasks.new(:connection => self)
+          Fog::Terremark::Shared::Tasks.new(:service => self)
         end
       end
 
@@ -22,12 +22,12 @@ module Fog
         model Fog::Terremark::Shared::Task
 
         def all
-          data = connection.get_tasks_list(task_list_id).body['Tasks']
+          data = service.get_tasks_list(task_list_id).body['Tasks']
           load(data)
         end
 
         def get(task_id)
-          if task_id && task = connection.get_task(task_id).body
+          if task_id && task = service.get_task(task_id).body
             new(task)
           elsif !task_id
             nil
@@ -38,7 +38,7 @@ module Fog
 
         def task_list_id
           @task_list_id ||=
-            if connection.default_organization_id && organization = connection.get_organization(connection.default_organization_id).body
+            if service.default_organization_id && organization = service.get_organization(service.default_organization_id).body
               organization['Links'].detect {|link| link['type'] == 'application/vnd.vmware.vcloud.tasksList+xml'}['href'].split('/').last.to_i
             else
               nil
diff --git a/lib/fog/terremark/models/shared/vdc.rb b/lib/fog/terremark/models/shared/vdc.rb
index 42cc30baa..6bb1f5428 100644
--- a/lib/fog/terremark/models/shared/vdc.rb
+++ b/lib/fog/terremark/models/shared/vdc.rb
@@ -13,19 +13,19 @@ module Fog
         attribute :AvailableNetworks
         attribute :links
         def networks
-          connection.networks(:vdc_id => id)
+          service.networks(:vdc_id => id)
         end
 
         def addresses
-          connection.addresses(:vdc_id => id)
+          service.addresses(:vdc_id => id)
         end
 
         def servers
-          connection.servers(:vdc_id => id)
+          service.servers(:vdc_id => id)
         end
 
         def images
-          connection.images(:vdc_id => id)
+          service.images(:vdc_id => id)
         end
         private
 
diff --git a/lib/fog/terremark/models/shared/vdcs.rb b/lib/fog/terremark/models/shared/vdcs.rb
index d47793f5d..ac68080f2 100644
--- a/lib/fog/terremark/models/shared/vdcs.rb
+++ b/lib/fog/terremark/models/shared/vdcs.rb
@@ -4,13 +4,13 @@ module Fog
 
       module Mock
         def vdcs(options = {})
-          Fog::Terremark::Shared::Vdcs.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::Vdcs.new(options.merge(:service => self))
         end
       end
 
       module Real
         def vdcs(options = {})
-          Fog::Terremark::Shared::Vdcs.new(options.merge(:connection => self))
+          Fog::Terremark::Shared::Vdcs.new(options.merge(:service => self))
         end
       end
 
@@ -19,14 +19,14 @@ module Fog
         model Fog::Terremark::Shared::Vdc
 
         def all
-          data = connection.get_organization(organization_id).body['Links'].select do |entity|
+          data = service.get_organization(organization_id).body['Links'].select do |entity|
             entity['type'] == 'application/vnd.vmware.vcloud.vdc+xml'
           end
           load(data)
         end
 
         def get(vdc_id)
-          if vdc_id && vdc = connection.get_vdc(vdc_id).body
+          if vdc_id && vdc = service.get_vdc(vdc_id).body
             new(vdc)
           elsif !vdc_id
             nil
@@ -36,7 +36,7 @@ module Fog
         end
 
         def organization_id
-          @vdc_id ||= connection.default_organization_id
+          @vdc_id ||= service.default_organization_id
         end
 
         private
diff --git a/lib/fog/terremark/parser.rb b/lib/fog/terremark/parser.rb
index 14325c1df..c7579c9ff 100644
--- a/lib/fog/terremark/parser.rb
+++ b/lib/fog/terremark/parser.rb
@@ -7,7 +7,7 @@ module Fog
         def parse(data)
           case data['type']
           when 'application/vnd.vmware.vcloud.vApp+xml'
-            servers.new(data.merge!(:connection => self))
+            servers.new(data.merge!(:service => self))
           else
             data
           end
diff --git a/lib/fog/terremark/shared.rb b/lib/fog/terremark/shared.rb
index 0a0afedf2..b5e709cdb 100644
--- a/lib/fog/terremark/shared.rb
+++ b/lib/fog/terremark/shared.rb
@@ -23,7 +23,7 @@ module Fog
         def parse(data)
           case data['type']
           when 'application/vnd.vmware.vcloud.vApp+xml'
-            servers.new(data.merge!(:connection => self))
+            servers.new(data.merge!(:service => self))
           else
             data
           end
diff --git a/lib/fog/vcloud/compute.rb b/lib/fog/vcloud/compute.rb
index 01359dd26..168c60eec 100644
--- a/lib/fog/vcloud/compute.rb
+++ b/lib/fog/vcloud/compute.rb
@@ -11,7 +11,7 @@ module Fog
       end
 
       def check_href!(opts = {})
-        self.href = connection.default_vdc_href unless href
+        self.href = service.default_vdc_href unless href
         unless href
           if opts.is_a?(String)
             t = Hash.new
@@ -61,7 +61,7 @@ module Fog
         class_eval <<-EOS, __FILE__,__LINE__
           def #{item}
             load_unless_loaded!
-            connection.get_#{item}(link_up[:href])
+            service.get_#{item}(link_up[:href])
           end
         EOS
       end
@@ -356,9 +356,9 @@ module Fog
           def get_#{type}(uri)
             Fog::Vcloud::Compute::#{type.to_s.capitalize}.new(
               self.request(basic_request_params(uri)).body.merge(
-                :connection => self,
+                :service => self,
                 :collection => Fog::Vcloud::Compute::#{type.to_s.capitalize}s.new(
-                  :connection => self
+                  :service => self
                 )
               )
             )
diff --git a/lib/fog/vcloud/models/compute/catalog.rb b/lib/fog/vcloud/models/compute/catalog.rb
index 6a4b67969..69ba1e0d2 100644
--- a/lib/fog/vcloud/models/compute/catalog.rb
+++ b/lib/fog/vcloud/models/compute/catalog.rb
@@ -12,7 +12,7 @@ module Fog
 
         def catalog_items
           @catalog_items ||= Fog::Vcloud::Compute::CatalogItems.
-            new( :connection => connection,
+            new( :service => service,
                  :href => href )
         end
 
diff --git a/lib/fog/vcloud/models/compute/catalog_item.rb b/lib/fog/vcloud/models/compute/catalog_item.rb
index d52c03b1b..a1b236993 100644
--- a/lib/fog/vcloud/models/compute/catalog_item.rb
+++ b/lib/fog/vcloud/models/compute/catalog_item.rb
@@ -15,7 +15,7 @@ module Fog
 
         def customization_options
           load_unless_loaded!
-          if data = connection.get_customization_options( link[:href] ).body
+          if data = service.get_customization_options( link[:href] ).body
             data.delete_if { |key, value| [:xmlns_i, :xmlns].include?(key) }
             data
           else
diff --git a/lib/fog/vcloud/models/compute/catalog_items.rb b/lib/fog/vcloud/models/compute/catalog_items.rb
index 482dd4833..6b7b43a88 100644
--- a/lib/fog/vcloud/models/compute/catalog_items.rb
+++ b/lib/fog/vcloud/models/compute/catalog_items.rb
@@ -10,8 +10,8 @@ module Fog
         attribute :href, :aliases => :Href
 
         def all
-          catalog_item_info = connection.get_catalog_item(self.href)
-          items = connection.get_catalog_item(self.href).body[:CatalogItems]
+          catalog_item_info = service.get_catalog_item(self.href)
+          items = service.get_catalog_item(self.href).body[:CatalogItems]
           if items.size > 0
             data = items[:CatalogItem]
             load(data)
@@ -19,7 +19,7 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_catalog_item(uri)
+          if data = service.get_catalog_item(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
@@ -27,7 +27,7 @@ module Fog
         end
 
         def organization_uri
-          @organization_uri ||= connection.default_organization_uri
+          @organization_uri ||= service.default_organization_uri
         end
 
       end
diff --git a/lib/fog/vcloud/models/compute/catalogs.rb b/lib/fog/vcloud/models/compute/catalogs.rb
index 89a8dcd14..cd73b195a 100644
--- a/lib/fog/vcloud/models/compute/catalogs.rb
+++ b/lib/fog/vcloud/models/compute/catalogs.rb
@@ -10,13 +10,13 @@ module Fog
         attribute :organization_uri
 
         def all
-          org_uri = self.organization_uri || connection.default_organization_uri
-          data = connection.get_organization(org_uri).links.select { |link| link[:type] == "application/vnd.vmware.vcloud.catalog+xml" }
+          org_uri = self.organization_uri || service.default_organization_uri
+          data = service.get_organization(org_uri).links.select { |link| link[:type] == "application/vnd.vmware.vcloud.catalog+xml" }
           load(data)
         end
 
         def get(uri)
-          connection.get_catalog(uri)
+          service.get_catalog(uri)
         rescue Fog::Errors::NotFound
           nil
         end
diff --git a/lib/fog/vcloud/models/compute/ip.rb b/lib/fog/vcloud/models/compute/ip.rb
index 19169b79d..39287b843 100644
--- a/lib/fog/vcloud/models/compute/ip.rb
+++ b/lib/fog/vcloud/models/compute/ip.rb
@@ -14,7 +14,7 @@ module Fog
 
         def save
           if @changed
-            connection.configure_network_ip( href, _compose_network_ip_data )
+            service.configure_network_ip( href, _compose_network_ip_data )
           end
           true
         end
diff --git a/lib/fog/vcloud/models/compute/ips.rb b/lib/fog/vcloud/models/compute/ips.rb
index b1bb5f206..b09c942de 100644
--- a/lib/fog/vcloud/models/compute/ips.rb
+++ b/lib/fog/vcloud/models/compute/ips.rb
@@ -12,15 +12,15 @@ module Fog
         attribute :href
 
         def all
-          self.href = connection.default_vdc_href unless self.href
+          self.href = service.default_vdc_href unless self.href
           check_href!( :messages => "Ips href of a Network you want to enumerate" )
-          if data = connection.get_network_ips(href).body[:IpAddress]
+          if data = service.get_network_ips(href).body[:IpAddress]
             load(data)
           end
         end
 
         def get(uri)
-          if data = connection.get_network_ip(uri).body
+          if data = service.get_network_ip(uri).body
             new(data)
           end
         rescue Fog::Errors::NotFound
diff --git a/lib/fog/vcloud/models/compute/network.rb b/lib/fog/vcloud/models/compute/network.rb
index d91139552..fe8d817a9 100644
--- a/lib/fog/vcloud/models/compute/network.rb
+++ b/lib/fog/vcloud/models/compute/network.rb
@@ -15,7 +15,7 @@ module Fog
 
         def parent_network
           return nil if configuration[:ParentNetwork].nil?
-          @parent_network ||= connection.get_network(configuration[:ParentNetwork][:href])
+          @parent_network ||= service.get_network(configuration[:ParentNetwork][:href])
         end
       end
     end
diff --git a/lib/fog/vcloud/models/compute/networks.rb b/lib/fog/vcloud/models/compute/networks.rb
index 84cda7283..fba7766b4 100644
--- a/lib/fog/vcloud/models/compute/networks.rb
+++ b/lib/fog/vcloud/models/compute/networks.rb
@@ -13,30 +13,30 @@ module Fog
         attribute :href
 
         def all
-          self.href = connection.default_vdc_href unless self.href
+          self.href = service.default_vdc_href unless self.href
           data = nil
           if self.href =~ /\/vdc\//
             check_href!("Vdc")
-            data = [connection.get_vdc(self.href).available_networks].flatten.compact.reject{|n| n == '' }
+            data = [service.get_vdc(self.href).available_networks].flatten.compact.reject{|n| n == '' }
           elsif self.href =~ /\/org\//
             check_href!("Org")
-            data = connection.get_organization(self.href).links.select{|l| l[:type] == network_type_id }
+            data = service.get_organization(self.href).links.select{|l| l[:type] == network_type_id }
           elsif self.href =~ /\/vApp\//
             check_href!("Vapp")
-            data = [(connection.get_vapp(self.href).network_configs||{})[:NetworkConfig]].flatten.compact.collect{|n| n[:Configuration][:ParentNetwork] unless n[:Configuration].nil? }.compact
+            data = [(service.get_vapp(self.href).network_configs||{})[:NetworkConfig]].flatten.compact.collect{|n| n[:Configuration][:ParentNetwork] unless n[:Configuration].nil? }.compact
           end
           load([*data]) unless data.nil?
         end
 
         def get(uri)
-          connection.get_network(uri)
+          service.get_network(uri)
         rescue Fog::Errors::NotFound
           nil
         end
 
         private
         def network_type_id
-          if connection.version == '1.0'
+          if service.version == '1.0'
             'application/vnd.vmware.vcloud.network+xml'
           else
             'application/vnd.vmware.vcloud.orgNetwork+xml'
diff --git a/lib/fog/vcloud/models/compute/organization.rb b/lib/fog/vcloud/models/compute/organization.rb
index c8513a1ea..699ddb0fb 100644
--- a/lib/fog/vcloud/models/compute/organization.rb
+++ b/lib/fog/vcloud/models/compute/organization.rb
@@ -14,26 +14,26 @@ module Fog
 
         def networks
           @networks ||= Fog::Vcloud::Compute::Networks.
-            new( :connection => connection,
+            new( :service => service,
                  :href => href )
         end
 
         def tasks
           load_unless_loaded!
           @tasks ||= Fog::Vcloud::Compute::Tasks.
-            new( :connection => connection,
+            new( :service => service,
                  :href => other_links.find{|l| l[:type] == 'application/vnd.vmware.vcloud.tasksList+xml'}[:href] )
         end
 
         def vdcs
           @vdcs ||= Fog::Vcloud::Compute::Vdcs.
-            new( :connection => connection,
+            new( :service => service,
                  :href => href )
         end
 
         def catalogs
           @catalogs ||= Fog::Vcloud::Compute::Catalogs.
-            new( :connection => connection,
+            new( :service => service,
                  :href => href )
         end
 
diff --git a/lib/fog/vcloud/models/compute/organizations.rb b/lib/fog/vcloud/models/compute/organizations.rb
index 8e051b2d6..939bab9c5 100644
--- a/lib/fog/vcloud/models/compute/organizations.rb
+++ b/lib/fog/vcloud/models/compute/organizations.rb
@@ -11,17 +11,17 @@ module Fog
         undef_method :create
 
         def all
-          raw_orgs = if connection.version == '1.0'
-            connection.login
+          raw_orgs = if service.version == '1.0'
+            service.login
           else
-            connection.request(connection.basic_request_params("#{connection.base_path_url}/org/"))
+            service.request(service.basic_request_params("#{service.base_path_url}/org/"))
           end
           data = raw_orgs.body[:Org]
           load(data)
         end
 
         def get(uri)
-          connection.get_organization(uri)
+          service.get_organization(uri)
         rescue Fog::Errors::NotFound
           nil
         end
diff --git a/lib/fog/vcloud/models/compute/server.rb b/lib/fog/vcloud/models/compute/server.rb
index fc4c4f61a..0944eeb23 100644
--- a/lib/fog/vcloud/models/compute/server.rb
+++ b/lib/fog/vcloud/models/compute/server.rb
@@ -72,7 +72,7 @@ module Fog
 
         # This is the real power-off operation
         def undeploy
-          connection.undeploy href
+          service.undeploy href
         end
 
         def graceful_restart
@@ -104,7 +104,7 @@ module Fog
 
         def cpus=(qty)
           return if qty.nil? or qty.size == 0
-           
+
           @changed = true
           @update_cpu_value = qty
           qty
@@ -187,19 +187,19 @@ module Fog
 
             if @update_password
                 guest_customization[:AdminPassword] = @update_password.to_s
-                connection.configure_vm_password(guest_customization)
+                service.configure_vm_password(guest_customization)
                 wait_for { ready? }
             end
 
             if @update_cpu_value
               cpu_mess[:"rasd:VirtualQuantity"] = @update_cpu_value.to_s
-              connection.configure_vm_cpus(cpu_mess)
+              service.configure_vm_cpus(cpu_mess)
               wait_for { ready? }
             end
-                
+
             if @update_memory_value
               memory_mess[:"rasd:VirtualQuantity"] = @update_memory_value.to_s
-              connection.configure_vm_memory(memory_mess)
+              service.configure_vm_memory(memory_mess)
               wait_for { ready? }
             end
 
@@ -208,19 +208,19 @@ module Fog
                 vh[:'rasd:ResourceType'] == '17' &&
                   vh[:'rasd:AddressOnParent'].to_s == @remove_disk.to_s
               end
-              connection.configure_vm_disks(self.href, data)
+              service.configure_vm_disks(self.href, data)
               wait_for { ready? }
             end
             if @disk_change == :added
               data = disk_mess
               data << @add_disk
-              connection.configure_vm_disks(self.href, data)
+              service.configure_vm_disks(self.href, data)
               wait_for { ready? }
             end
             if @name_changed || @description_changed
               edit_uri = links.select {|i| i[:rel] == 'edit'}
               edit_uri = edit_uri.kind_of?(Array) ? edit_uri.flatten[0][:href] : edit_uri[:href]
-              connection.configure_vm_name_description(edit_uri, self.name, self.description)
+              service.configure_vm_name_description(edit_uri, self.name, self.description)
               wait_for { ready? }
             end
           end
@@ -236,7 +236,7 @@ module Fog
           wait_for { off? } # be sure..
           wait_for { ready? } # be doubly sure..
           sleep 2 # API lies. need to give it some time to be happy.
-          connection.delete_vapp(href).body[:status] == "running"
+          service.delete_vapp(href).body[:status] == "running"
         end
         alias :delete :destroy
 
@@ -286,7 +286,7 @@ module Fog
         def power_operation(op)
           requires :href
           begin
-            connection.send(op.keys.first, href + "/power/action/#{op.values.first}" )
+            service.send(op.keys.first, href + "/power/action/#{op.values.first}" )
           rescue Excon::Errors::InternalServerError => e
             #Frankly we shouldn't get here ...
             raise e unless e.to_s =~ /because it is already powered o(n|ff)/
@@ -295,7 +295,7 @@ module Fog
         end
 
         def reload_status
-          server = connection.get_server(href)
+          server = service.get_server(href)
           self.status = server.status
           self.tasks = server.tasks
         end
diff --git a/lib/fog/vcloud/models/compute/servers.rb b/lib/fog/vcloud/models/compute/servers.rb
index ca4179a90..b98570a55 100644
--- a/lib/fog/vcloud/models/compute/servers.rb
+++ b/lib/fog/vcloud/models/compute/servers.rb
@@ -19,7 +19,7 @@ module Fog
         end
 
         def get(uri)
-          connection.get_vapp(uri)
+          service.get_vapp(uri)
         rescue Fog::Errors::NotFound
           nil
         end
@@ -27,7 +27,7 @@ module Fog
         def create options
           check_href!
           options[:vdc_uri] = href
-          data = connection.instantiate_vapp_template(options).body
+          data = service.instantiate_vapp_template(options).body
           object = new(data)
           object
         end
@@ -40,9 +40,9 @@ module Fog
 
         def init_vapp
           Fog::Vcloud::Compute::Vapp.new(
-            :connection => connection,
+            :service => service,
             :href => self.href,
-            :collection => Fog::Vcloud::Compute::Vapps.new(:connection => connection)
+            :collection => Fog::Vcloud::Compute::Vapps.new(:service => service)
           )
         end
 
diff --git a/lib/fog/vcloud/models/compute/tasks.rb b/lib/fog/vcloud/models/compute/tasks.rb
index c0532728b..61ba10c53 100644
--- a/lib/fog/vcloud/models/compute/tasks.rb
+++ b/lib/fog/vcloud/models/compute/tasks.rb
@@ -11,15 +11,15 @@ module Fog
         attribute :href, :aliases => :Href
 
         def all
-          self.href = connection.default_vdc_href unless self.href
+          self.href = service.default_vdc_href unless self.href
           check_href!
-          if data = connection.get_task_list(href).body[:Task]
+          if data = service.get_task_list(href).body[:Task]
             load(data)
           end
         end
 
         def get(uri)
-          connection.get_task(uri)
+          service.get_task(uri)
         rescue Fog::Errors::NotFound
           nil
         end
diff --git a/lib/fog/vcloud/models/compute/vapp.rb b/lib/fog/vcloud/models/compute/vapp.rb
index 72a135917..5e39ecfdc 100644
--- a/lib/fog/vcloud/models/compute/vapp.rb
+++ b/lib/fog/vcloud/models/compute/vapp.rb
@@ -25,7 +25,7 @@ module Fog
 
         def servers
           @servers ||= Fog::Vcloud::Compute::Servers.
-            new( :connection => connection,
+            new( :service => service,
                  :href => href,
                  :vapp => self
             )
@@ -33,7 +33,7 @@ module Fog
 
         def networks
           @networks ||= Fog::Vcloud::Compute::Networks.
-            new( :connection => connection,
+            new( :service => service,
                  :href => href
             )
         end
diff --git a/lib/fog/vcloud/models/compute/vapps.rb b/lib/fog/vcloud/models/compute/vapps.rb
index 56bd66803..0aeac9157 100644
--- a/lib/fog/vcloud/models/compute/vapps.rb
+++ b/lib/fog/vcloud/models/compute/vapps.rb
@@ -13,11 +13,11 @@ module Fog
         attribute :href
 
         def all
-          load([connection.get_vdc(connection.default_vdc_href).resource_entities].flatten.select { |re| re[:type] == "application/vnd.vmware.vcloud.vApp+xml" })
+          load([service.get_vdc(service.default_vdc_href).resource_entities].flatten.select { |re| re[:type] == "application/vnd.vmware.vcloud.vApp+xml" })
         end
 
         def get(uri)
-          connection.get_vapp(uri)
+          service.get_vapp(uri)
         rescue Fog::Errors::NotFound
           nil
         end
diff --git a/lib/fog/vcloud/models/compute/vdc.rb b/lib/fog/vcloud/models/compute/vdc.rb
index d05810659..59757b939 100644
--- a/lib/fog/vcloud/models/compute/vdc.rb
+++ b/lib/fog/vcloud/models/compute/vdc.rb
@@ -24,13 +24,13 @@ module Fog
 
         def networks
           @networks ||= Fog::Vcloud::Compute::Networks.
-            new( :connection => connection,
+            new( :service => service,
                  :href => href )
         end
 
         def vapps
           @vapps ||= Fog::Vcloud::Compute::Vapps.
-            new( :connection => connection,
+            new( :service => service,
                  :href => href
             )
         end
diff --git a/lib/fog/vcloud/models/compute/vdcs.rb b/lib/fog/vcloud/models/compute/vdcs.rb
index 7ad93a157..fd0418aa8 100644
--- a/lib/fog/vcloud/models/compute/vdcs.rb
+++ b/lib/fog/vcloud/models/compute/vdcs.rb
@@ -13,13 +13,13 @@ module Fog
         attribute :href
 
         def all
-          data = connection.get_organization(org_uri).links.select { |link| link[:type] == "application/vnd.vmware.vcloud.vdc+xml" }
+          data = service.get_organization(org_uri).links.select { |link| link[:type] == "application/vnd.vmware.vcloud.vdc+xml" }
           data.each { |link| link.delete_if { |key, value| [:rel].include?(key) } }
           load(data)
         end
 
         def get(uri)
-          connection.get_vdc(uri)
+          service.get_vdc(uri)
         rescue Fog::Errors::NotFound
           nil
         end
@@ -27,7 +27,7 @@ module Fog
         private
 
         def org_uri
-          self.href ||= connection.default_organization_uri
+          self.href ||= service.default_organization_uri
         end
       end
     end
diff --git a/lib/fog/virtual_box/compute.rb b/lib/fog/virtual_box/compute.rb
index 398f917d2..ebc3c2587 100644
--- a/lib/fog/virtual_box/compute.rb
+++ b/lib/fog/virtual_box/compute.rb
@@ -37,17 +37,17 @@ module Fog
             raise e.message
           end
 
-          @connection = ::VirtualBox::Global.global.lib.virtualbox
+          @service = ::VirtualBox::Global.global.lib.virtualbox
         end
 
         def respond_to?(method, *)
-          super or @connection.respond_to? method
+          super or @service.respond_to? method
         end
 
         # hack to provide 'requests'
         def method_missing(method_sym, *arguments, &block)
-          if @connection.respond_to?(method_sym)
-            @connection.send(method_sym, *arguments)
+          if @service.respond_to?(method_sym)
+            @service.send(method_sym, *arguments)
           else
             super
           end
diff --git a/lib/fog/virtual_box/models/compute/medium.rb b/lib/fog/virtual_box/models/compute/medium.rb
index 299eb8725..f6b4ba2fe 100644
--- a/lib/fog/virtual_box/models/compute/medium.rb
+++ b/lib/fog/virtual_box/models/compute/medium.rb
@@ -39,7 +39,7 @@ module Fog
         undef_method :medium_format
         def medium_format
           Fog::Compute::VirtualBox::MediumFormat.new(
-            :connection => connection,
+            :service => service,
             :raw        => raw.medium_format
           )
         end
@@ -55,7 +55,7 @@ module Fog
               :access_mode_read_write
             end
 
-            self.raw = connection.open_medium(location, device_type, access_mode)
+            self.raw = service.open_medium(location, device_type, access_mode)
 
           else
 
diff --git a/lib/fog/virtual_box/models/compute/mediums.rb b/lib/fog/virtual_box/models/compute/mediums.rb
index 8dfd67395..59b0658e0 100644
--- a/lib/fog/virtual_box/models/compute/mediums.rb
+++ b/lib/fog/virtual_box/models/compute/mediums.rb
@@ -11,9 +11,9 @@ module Fog
 
         def all
           data = []
-          data.concat(connection.dvd_images)
-          data.concat(connection.floppy_images)
-          data.concat(connection.hard_disks)
+          data.concat(service.dvd_images)
+          data.concat(service.floppy_images)
+          data.concat(service.hard_disks)
           data = data.map do |medium|
             {:raw => medium}
           end
@@ -21,7 +21,7 @@ module Fog
         end
 
         def get(medium_identity)
-          data = connection.find_medium(medium_identity)
+          data = service.find_medium(medium_identity)
           new(:raw => data)
         end
 
diff --git a/lib/fog/virtual_box/models/compute/nat_engine.rb b/lib/fog/virtual_box/models/compute/nat_engine.rb
index 571a1dd60..753b335ac 100644
--- a/lib/fog/virtual_box/models/compute/nat_engine.rb
+++ b/lib/fog/virtual_box/models/compute/nat_engine.rb
@@ -36,7 +36,7 @@ module Fog
         undef_method :redirects
         def redirects
           Fog::Compute::VirtualBox::NATRedirects.new(
-            :connection => connection,
+            :service => service,
             :machine    => machine,
             :nat_engine => self
           )
@@ -47,7 +47,7 @@ module Fog
         def raw
           @raw
         end
-        
+
         def raw=(new_raw)
           @raw = new_raw
           raw_attributes = {}
diff --git a/lib/fog/virtual_box/models/compute/network_adapter.rb b/lib/fog/virtual_box/models/compute/network_adapter.rb
index 6f4f9533e..cb7befa81 100644
--- a/lib/fog/virtual_box/models/compute/network_adapter.rb
+++ b/lib/fog/virtual_box/models/compute/network_adapter.rb
@@ -41,7 +41,7 @@ module Fog
         undef_method :nat_driver
         def nat_driver
           Fog::Compute::VirtualBox::NATEngine.new(
-            :connection       => connection,
+            :service       => service,
             :machine          => machine,
             :network_adapter  => self,
             :raw              => raw.nat_driver
diff --git a/lib/fog/virtual_box/models/compute/network_adapters.rb b/lib/fog/virtual_box/models/compute/network_adapters.rb
index 8392cf929..ea5144d5c 100644
--- a/lib/fog/virtual_box/models/compute/network_adapters.rb
+++ b/lib/fog/virtual_box/models/compute/network_adapters.rb
@@ -15,7 +15,7 @@ module Fog
           requires :machine
           data = []
           raw_machine = machine.instance_variable_get(:@raw)
-          connection.system_properties.network_adapter_count.times do |index|
+          service.system_properties.network_adapter_count.times do |index|
             data << {
               :raw  => raw_machine.get_network_adapter(index)
             }
diff --git a/lib/fog/virtual_box/models/compute/server.rb b/lib/fog/virtual_box/models/compute/server.rb
index 67761d598..7bcf91061 100644
--- a/lib/fog/virtual_box/models/compute/server.rb
+++ b/lib/fog/virtual_box/models/compute/server.rb
@@ -83,7 +83,7 @@ module Fog
             wait_for { raw.session_state == :closed }
           end
           raw.unregister(:full)
-          config_file = connection.compose_machine_filename(name)
+          config_file = service.compose_machine_filename(name)
           config_directory = config_file.split(File::SEPARATOR)[0...-1].join(File::SEPARATOR)
           FileUtils.rm_rf(config_directory)
           true
@@ -91,7 +91,7 @@ module Fog
 
         def network_adapters
           Fog::Compute::VirtualBox::NetworkAdapters.new(
-            :connection => connection,
+            :service => service,
             :machine => self
           )
         end
@@ -117,8 +117,8 @@ module Fog
         def save
           unless identity
             requires :name, :os
-            self.raw = connection.create_machine(nil, name, os)
-            connection.register_machine(raw)
+            self.raw = service.create_machine(nil, name, os)
+            service.register_machine(raw)
             with_session do |session|
               for attribute in [:description, :memory_size, :rtc_use_utc, :vram_size]
                 session.machine.send(:"#{attribute}=", attributes[attribute])
@@ -161,7 +161,7 @@ module Fog
 
         def storage_controllers
           Fog::Compute::VirtualBox::StorageControllers.new(
-            :connection => connection,
+            :service => service,
             :machine    => self
           )
         end
diff --git a/lib/fog/virtual_box/models/compute/servers.rb b/lib/fog/virtual_box/models/compute/servers.rb
index 29d7865d9..43bb2816d 100644
--- a/lib/fog/virtual_box/models/compute/servers.rb
+++ b/lib/fog/virtual_box/models/compute/servers.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::VirtualBox::Server
 
         def all
-          data = connection.machines.map do |machine|
+          data = service.machines.map do |machine|
             {
               :raw => machine
             }
@@ -28,7 +28,7 @@ module Fog
         end
 
         def get(server_id)
-          machine = connection.find_machine(server_id)
+          machine = service.find_machine(server_id)
           new(:raw => machine)
         rescue ::VirtualBox::Exceptions::ObjectNotFoundException
           nil
diff --git a/lib/fog/vmfusion/models/compute/server.rb b/lib/fog/vmfusion/models/compute/server.rb
index cd8c8e89d..2d7d645d4 100644
--- a/lib/fog/vmfusion/models/compute/server.rb
+++ b/lib/fog/vmfusion/models/compute/server.rb
@@ -27,7 +27,7 @@ module Fog
           requires :raw
 
           ::Fission::VM.clone(@raw[:fission].name,name)
-          return connection.servers.get(name)
+          return service.servers.get(name)
         end
 
         # Destroy, deletes the VM from the local disk but only hard stops the VM
diff --git a/lib/fog/voxel/models/compute/images.rb b/lib/fog/voxel/models/compute/images.rb
index 222bca33d..8eaa3fad8 100644
--- a/lib/fog/voxel/models/compute/images.rb
+++ b/lib/fog/voxel/models/compute/images.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Voxel::Image
 
         def all
-          data = connection.images_list.body['images']
+          data = service.images_list.body['images']
           load(data)
         end
 
         def get(image_id)
-          data = connection.images_list(image_id).body['images']
+          data = service.images_list(image_id).body['images']
 
           if data.empty?
             nil
diff --git a/lib/fog/voxel/models/compute/server.rb b/lib/fog/voxel/models/compute/server.rb
index cefa6758b..c55d1e58b 100644
--- a/lib/fog/voxel/models/compute/server.rb
+++ b/lib/fog/voxel/models/compute/server.rb
@@ -22,13 +22,13 @@ module Fog
 
         def destroy
           requires :id
-          connection.voxcloud_delete(id)
+          service.voxcloud_delete(id)
           true
         end
 
         def image
           requires :image_id
-          connection.images.get(image_id)
+          service.images.get(image_id)
         end
 
         def ready?
@@ -45,19 +45,19 @@ module Fog
 
         def reboot
           requires :id
-          connection.devices_power(id, :reboot)
+          service.devices_power(id, :reboot)
           true
         end
 
         def state
-          @state ||= connection.voxcloud_status(id).body['devices'].first['status']
+          @state ||= service.voxcloud_status(id).body['devices'].first['status']
         end
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :name, :image_id, :processing_cores, :facility, :disk_size
 
-          data = connection.voxcloud_create({
+          data = service.voxcloud_create({
             :disk_size => disk_size,
             :facility => facility,
             :hostname => name,
diff --git a/lib/fog/voxel/models/compute/servers.rb b/lib/fog/voxel/models/compute/servers.rb
index 7f4e43317..f2cefa87a 100644
--- a/lib/fog/voxel/models/compute/servers.rb
+++ b/lib/fog/voxel/models/compute/servers.rb
@@ -9,12 +9,12 @@ module Fog
         model Fog::Compute::Voxel::Server
 
         def all
-          data = connection.devices_list.body['devices'].select {|device| device['type']['id'] == '3'}
+          data = service.devices_list.body['devices'].select {|device| device['type']['id'] == '3'}
           load(data)
         end
 
         def get(device_id)
-          if device_id && server = connection.devices_list(device_id).body['devices']
+          if device_id && server = service.devices_list(device_id).body['devices']
             new(server.first)
           end
         rescue Fog::Service::Error => error
diff --git a/lib/fog/vsphere/models/compute/cluster.rb b/lib/fog/vsphere/models/compute/cluster.rb
index 5f35b4c19..d79d335fd 100644
--- a/lib/fog/vsphere/models/compute/cluster.rb
+++ b/lib/fog/vsphere/models/compute/cluster.rb
@@ -13,8 +13,8 @@ module Fog
         attribute :overall_status
 
         def resource_pools(filters = { })
-          self.attributes[:resource_pools] ||= id.nil? ? [] : connection.resource_pools({
-                                                                                          :connection => connection,
+          self.attributes[:resource_pools] ||= id.nil? ? [] : service.resource_pools({
+                                                                                          :service => service,
                                                                                           :cluster    => name,
                                                                                           :datacenter => datacenter
                                                                                         }.merge(filters))
diff --git a/lib/fog/vsphere/models/compute/clusters.rb b/lib/fog/vsphere/models/compute/clusters.rb
index c4d204c0c..c78d94bdd 100644
--- a/lib/fog/vsphere/models/compute/clusters.rb
+++ b/lib/fog/vsphere/models/compute/clusters.rb
@@ -12,12 +12,12 @@ module Fog
 
         def all(filters = {})
           requires :datacenter
-          load connection.list_clusters(filters.merge(:datacenter => datacenter))
+          load service.list_clusters(filters.merge(:datacenter => datacenter))
         end
 
         def get(id)
           requires :datacenter
-          new connection.get_cluster(id, datacenter)
+          new service.get_cluster(id, datacenter)
         end
 
       end
diff --git a/lib/fog/vsphere/models/compute/datacenter.rb b/lib/fog/vsphere/models/compute/datacenter.rb
index f032a4c36..2282e9a85 100644
--- a/lib/fog/vsphere/models/compute/datacenter.rb
+++ b/lib/fog/vsphere/models/compute/datacenter.rb
@@ -9,23 +9,23 @@ module Fog
         attribute :status
 
         def clusters filters = { }
-          connection.clusters({ :datacenter => name }.merge(filters))
+          service.clusters({ :datacenter => name }.merge(filters))
         end
 
         def networks filters = { }
-          connection.networks({ :datacenter => name }.merge(filters))
+          service.networks({ :datacenter => name }.merge(filters))
         end
 
         def datastores filters = { }
-          connection.datastores({ :datacenter => name }.merge(filters))
+          service.datastores({ :datacenter => name }.merge(filters))
         end
 
         def vm_folders filters = { }
-          connection.folders({ :datacenter => name, :type => :vm }.merge(filters))
+          service.folders({ :datacenter => name, :type => :vm }.merge(filters))
         end
-        
+
         def virtual_machines filters = {}
-          connection.servers({ :datacenter => name }.merge(filters))
+          service.servers({ :datacenter => name }.merge(filters))
         end
 
         def to_s
diff --git a/lib/fog/vsphere/models/compute/datacenters.rb b/lib/fog/vsphere/models/compute/datacenters.rb
index dc46108e7..234fa82bf 100644
--- a/lib/fog/vsphere/models/compute/datacenters.rb
+++ b/lib/fog/vsphere/models/compute/datacenters.rb
@@ -10,14 +10,14 @@ module Fog
         model Fog::Compute::Vsphere::Datacenter
 
         def all(filters = {})
-          load connection.list_datacenters(filters)
+          load service.list_datacenters(filters)
         end
 
         def get(name)
-          new connection.get_datacenter(name)
+          new service.get_datacenter(name)
         end
 
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/vsphere/models/compute/datastores.rb b/lib/fog/vsphere/models/compute/datastores.rb
index f716f8aad..acec5a139 100644
--- a/lib/fog/vsphere/models/compute/datastores.rb
+++ b/lib/fog/vsphere/models/compute/datastores.rb
@@ -11,12 +11,12 @@ module Fog
         attr_accessor :datacenter
 
         def all(filters = {})
-          load connection.list_datastores(filters.merge(:datacenter => datacenter))
+          load service.list_datastores(filters.merge(:datacenter => datacenter))
         end
 
         def get(id)
           requires :datacenter
-          new connection.get_datastore(id, datacenter)
+          new service.get_datastore(id, datacenter)
         end
 
       end
diff --git a/lib/fog/vsphere/models/compute/folder.rb b/lib/fog/vsphere/models/compute/folder.rb
index 0814a9051..abc0ff94a 100644
--- a/lib/fog/vsphere/models/compute/folder.rb
+++ b/lib/fog/vsphere/models/compute/folder.rb
@@ -14,7 +14,7 @@ module Fog
 
         def vms
           return [] if type.to_s != 'vm'
-          connection.servers(:folder => path, :datacenter => datacenter)
+          service.servers(:folder => path, :datacenter => datacenter)
         end
 
         def to_s
diff --git a/lib/fog/vsphere/models/compute/folders.rb b/lib/fog/vsphere/models/compute/folders.rb
index d067b6e3e..43417303b 100644
--- a/lib/fog/vsphere/models/compute/folders.rb
+++ b/lib/fog/vsphere/models/compute/folders.rb
@@ -13,12 +13,12 @@ module Fog
         def all(filters = { })
           requires :datacenter
           requires :type
-          load connection.list_folders(filters.merge(:datacenter => datacenter, :type => type, :path => path))
+          load service.list_folders(filters.merge(:datacenter => datacenter, :type => type, :path => path))
         end
 
         def get(id)
           requires :datacenter
-          new connection.get_folder(id, datacenter, type)
+          new service.get_folder(id, datacenter, type)
         end
 
       end
diff --git a/lib/fog/vsphere/models/compute/interfaces.rb b/lib/fog/vsphere/models/compute/interfaces.rb
index d3a0f97a3..7050efe03 100644
--- a/lib/fog/vsphere/models/compute/interfaces.rb
+++ b/lib/fog/vsphere/models/compute/interfaces.rb
@@ -15,16 +15,16 @@ module Fog
           requires :vm
           case vm
             when Fog::Compute::Vsphere::Server
-              load connection.list_vm_interfaces(vm.id)
+              load service.list_vm_interfaces(vm.id)
             when Fog::Compute::Vsphere::Template
-              load connection.list_template_interfaces(vm.id)
+              load service.list_template_interfaces(vm.id)
             else
             raise 'interfaces should have vm or template'
           end
         end
 
         def get(id)
-          new connection.get_interface(id)
+          new service.get_interface(id)
         end
 
      end
diff --git a/lib/fog/vsphere/models/compute/networks.rb b/lib/fog/vsphere/models/compute/networks.rb
index bededfab8..512e30902 100644
--- a/lib/fog/vsphere/models/compute/networks.rb
+++ b/lib/fog/vsphere/models/compute/networks.rb
@@ -11,12 +11,12 @@ module Fog
         attr_accessor :datacenter
 
         def all(filters = {})
-          load connection.list_networks(filters.merge(:datacenter => datacenter))
+          load service.list_networks(filters.merge(:datacenter => datacenter))
         end
 
         def get(id)
           requires :datacenter
-          new connection.get_network(id, datacenter)
+          new service.get_network(id, datacenter)
         end
 
       end
diff --git a/lib/fog/vsphere/models/compute/resource_pools.rb b/lib/fog/vsphere/models/compute/resource_pools.rb
index 80b342e57..ef132aef4 100644
--- a/lib/fog/vsphere/models/compute/resource_pools.rb
+++ b/lib/fog/vsphere/models/compute/resource_pools.rb
@@ -11,16 +11,16 @@ module Fog
         attr_accessor :datacenter, :cluster
 
         def all(filters = {})
-          load connection.list_resource_pools(filters.merge(:datacenter => datacenter, :cluster => cluster))
+          load service.list_resource_pools(filters.merge(:datacenter => datacenter, :cluster => cluster))
         end
 
         def get(id)
           requires :datacenter
           requires :cluster
-          new connection.get_resource_pool(id, cluster, datacenter)
+          new service.get_resource_pool(id, cluster, datacenter)
         end
 
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/fog/vsphere/models/compute/server.rb b/lib/fog/vsphere/models/compute/server.rb
index 60d060700..44065f56c 100644
--- a/lib/fog/vsphere/models/compute/server.rb
+++ b/lib/fog/vsphere/models/compute/server.rb
@@ -54,46 +54,46 @@ module Fog
 
         def vm_reconfig_memory(options = {})
           requires :instance_uuid, :memory
-          connection.vm_reconfig_memory('instance_uuid' => instance_uuid, 'memory' => memory)
+          service.vm_reconfig_memory('instance_uuid' => instance_uuid, 'memory' => memory)
         end
 
         def vm_reconfig_cpus(options = {})
           requires :instance_uuid, :cpus
-          connection.vm_reconfig_cpus('instance_uuid' => instance_uuid, 'cpus' => cpus)
+          service.vm_reconfig_cpus('instance_uuid' => instance_uuid, 'cpus' => cpus)
         end
 
         def vm_reconfig_hardware(options = {})
           requires :instance_uuid, :hardware_spec
-          connection.vm_reconfig_hardware('instance_uuid' => instance_uuid, 'hardware_spec' => hardware_spec)
+          service.vm_reconfig_hardware('instance_uuid' => instance_uuid, 'hardware_spec' => hardware_spec)
         end
 
         def start(options = {})
           requires :instance_uuid
-          connection.vm_power_on('instance_uuid' => instance_uuid)
+          service.vm_power_on('instance_uuid' => instance_uuid)
         end
 
         def stop(options = {})
           options = { :force => !tools_installed? }.merge(options)
           requires :instance_uuid
-          connection.vm_power_off('instance_uuid' => instance_uuid, 'force' => options[:force])
+          service.vm_power_off('instance_uuid' => instance_uuid, 'force' => options[:force])
         end
 
         def reboot(options = {})
           options = { :force => false }.merge(options)
           requires :instance_uuid
-          connection.vm_reboot('instance_uuid' => instance_uuid, 'force' => options[:force])
+          service.vm_reboot('instance_uuid' => instance_uuid, 'force' => options[:force])
         end
 
         def destroy(options = {})
           requires :instance_uuid
           stop if ready? # need to turn it off before destroying
-          connection.vm_destroy('instance_uuid' => instance_uuid)
+          service.vm_destroy('instance_uuid' => instance_uuid)
         end
 
         def migrate(options = {})
           options = { :priority => 'defaultPriority' }.merge(options)
           requires :instance_uuid
-          connection.vm_migrate('instance_uuid' => instance_uuid, 'priority' => options[:priority])
+          service.vm_migrate('instance_uuid' => instance_uuid, 'priority' => options[:priority])
         end
 
         # Clone from a server object
@@ -111,13 +111,13 @@ module Fog
           req_options['template_path'] ="#{relative_path}/#{name}"
           req_options['datacenter'] = "#{datacenter}"
           # Perform the actual clone
-          clone_results = connection.vm_clone(req_options)
+          clone_results = service.vm_clone(req_options)
           # Create the new VM model. TODO This only works when "wait=true"
           new_vm = self.class.new(clone_results['new_vm'])
           # We need to assign the collection and the connection otherwise we
           # cannot reload the model.
           new_vm.collection = self.collection
-          new_vm.connection = self.connection
+          new_vm.service = service
           # Return the new VM model.
           new_vm
         end
@@ -133,13 +133,13 @@ module Fog
         # defines VNC attributes on the hypervisor
         def config_vnc(options = {})
           requires :instance_uuid
-          connection.vm_config_vnc(options.merge('instance_uuid' => instance_uuid))
+          service.vm_config_vnc(options.merge('instance_uuid' => instance_uuid))
         end
 
-        # returns a hash of VNC attributes required for connection
+        # returns a hash of VNC attributes required for service
         def vnc
           requires :instance_uuid
-          connection.vm_get_vnc(instance_uuid)
+          service.vm_get_vnc(instance_uuid)
         end
 
         def memory
@@ -151,25 +151,25 @@ module Fog
         end
 
         def interfaces
-          attributes[:interfaces] ||= id.nil? ? [] : connection.interfaces( :vm => self )
+          attributes[:interfaces] ||= id.nil? ? [] : service.interfaces( :vm => self )
         end
 
         def volumes
-          attributes[:volumes] ||= id.nil? ? [] : connection.volumes( :vm => self )
+          attributes[:volumes] ||= id.nil? ? [] : service.volumes( :vm => self )
         end
 
         def folder
           return nil unless datacenter and path
-          attributes[:folder] ||= connection.folders(:datacenter => datacenter, :type => :vm).get(path)
+          attributes[:folder] ||= service.folders(:datacenter => datacenter, :type => :vm).get(path)
         end
 
         def save
           requires :name, :cluster, :datacenter
           if persisted?
             raise "update is not supported yet"
-           # connection.update_vm(attributes)
+           # service.update_vm(attributes)
           else
-            self.id = connection.create_vm(attributes)
+            self.id = service.create_vm(attributes)
           end
           reload
         end
@@ -199,13 +199,13 @@ module Fog
 
         def initialize_interfaces
           if attributes[:interfaces] and attributes[:interfaces].is_a?(Array)
-            self.attributes[:interfaces].map! { |nic| nic.is_a?(Hash) ? connection.interfaces.new(nic) : nic }
+            self.attributes[:interfaces].map! { |nic| nic.is_a?(Hash) ? service.interfaces.new(nic) : nic }
           end
         end
 
         def initialize_volumes
           if attributes[:volumes] and attributes[:volumes].is_a?(Array)
-            self.attributes[:volumes].map! { |vol| vol.is_a?(Hash) ? connection.volumes.new(vol) : vol }
+            self.attributes[:volumes].map! { |vol| vol.is_a?(Hash) ? service.volumes.new(vol) : vol }
           end
         end
       end
diff --git a/lib/fog/vsphere/models/compute/servers.rb b/lib/fog/vsphere/models/compute/servers.rb
index 7cc984708..46672e4b5 100644
--- a/lib/fog/vsphere/models/compute/servers.rb
+++ b/lib/fog/vsphere/models/compute/servers.rb
@@ -17,7 +17,7 @@ module Fog
         # 'folder' => '/Datacenters/vm/Jeff/Templates' will be MUCH faster.
         # than simply listing everything.
         def all(filters = { })
-          load connection.list_virtual_machines(filters.merge(
+          load service.list_virtual_machines(filters.merge(
                                                   :datacenter    => datacenter,
                                                   :cluster       => cluster,
                                                   :network       => network,
@@ -27,7 +27,7 @@ module Fog
         end
 
         def get(id, datacenter = nil)
-          new connection.get_virtual_machine id, datacenter
+          new service.get_virtual_machine id, datacenter
         rescue Fog::Compute::Vsphere::NotFound
           nil
         end
diff --git a/lib/fog/vsphere/models/compute/templates.rb b/lib/fog/vsphere/models/compute/templates.rb
index 92cc777b1..1d559d821 100644
--- a/lib/fog/vsphere/models/compute/templates.rb
+++ b/lib/fog/vsphere/models/compute/templates.rb
@@ -10,11 +10,11 @@ module Fog
         model Fog::Compute::Vsphere::Template
 
         def all(filters = {})
-          load connection.list_templates(filters)
+          load service.list_templates(filters)
         end
 
         def get(id)
-          new connection.get_template(id)
+          new service.get_template(id)
         end
 
       end
diff --git a/lib/fog/vsphere/models/compute/volumes.rb b/lib/fog/vsphere/models/compute/volumes.rb
index 6d36afb06..c3740dec2 100644
--- a/lib/fog/vsphere/models/compute/volumes.rb
+++ b/lib/fog/vsphere/models/compute/volumes.rb
@@ -15,16 +15,16 @@ module Fog
           requires :vm
           case vm
             when Fog::Compute::Vsphere::Server
-              load connection.list_vm_volumes(vm.id)
+              load service.list_vm_volumes(vm.id)
             when Fog::Compute::Vsphere::Template
-              load connection.list_template_volumes(vm.id)
+              load service.list_template_volumes(vm.id)
             else
               raise 'volumes should have vm or template'
           end
         end
 
         def get(id)
-          new connection.get_volume(id)
+          new service.get_volume(id)
         end
 
      end
diff --git a/lib/fog/vsphere/requests/compute/get_virtual_machine.rb b/lib/fog/vsphere/requests/compute/get_virtual_machine.rb
index 63578b19c..afb0a89b0 100644
--- a/lib/fog/vsphere/requests/compute/get_virtual_machine.rb
+++ b/lib/fog/vsphere/requests/compute/get_virtual_machine.rb
@@ -12,7 +12,7 @@ module Fog
           vm = case id
                  # UUID based
                  when /[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}/
-                   @connection.searchIndex.FindByUuid :uuid => id, :vmSearch => true, :instanceUuid => true, :datacenter => dc
+                   @service.searchIndex.FindByUuid :uuid => id, :vmSearch => true, :instanceUuid => true, :datacenter => dc
                  else
                    # try to find based on VM name
                    if dc
diff --git a/lib/fog/vsphere/requests/compute/list_virtual_machines.rb b/lib/fog/vsphere/requests/compute/list_virtual_machines.rb
index 9e6084ab7..5a6df2e57 100644
--- a/lib/fog/vsphere/requests/compute/list_virtual_machines.rb
+++ b/lib/fog/vsphere/requests/compute/list_virtual_machines.rb
@@ -9,7 +9,7 @@ module Fog
 
           options[:folder] ||= options['folder']
           if options['instance_uuid'] then
-            [connection.get_virtual_machine(options['instance_uuid'])]
+            [service.get_virtual_machine(options['instance_uuid'])]
           elsif options[:folder] && options[:datacenter] then
             list_all_virtual_machines_in_folder(options[:folder], options[:datacenter])
           else
diff --git a/lib/fog/xenserver/models/compute/host.rb b/lib/fog/xenserver/models/compute/host.rb
index 9dbde6a56..acc50baea 100644
--- a/lib/fog/xenserver/models/compute/host.rb
+++ b/lib/fog/xenserver/models/compute/host.rb
@@ -7,9 +7,9 @@ module Fog
       class Host < Fog::Model
         # API Reference here:
         # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=host
-        
+
         identity :reference
-        
+
         attribute :name,              :aliases => :name_label
         attribute :uuid
         attribute :address
@@ -22,17 +22,17 @@ module Fog
         attribute :__pbds,            :aliases => :PBDs
         attribute :__pifs,            :aliases => :PIFs
         attribute :__resident_vms,      :aliases => :resident_VMs
-        
+
         def pifs
-          __pifs.collect { |pif| connection.pifs.get pif }
+          __pifs.collect { |pif| service.pifs.get pif }
         end
 
         def pbds
-          __pbds.collect { |pbd| connection.pbds.get pbd }
+          __pbds.collect { |pbd| service.pbds.get pbd }
         end
 
         def resident_servers
-          __resident_vms.collect { |ref| connection.servers.get ref }
+          __resident_vms.collect { |ref| service.servers.get ref }
         end
 
         def resident_vms
@@ -41,7 +41,7 @@ module Fog
 
         def metrics
           return nil unless __metrics
-          rec = connection.get_record(__metrics, 'host_metrics' )
+          rec = service.get_record(__metrics, 'host_metrics' )
           Fog::Compute::XenServer::HostMetrics.new(rec)
         end
 
@@ -107,7 +107,7 @@ module Fog
         end
 
       end
-      
+
     end
   end
 end
diff --git a/lib/fog/xenserver/models/compute/hosts.rb b/lib/fog/xenserver/models/compute/hosts.rb
index 62822988d..4342b0415 100644
--- a/lib/fog/xenserver/models/compute/hosts.rb
+++ b/lib/fog/xenserver/models/compute/hosts.rb
@@ -4,26 +4,26 @@ require 'fog/xenserver/models/compute/host'
 module Fog
   module Compute
     class XenServer
-      
+
       class Hosts < Fog::Collection
-        
+
         model Fog::Compute::XenServer::Host
-        
+
         def all(options={})
-          data = connection.get_records 'host'
+          data = service.get_records 'host'
           load(data)
         end
-        
+
         def get( host_ref )
-          if host_ref && host = connection.get_record( host_ref, 'host' )
+          if host_ref && host = service.get_record( host_ref, 'host' )
             new(host)
           else
             nil
           end
         end
-        
+
       end
-      
+
     end
   end
 end
diff --git a/lib/fog/xenserver/models/compute/network.rb b/lib/fog/xenserver/models/compute/network.rb
index fb4f277fc..05eb8574f 100644
--- a/lib/fog/xenserver/models/compute/network.rb
+++ b/lib/fog/xenserver/models/compute/network.rb
@@ -3,15 +3,15 @@ require 'fog/core/model'
 module Fog
   module Compute
     class XenServer
-    
+
       class Network < Fog::Model
         # API Reference here:
         # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=network
-        
+
         identity :reference
-        
+
         attribute :uuid
-        attribute :__vifs,             :aliases => :VIFs 
+        attribute :__vifs,             :aliases => :VIFs
         attribute :tags
         attribute :mtu,                :aliases => :MTU
         attribute :bridge
@@ -19,23 +19,23 @@ module Fog
         attribute :name,               :aliases => :name_label
         attribute :other_config
         attribute :__pifs,               :aliases => :PIFs
-        attribute :allowed_operations   
+        attribute :allowed_operations
         attribute :current_operations
         attribute :blobs
-        
+
         def refresh
-          data = connection.get_record( reference, 'network' )
+          data = service.get_record( reference, 'network' )
           merge_attributes( data )
           true
         end
-        
+
         #
         # Return the list of network related PIFs
         #
         def pifs
           p = []
           __pifs.each do |pif|
-            p << connection.pifs.get(pif)
+            p << service.pifs.get(pif)
           end
           p
         end
@@ -46,13 +46,13 @@ module Fog
         def vifs
           v = []
           __vifs.each do |vif|
-            v << connection.vifs.get(vif)
+            v << service.vifs.get(vif)
           end
           v
         end
 
       end
-      
+
     end
   end
 end
diff --git a/lib/fog/xenserver/models/compute/networks.rb b/lib/fog/xenserver/models/compute/networks.rb
index 90d2f4089..0048991fe 100644
--- a/lib/fog/xenserver/models/compute/networks.rb
+++ b/lib/fog/xenserver/models/compute/networks.rb
@@ -8,18 +8,18 @@ module Fog
       class Networks < Fog::Collection
 
         model Fog::Compute::XenServer::Network
-        
+
         def initialize(attributes)
           super
         end
 
         def all(options = {})
-          data = connection.get_records 'network'
+          data = service.get_records 'network'
           load(data)
         end
 
         def get( ref )
-          if ref && obj = connection.get_record( ref, 'network' )
+          if ref && obj = service.get_record( ref, 'network' )
             new(obj)
           end
         rescue Fog::XenServer::NotFound
diff --git a/lib/fog/xenserver/models/compute/pbd.rb b/lib/fog/xenserver/models/compute/pbd.rb
index 7130c9103..ed96cfa3d 100644
--- a/lib/fog/xenserver/models/compute/pbd.rb
+++ b/lib/fog/xenserver/models/compute/pbd.rb
@@ -3,20 +3,20 @@ require 'fog/core/model'
 module Fog
   module Compute
     class XenServer
-    
+
       class PBD < Fog::Model
         # API Reference here:
         # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=PBD
-        
+
         identity :reference
-        
+
         attribute :uuid
         attribute :__host,             :aliases => :host
         attribute :__sr,               :aliases => :SR
         attribute :currently_attached
 
         def sr
-          connection.storage_repositories.get __sr
+          service.storage_repositories.get __sr
         end
 
         def storage_repository
@@ -24,7 +24,7 @@ module Fog
         end
 
         def host
-          connection.hosts.get __host
+          service.hosts.get __host
         end
         
         def unplug
@@ -32,7 +32,7 @@ module Fog
         end
 
       end
-      
+
     end
   end
 end
diff --git a/lib/fog/xenserver/models/compute/pbds.rb b/lib/fog/xenserver/models/compute/pbds.rb
index 0c97907ac..de765a341 100644
--- a/lib/fog/xenserver/models/compute/pbds.rb
+++ b/lib/fog/xenserver/models/compute/pbds.rb
@@ -8,18 +8,18 @@ module Fog
       class Pbds < Fog::Collection
 
         model Fog::Compute::XenServer::PBD
-        
+
         def initialize(attributes)
           super
         end
 
         def all(options = {})
-          data = connection.get_records 'PBD'
+          data = service.get_records 'PBD'
           load(data)
         end
 
         def get( ref )
-          if ref && obj = connection.get_record( ref, 'PBD' )
+          if ref && obj = service.get_record( ref, 'PBD' )
             new(obj)
           else
             nil
diff --git a/lib/fog/xenserver/models/compute/pif.rb b/lib/fog/xenserver/models/compute/pif.rb
index c3cb9654d..dfebda149 100644
--- a/lib/fog/xenserver/models/compute/pif.rb
+++ b/lib/fog/xenserver/models/compute/pif.rb
@@ -3,13 +3,13 @@ require 'fog/core/model'
 module Fog
   module Compute
     class XenServer
-    
+
       class PIF < Fog::Model
         # API Reference here:
         # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=PIF
-        
+
         identity :reference
-        
+
         attribute :uuid
         attribute :physical
         attribute :mac,                     :aliases => :MAC
@@ -20,7 +20,7 @@ module Fog
         attribute :dns,                     :aliases => :DNS
         attribute :gateway
         attribute :ip,                      :aliases => :IP
-        attribute :ip_configuration_mode    
+        attribute :ip_configuration_mode
         attribute :mtu,                     :aliases => :MTU
         attribute :__network,               :aliases => :network
         attribute :netmask
@@ -30,17 +30,17 @@ module Fog
         attribute :vlan,                    :aliases => :VLAN
         attribute :other_config
         attribute :__host,                  :aliases => :host
-        
+
         def network
-          connection.networks.get __network
+          service.networks.get __network
         end
 
         def host
-          connection.hosts.get __host
+          service.hosts.get __host
         end
-      
+
       end
-      
+
     end
   end
 end
diff --git a/lib/fog/xenserver/models/compute/pifs.rb b/lib/fog/xenserver/models/compute/pifs.rb
index 448022de0..f7e8ae4ed 100644
--- a/lib/fog/xenserver/models/compute/pifs.rb
+++ b/lib/fog/xenserver/models/compute/pifs.rb
@@ -8,18 +8,18 @@ module Fog
       class Pifs < Fog::Collection
 
         model Fog::Compute::XenServer::PIF
-        
+
         def initialize(attributes)
           super
         end
 
         def all(options = {})
-          data = connection.get_records 'PIF'
+          data = service.get_records 'PIF'
           load(data)
         end
 
         def get( ref )
-          if ref && obj = connection.get_record( ref, 'PIF' )
+          if ref && obj = service.get_record( ref, 'PIF' )
             new(obj)
           end
         rescue Fog::XenServer::NotFound
diff --git a/lib/fog/xenserver/models/compute/pool.rb b/lib/fog/xenserver/models/compute/pool.rb
index a9c580d0e..dd5a78159 100644
--- a/lib/fog/xenserver/models/compute/pool.rb
+++ b/lib/fog/xenserver/models/compute/pool.rb
@@ -3,27 +3,27 @@ require 'fog/core/model'
 module Fog
   module Compute
     class XenServer
-    
+
       class Pool < Fog::Model
         # API Reference here:
         # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=pool
-        
+
         identity :reference
-        
+
         attribute :uuid
         attribute :name,                   :aliases => :name_label
         attribute :description,            :aliases => :name_description
         attribute :__default_sr,           :aliases => :default_SR
         attribute :__master,               :aliases => :master
-        attribute :tags 
+        attribute :tags
         attribute :restrictions
         attribute :ha_enabled
         attribute :vswitch_controller
         attribute :__suspend_image_sr,     :aliases => :suspend_image_SR
 
-        
+
         def default_sr
-          connection.storage_repositories.get __default_sr
+          service.storage_repositories.get __default_sr
         end
 
         def default_sr=(sr)
@@ -44,7 +44,7 @@ module Fog
         end
 
         def master
-          connection.hosts.get __master
+          service.hosts.get __master
         end
         
         def set_attribute(name, *val)
@@ -56,7 +56,7 @@ module Fog
         end
 
       end
-      
+
     end
   end
 end
diff --git a/lib/fog/xenserver/models/compute/pools.rb b/lib/fog/xenserver/models/compute/pools.rb
index 5caeff634..c39c0740c 100644
--- a/lib/fog/xenserver/models/compute/pools.rb
+++ b/lib/fog/xenserver/models/compute/pools.rb
@@ -8,18 +8,18 @@ module Fog
       class Pools < Fog::Collection
 
         model Fog::Compute::XenServer::Pool
-        
+
         def initialize(attributes)
           super
         end
 
         def all(options = {})
-          data = connection.get_records 'pool'
+          data = service.get_records 'pool'
           load(data)
         end
 
         def get( pool_ref )
-          if pool_ref && pool = connection.get_record( pool_ref, 'pool' )
+          if pool_ref && pool = service.get_record( pool_ref, 'pool' )
             new(pool)
           else
             nil
diff --git a/lib/fog/xenserver/models/compute/server.rb b/lib/fog/xenserver/models/compute/server.rb
index fc2a7439f..dba41b960 100644
--- a/lib/fog/xenserver/models/compute/server.rb
+++ b/lib/fog/xenserver/models/compute/server.rb
@@ -7,9 +7,9 @@ module Fog
       class Server < Fog::Compute::Server
         # API Reference here:
         # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VM
-        
+
         identity :reference
-        
+
         attribute :uuid
         attribute :name,                 :aliases => :name_label
         attribute :__affinity,           :aliases => :affinity
@@ -56,11 +56,11 @@ module Fog
         end
 
         def vbds
-          __vbds.collect {|vbd| connection.vbds.get vbd }
+          __vbds.collect {|vbd| service.vbds.get vbd }
         end
 
         def affinity
-          connection.hosts.get __affinity
+          service.hosts.get __affinity
         end
 
         def destroy
@@ -74,26 +74,26 @@ module Fog
                 if vbd.vdi.allowed_operations.include?("destroy")
             end
           end
-          connection.destroy_server( reference )
+          service.destroy_server( reference )
           true
         end
 
         def set_attribute(name, *val)
-          data = connection.set_attribute( 'VM', reference, name, *val )
+          data = service.set_attribute( 'VM', reference, name, *val )
           # Do not reload automatically for performance reasons
           # We can set multiple attributes at the same time and
           # then reload manually
           #reload
         end
-        
+
         def refresh
-          data = connection.get_record( reference, 'VM' )
+          data = service.get_record( reference, 'VM' )
           merge_attributes( data )
           true
         end
 
         def vifs
-          __vifs.collect { |vif| connection.vifs.get vif }
+          __vifs.collect { |vif| service.vifs.get vif }
         end
 
         # associations
@@ -102,44 +102,44 @@ module Fog
         end
 
         def resident_on
-          connection.hosts.get __resident_on
+          service.hosts.get __resident_on
         end
-        
+
         #
         # This is not always present in XenServer VMs
         # Guest needs XenTools installed to report this AFAIK
         def guest_metrics
           return nil unless __guest_metrics
-          rec = connection.get_record( __guest_metrics, 'VM_guest_metrics' )
+          rec = service.get_record( __guest_metrics, 'VM_guest_metrics' )
           Fog::Compute::XenServer::GuestMetrics.new(rec)
         end
 
         def tools_installed?
           !guest_metrics.nil?
         end
-        
+
         def home_hypervisor
-          connection.hosts.first
+          service.hosts.first
         end
-        
+
         def mac_address
           networks.first.MAC
         end
-        
+
         def running?
           reload
           power_state == "Running"
         end
-        
+
         def halted?
           reload
           power_state == "Halted"
         end
-        
+
         # operations
         def start
           return false if running?
-          connection.start_server( reference )
+          service.start_server( reference )
           true
         end
 
@@ -149,25 +149,25 @@ module Fog
           if params[:auto_start].nil?
             auto_start = true
           else
-            auto_start = params[:auto_start] 
+            auto_start = params[:auto_start]
           end
           if template_name
-            attr = connection.get_record(
-              connection.create_server( name, template_name, nets, :auto_start => auto_start),
+            attr = service.get_record(
+              service.create_server( name, template_name, nets, :auto_start => auto_start),
               'VM'
             )
           else
-            attr = connection.get_record(
-              connection.create_server_raw(attributes),
+            attr = service.get_record(
+              service.create_server_raw(attributes),
               'VM'
             )
           end
-          merge_attributes attr 
+          merge_attributes attr
           true
         end
 
         def reboot(stype = 'clean')
-          connection.reboot_server(reference, stype)
+          service.reboot_server(reference, stype)
           true
         end
 
@@ -181,7 +181,7 @@ module Fog
 
         def stop(stype = 'clean')
           return false if !running?
-          connection.shutdown_server( reference, stype )
+          service.shutdown_server( reference, stype )
           wait_for { power_state == 'Halted' }
           true
         end
@@ -195,12 +195,12 @@ module Fog
         end
 
         def provision
-          connection.provision_server reference
+          service.provision_server reference
         end
 
         # def snapshot
         #   requires :reference, :name_label
-        #   data = connection.snapshot_server(@reference, @name_label)
+        #   data = service.snapshot_server(@reference, @name_label)
         #   merge_attributes(data.body)
         #   true
         # end
diff --git a/lib/fog/xenserver/models/compute/servers.rb b/lib/fog/xenserver/models/compute/servers.rb
index 345a5ae45..cd3e4f93e 100644
--- a/lib/fog/xenserver/models/compute/servers.rb
+++ b/lib/fog/xenserver/models/compute/servers.rb
@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::XenServer::Server
 
         def templates
-          data = connection.get_records 'VM'
+          data = service.get_records 'VM'
           data.delete_if do |vm|
             !vm[:is_a_template]
           end
@@ -18,15 +18,15 @@ module Fog
         end
 
         def custom_templates
-          data = connection.get_records 'VM'
+          data = service.get_records 'VM'
           data.delete_if do |vm|
-            !vm[:is_a_template] or !vm[:other_config]['default_template'].nil? 
+            !vm[:is_a_template] or !vm[:other_config]['default_template'].nil?
           end
           load(data)
         end
-        
+
         def builtin_templates
-          data = connection.get_records 'VM'
+          data = service.get_records 'VM'
           data.delete_if do |vm|
             !vm[:is_a_template] or vm[:other_config]['default_template'].nil?
           end
@@ -34,7 +34,7 @@ module Fog
         end
 
         def all(options = {})
-          data = connection.get_records 'VM'
+          data = service.get_records 'VM'
           # Exclude templates
           data.delete_if { |vm| vm[:is_control_domain] or vm[:is_a_template] }
           data.delete_if { |vm| vm[:is_a_snapshot] and !options[:include_snapshots] }
@@ -44,12 +44,12 @@ module Fog
         end
 
         def get_by_name( name )
-          ref = connection.get_vm_by_name( name )
+          ref = service.get_vm_by_name( name )
           get ref
         end
 
         def get( vm_ref )
-          if vm_ref && vm = connection.get_record( vm_ref, 'VM' )
+          if vm_ref && vm = service.get_record( vm_ref, 'VM' )
             new(vm)
           end
         rescue Fog::XenServer::NotFound
diff --git a/lib/fog/xenserver/models/compute/storage_repositories.rb b/lib/fog/xenserver/models/compute/storage_repositories.rb
index 4b23087a0..e3be7b940 100644
--- a/lib/fog/xenserver/models/compute/storage_repositories.rb
+++ b/lib/fog/xenserver/models/compute/storage_repositories.rb
@@ -10,14 +10,14 @@ module Fog
         model Fog::Compute::XenServer::StorageRepository
 
         def all
-          data = connection.get_records 'SR'
+          data = service.get_records 'SR'
           #data.delete_if {|sr| sr[:shared].eql?(false)}
           #data.delete_if {|sr| sr[:content_type].eql?('iso')}
           load(data)
         end
 
         def get( sr_ref )
-          if sr_ref && sr = connection.get_record( sr_ref, 'SR' )
+          if sr_ref && sr = service.get_record( sr_ref, 'SR' )
             new(sr)
           else
             nil
diff --git a/lib/fog/xenserver/models/compute/storage_repository.rb b/lib/fog/xenserver/models/compute/storage_repository.rb
index 89e6eebeb..5422950ce 100644
--- a/lib/fog/xenserver/models/compute/storage_repository.rb
+++ b/lib/fog/xenserver/models/compute/storage_repository.rb
@@ -3,13 +3,13 @@ require 'fog/core/model'
 module Fog
   module Compute
     class XenServer
-    
+
       class StorageRepository < Fog::Model
         # API Reference here:
         # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=SR
-        
+
         identity :reference
-        
+
         attribute :name,                 :aliases => :name_label
         attribute :description,          :aliases => :name_description
         attribute :uuid
@@ -26,17 +26,17 @@ module Fog
         attribute :physical_utilisation
         attribute :sm_config
         attribute :virtual_allocation
-        
+
         def vdis
-          __vdis.collect { |vdi| connection.vdis.get vdi }
+          __vdis.collect { |vdi| service.vdis.get vdi }
         end
-        
+
         def pbds
-          __pbds.collect { |pbd| connection.pbds.get pbd }
+          __pbds.collect { |pbd| service.pbds.get pbd }
         end
 
         def scan
-          connection.scan_sr reference
+          service.scan_sr reference
           reload
         end
 
@@ -84,7 +84,7 @@ module Fog
         end
 
       end
-      
+
     end
   end
 end
diff --git a/lib/fog/xenserver/models/compute/vbd.rb b/lib/fog/xenserver/models/compute/vbd.rb
index 4611e9e37..9fa22470f 100644
--- a/lib/fog/xenserver/models/compute/vbd.rb
+++ b/lib/fog/xenserver/models/compute/vbd.rb
@@ -3,13 +3,13 @@ require 'fog/core/model'
 module Fog
   module Compute
     class XenServer
-    
+
       class VBD < Fog::Model
         # API Reference here:
         # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VBD
-        
+
         identity :reference
-        
+
         attribute :uuid
         attribute :currently_attached
         attribute :allowed_operations
@@ -23,7 +23,7 @@ module Fog
         attribute :userdevice
         attribute :empty
         attribute :type
-        attribute :mode        
+        attribute :mode
         attribute :storage_lock
         attribute :runtime_properties
         attribute :unpluggable
@@ -38,36 +38,36 @@ module Fog
         # May return nil
         #
         def vdi
-          connection.vdis.get __vdi
+          service.vdis.get __vdi
         end
 
         #
         # TODO: May it return nil?
         #
         def server
-          connection.servers.get __vm
+          service.servers.get __vm
         end
 
         def save
           requires :vdi, :server
-          ref = connection.create_vbd attributes[:server], attributes[:vdi], attributes
-          merge_attributes connection.vbds.get(ref).attributes
+          ref = service.create_vbd attributes[:server], attributes[:vdi], attributes
+          merge_attributes service.vbds.get(ref).attributes
         end
 
         def unplug
-          connection.unplug_vbd reference
+          service.unplug_vbd reference
         end
 
         def unplug_force
-          connection.unplug_force_vbd reference
+          service.unplug_force_vbd reference
         end
-        
+
         def eject
-          connection.eject_vbd reference
+          service.eject_vbd reference
         end
-        
+
         def insert(vdi)
-          connection.insert_vbd reference, vdi.reference
+          service.insert_vbd reference, vdi.reference
         end
 
         #
@@ -79,12 +79,12 @@ module Fog
         #
         def metrics
           return nil unless currently_attached
-          rec = connection.get_record( __metrics, 'VBD_metrics' )
+          rec = service.get_record( __metrics, 'VBD_metrics' )
           Fog::Compute::XenServer::VbdMetrics.new(rec)
         end
 
       end
-      
+
     end
   end
 end
diff --git a/lib/fog/xenserver/models/compute/vbds.rb b/lib/fog/xenserver/models/compute/vbds.rb
index 13e5295f4..0e9eb9505 100644
--- a/lib/fog/xenserver/models/compute/vbds.rb
+++ b/lib/fog/xenserver/models/compute/vbds.rb
@@ -8,18 +8,18 @@ module Fog
       class Vbds < Fog::Collection
 
         model Fog::Compute::XenServer::VBD
-        
+
         def initialize(attributes)
           super
         end
 
         def all(options = {})
-          data = connection.get_records 'VBD'
+          data = service.get_records 'VBD'
           load(data)
         end
 
         def get( vbd_ref )
-          if vbd_ref && vbd = connection.get_record( vbd_ref, 'VBD' )
+          if vbd_ref && vbd = service.get_record( vbd_ref, 'VBD' )
             new(vbd)
           end
         rescue Fog::XenServer::NotFound
diff --git a/lib/fog/xenserver/models/compute/vdi.rb b/lib/fog/xenserver/models/compute/vdi.rb
index 9f05a88d8..da3f3e964 100644
--- a/lib/fog/xenserver/models/compute/vdi.rb
+++ b/lib/fog/xenserver/models/compute/vdi.rb
@@ -3,13 +3,13 @@ require 'fog/core/model'
 module Fog
   module Compute
     class XenServer
-    
+
       class VDI < Fog::Model
         # API Reference here:
         # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VDI
-        
+
         identity :reference
-        
+
         attribute :uuid
         attribute :is_a_snapshot
         attribute :name,                        :aliases => :name_label
@@ -34,10 +34,10 @@ module Fog
         attribute :on_boot
         attribute :sm_config
         attribute :snapshot_time
-        attribute :__snapshots,                 :aliases => :snapshots 
+        attribute :__snapshots,                 :aliases => :snapshots
         attribute :__snapshot_of,               :aliases => :snapshot_of
         attribute :xenstore_data
-        
+
         #
         # Default VDI type is system
         # Default size 8GB
@@ -50,45 +50,45 @@ module Fog
           self.read_only ||= false unless attributes[:read_only]
           self.sharable ||= false unless attributes[:sharable]
           self.other_config ||= {} unless attributes[:other_config]
-          super 
+          super
         end
-        
+
         def set_attribute(name, *val)
-          data = connection.set_attribute( 'VDI', reference, name, *val )
+          data = service.set_attribute( 'VDI', reference, name, *val )
         end
 
         def snapshot_of
-          connection.vdis.get __sr
+          service.vdis.get __sr
         end
 
         def parent
-          connection.vdis.get __parent
+          service.vdis.get __parent
         end
 
         def snapshots
           __snapshots.collect do |ref|
-            connection.vdis.get ref
+            service.vdis.get ref
           end
         end
 
         def vbds
           __vbds.collect do |ref|
-            connection.vbds.get ref
+            service.vbds.get ref
           end
         end
 
         def save
           requires :name, :storage_repository
-          ref = connection.create_vdi attributes
-          merge_attributes connection.vdis.get(ref).attributes
+          ref = service.create_vdi attributes
+          merge_attributes service.vdis.get(ref).attributes
         end
 
         def destroy
-          connection.destroy_vdi reference
+          service.destroy_vdi reference
         end
 
         def storage_repository
-          connection.storage_repositories.get __sr
+          service.storage_repositories.get __sr
         end
 
         def sr
@@ -96,7 +96,7 @@ module Fog
         end
 
       end
-      
+
     end
   end
 end
diff --git a/lib/fog/xenserver/models/compute/vdis.rb b/lib/fog/xenserver/models/compute/vdis.rb
index af1182bbe..abe8f7317 100644
--- a/lib/fog/xenserver/models/compute/vdis.rb
+++ b/lib/fog/xenserver/models/compute/vdis.rb
@@ -8,14 +8,14 @@ module Fog
       class Vdis < Fog::Collection
 
         model Fog::Compute::XenServer::VDI
-        
+
         def all(options = {})
-          data = connection.get_records 'VDI'
+          data = service.get_records 'VDI'
           load(data)
         end
 
         def get( vdi_ref )
-          if vdi_ref && vdi = connection.get_record( vdi_ref, 'VDI' )
+          if vdi_ref && vdi = service.get_record( vdi_ref, 'VDI' )
             new(vdi)
           end
         rescue Fog::XenServer::NotFound
diff --git a/lib/fog/xenserver/models/compute/vif.rb b/lib/fog/xenserver/models/compute/vif.rb
index 6c5f7618c..7b83a1f8f 100644
--- a/lib/fog/xenserver/models/compute/vif.rb
+++ b/lib/fog/xenserver/models/compute/vif.rb
@@ -3,13 +3,13 @@ require 'fog/core/model'
 module Fog
   module Compute
     class XenServer
-    
+
       class VIF < Fog::Model
         # API Reference here:
         # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VIF
-        
+
         identity :reference
-        
+
         attribute :mac,                :aliases => :MAC
         attribute :uuid
         attribute :allowed_operations
@@ -22,30 +22,30 @@ module Fog
         attribute :status_code
         attribute :status_detail
         attribute :__vm,               :aliases => :VM
-        
+
 
         def destroy
-          connection.destroy_vif reference
+          service.destroy_vif reference
         end
 
         def network
-          connection.networks.get __network
+          service.networks.get __network
         end
 
         def server
-          connection.servers.get __vm
+          service.servers.get __vm
         end
 
         def save
           requires :server
           raise ArgumentError.new('network is required for this operation') \
             unless attributes[:__network]
-          ref = connection.create_vif attributes[:server], attributes[:__network]
-          merge_attributes connection.vifs.get(ref).attributes
+          ref = service.create_vif attributes[:server], attributes[:__network]
+          merge_attributes service.vifs.get(ref).attributes
         end
 
       end
-      
+
     end
   end
 end
diff --git a/lib/fog/xenserver/models/compute/vifs.rb b/lib/fog/xenserver/models/compute/vifs.rb
index d7e6821dd..1b95551e5 100644
--- a/lib/fog/xenserver/models/compute/vifs.rb
+++ b/lib/fog/xenserver/models/compute/vifs.rb
@@ -8,14 +8,14 @@ module Fog
       class Vifs < Fog::Collection
 
         model Fog::Compute::XenServer::VIF
-        
+
         def all(options = {})
-          data = connection.get_records 'VIF'
+          data = service.get_records 'VIF'
           load(data)
         end
 
         def get( ref )
-          if ref && obj = connection.get_record( ref, 'VIF' )
+          if ref && obj = service.get_record( ref, 'VIF' )
             new(obj)
           end
         rescue Fog::XenServer::NotFound
diff --git a/lib/fog/zerigo/models/dns/record.rb b/lib/fog/zerigo/models/dns/record.rb
index 165137b93..b60a0f3de 100644
--- a/lib/fog/zerigo/models/dns/record.rb
+++ b/lib/fog/zerigo/models/dns/record.rb
@@ -29,7 +29,7 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_host(identity)
+          service.delete_host(identity)
           true
         end
 
@@ -48,9 +48,9 @@ module Fog
           if persisted?
             options[:host_type] = type
             options[:data]      = value
-            connection.update_host(identity, options)
+            service.update_host(identity, options)
           else
-            data = connection.create_host(@zone.id, type, value, options)
+            data = service.create_host(@zone.id, type, value, options)
             merge_attributes(data.body)
           end
 
diff --git a/lib/fog/zerigo/models/dns/records.rb b/lib/fog/zerigo/models/dns/records.rb
index a5f8e5800..5682a7532 100644
--- a/lib/fog/zerigo/models/dns/records.rb
+++ b/lib/fog/zerigo/models/dns/records.rb
@@ -23,7 +23,7 @@ module Fog
         end
 
         def get(record_id)
-          data = connection.get_host(record_id).body
+          data = service.get_host(record_id).body
           new(data)
         rescue Fog::Service::NotFound
           nil
@@ -35,7 +35,7 @@ module Fog
         end
 
         def find(fqdn)
-          hosts = connection.find_hosts(fqdn, zone.id).body['hosts']
+          hosts = service.find_hosts(fqdn, zone.id).body['hosts']
           hosts.collect { |host| new(host) }
         end
 
diff --git a/lib/fog/zerigo/models/dns/zone.rb b/lib/fog/zerigo/models/dns/zone.rb
index 5f6b69827..dbed9ece8 100644
--- a/lib/fog/zerigo/models/dns/zone.rb
+++ b/lib/fog/zerigo/models/dns/zone.rb
@@ -16,8 +16,8 @@ module Fog
         attribute :updated_at,  :aliases => 'updated-at'
 
         # <custom-nameservers>ns1.example.com,ns2.example.com</custom-nameservers>
-        # <custom-ns type="boolean">true</custom-ns> 
-        # <hostmaster>dnsadmin@example.com</hostmaster> 
+        # <custom-ns type="boolean">true</custom-ns>
+        # <hostmaster>dnsadmin@example.com</hostmaster>
         # <notes nil="true"/>
         # <ns1 nil="true"/>
         # <nx-ttl nil="true"></nx-ttl>
@@ -33,7 +33,7 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_zone(identity)
+          service.delete_zone(identity)
           true
         end
 
@@ -41,7 +41,7 @@ module Fog
           @records ||= begin
             Fog::DNS::Zerigo::Records.new(
               :zone       => self,
-              :connection => connection
+              :service => service
             )
           end
         end
@@ -71,11 +71,11 @@ module Fog
           #   * restrict_axfr<~String> - indicates if AXFR transfers should be restricted to IPs in axfr-ips
           #   * tag_list<~String> - List of all tags associated with this domain
           data = unless identity
-            connection.create_zone(domain, ttl, type, options)
+            service.create_zone(domain, ttl, type, options)
           else
             options[:default_ttl] = ttl
             options[:ns_type]     = type
-            connection.update_zone(identity, options)
+            service.update_zone(identity, options)
           end
           merge_attributes(data.body)
           true
diff --git a/lib/fog/zerigo/models/dns/zones.rb b/lib/fog/zerigo/models/dns/zones.rb
index 361db3f19..aa4044976 100644
--- a/lib/fog/zerigo/models/dns/zones.rb
+++ b/lib/fog/zerigo/models/dns/zones.rb
@@ -10,12 +10,12 @@ module Fog
         model Fog::DNS::Zerigo::Zone
 
         def all
-          data = connection.list_zones.body['zones']
+          data = service.list_zones.body['zones']
           load(data)
         end
 
         def get(zone_id_or_domain)
-          data = connection.get_zone(zone_id_or_domain).body
+          data = service.get_zone(zone_id_or_domain).body
           zone = new(data)
           zone.records.load(data['hosts'])
           zone