From f9a5b9e94229d6023e9e266e9ecfa0cb1ab5aa80 Mon Sep 17 00:00:00 2001
From: Lance Ivy <lance@cainlevy.net>
Date: Sat, 1 Feb 2014 22:02:40 -0500
Subject: [PATCH] don't require service when registering it

services will still be required when you:
* require them yourself
* require the entire provider (which requires all services)
---
 lib/fog/atmos/core.rb            |  2 +-
 lib/fog/aws/core.rb              | 44 ++++++++++++++++----------------
 lib/fog/bare_metal_cloud/core.rb |  2 +-
 lib/fog/bluebox/core.rb          |  6 ++---
 lib/fog/brightbox/core.rb        |  2 +-
 lib/fog/clodo/core.rb            |  2 +-
 lib/fog/cloudsigma/core.rb       |  2 +-
 lib/fog/cloudstack/core.rb       |  2 +-
 lib/fog/core/provider.rb         |  3 +--
 lib/fog/digitalocean/core.rb     |  2 +-
 lib/fog/dnsimple/core.rb         |  2 +-
 lib/fog/dnsmadeeasy/core.rb      |  2 +-
 lib/fog/dreamhost/core.rb        |  2 +-
 lib/fog/dynect/core.rb           |  2 +-
 lib/fog/ecloud/core.rb           |  2 +-
 lib/fog/glesys/core.rb           |  2 +-
 lib/fog/go_grid/core.rb          |  2 +-
 lib/fog/google/core.rb           |  4 +--
 lib/fog/hp/core.rb               | 16 ++++++------
 lib/fog/ibm/core.rb              |  4 +--
 lib/fog/internet_archive/core.rb |  2 +-
 lib/fog/joyent/core.rb           |  2 +-
 lib/fog/libvirt/core.rb          |  2 +-
 lib/fog/linode/core.rb           |  4 +--
 lib/fog/local/core.rb            |  2 +-
 lib/fog/ninefold/core.rb         |  4 +--
 lib/fog/openstack/core.rb        | 16 ++++++------
 lib/fog/openvz/core.rb           |  2 +-
 lib/fog/ovirt/core.rb            |  2 +-
 lib/fog/rackspace/core.rb        | 24 ++++++++---------
 lib/fog/riakcs/core.rb           |  4 +--
 lib/fog/serverlove/core.rb       |  2 +-
 lib/fog/storm_on_demand/core.rb  | 18 ++++++-------
 lib/fog/vcloud/core.rb           |  2 +-
 lib/fog/vcloud_director/core.rb  |  2 +-
 lib/fog/vmfusion/core.rb         |  2 +-
 lib/fog/voxel/core.rb            |  2 +-
 lib/fog/vsphere/core.rb          |  2 +-
 lib/fog/xenserver/core.rb        |  2 +-
 lib/fog/zerigo/core.rb           |  2 +-
 40 files changed, 101 insertions(+), 102 deletions(-)

diff --git a/lib/fog/atmos/core.rb b/lib/fog/atmos/core.rb
index 5bd43b51b..cd9833372 100644
--- a/lib/fog/atmos/core.rb
+++ b/lib/fog/atmos/core.rb
@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:storage, 'atmos/storage', 'Storage')
+    service(:storage, 'Storage')
 
   end
 end
diff --git a/lib/fog/aws/core.rb b/lib/fog/aws/core.rb
index 1ece7b208..913d1e73b 100644
--- a/lib/fog/aws/core.rb
+++ b/lib/fog/aws/core.rb
@@ -6,28 +6,28 @@ module Fog
   module AWS
     extend Fog::Provider
 
-    service(:auto_scaling,    'aws/auto_scaling',     'AutoScaling')
-    service(:beanstalk,       'aws/beanstalk',        'ElasticBeanstalk')
-    service(:cdn,             'aws/cdn',              'CDN')
-    service(:compute,         'aws/compute',          'Compute')
-    service(:cloud_formation, 'aws/cloud_formation',  'CloudFormation')
-    service(:cloud_watch,     'aws/cloud_watch',      'CloudWatch')
-    service(:data_pipeline,   'aws/data_pipeline',     'DataPipeline')
-    service(:dynamodb,        'aws/dynamodb',         'DynamoDB')
-    service(:dns,             'aws/dns',              'DNS')
-    service(:elasticache,     'aws/elasticache',      'Elasticache')
-    service(:elb,             'aws/elb',              'ELB')
-    service(:emr,             'aws/emr',              'EMR')
-    service(:glacier,         'aws/glacier',          'Glacier')
-    service(:iam,             'aws/iam',              'IAM')
-    service(:rds,             'aws/rds',              'RDS')
-    service(:redshift,        'aws/redshift',         'Redshift')
-    service(:ses,             'aws/ses',              'SES')
-    service(:simpledb,        'aws/simpledb',         'SimpleDB')
-    service(:sns,             'aws/sns',              'SNS')
-    service(:sqs,             'aws/sqs',              'SQS')
-    service(:sts,             'aws/sts',              'STS')
-    service(:storage,         'aws/storage',          'Storage')
+    service(:auto_scaling,    'AutoScaling')
+    service(:beanstalk,       'ElasticBeanstalk')
+    service(:cdn,             'CDN')
+    service(:compute,         'Compute')
+    service(:cloud_formation, 'CloudFormation')
+    service(:cloud_watch,     'CloudWatch')
+    service(:data_pipeline,   'DataPipeline')
+    service(:dynamodb,        'DynamoDB')
+    service(:dns,             'DNS')
+    service(:elasticache,     'Elasticache')
+    service(:elb,             'ELB')
+    service(:emr,             'EMR')
+    service(:glacier,         'Glacier')
+    service(:iam,             'IAM')
+    service(:rds,             'RDS')
+    service(:redshift,        'Redshift')
+    service(:ses,             'SES')
+    service(:simpledb,        'SimpleDB')
+    service(:sns,             'SNS')
+    service(:sqs,             'SQS')
+    service(:sts,             'STS')
+    service(:storage,         'Storage')
 
     def self.indexed_param(key, values)
       params = {}
diff --git a/lib/fog/bare_metal_cloud/core.rb b/lib/fog/bare_metal_cloud/core.rb
index c7e7b622f..4d24249f8 100644
--- a/lib/fog/bare_metal_cloud/core.rb
+++ b/lib/fog/bare_metal_cloud/core.rb
@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'bare_metal_cloud/compute', 'Compute')
+    service(:compute, 'Compute')
 
   end
 end
diff --git a/lib/fog/bluebox/core.rb b/lib/fog/bluebox/core.rb
index fd731457b..3d9f4679f 100644
--- a/lib/fog/bluebox/core.rb
+++ b/lib/fog/bluebox/core.rb
@@ -5,9 +5,9 @@ module Fog
 
     extend Fog::Provider
 
-    service(:blb,     'bluebox/blb',      'BLB')
-    service(:compute, 'bluebox/compute',  'Compute')
-    service(:dns,     'bluebox/dns',      'DNS')
+    service(:blb,     'BLB')
+    service(:compute, 'Compute')
+    service(:dns,     'DNS')
 
   end
 end
diff --git a/lib/fog/brightbox/core.rb b/lib/fog/brightbox/core.rb
index aef6ccf85..6a108c98c 100644
--- a/lib/fog/brightbox/core.rb
+++ b/lib/fog/brightbox/core.rb
@@ -4,7 +4,7 @@ module Fog
   module Brightbox
     extend Fog::Provider
 
-    service(:compute, 'brightbox/compute', 'Compute')
+    service(:compute, 'Compute')
 
   end
 end
diff --git a/lib/fog/clodo/core.rb b/lib/fog/clodo/core.rb
index 744d968d0..b3b180711 100644
--- a/lib/fog/clodo/core.rb
+++ b/lib/fog/clodo/core.rb
@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'clodo/compute', 'Compute')
+    service(:compute, 'Compute')
 
     def self.authenticate(options)
       clodo_auth_url = options[:clodo_auth_url] || "api.clodo.ru"
diff --git a/lib/fog/cloudsigma/core.rb b/lib/fog/cloudsigma/core.rb
index 201ea2c07..2ea9a8f00 100644
--- a/lib/fog/cloudsigma/core.rb
+++ b/lib/fog/cloudsigma/core.rb
@@ -4,6 +4,6 @@ module Fog
   module CloudSigma
     extend Fog::Provider
 
-    service(:compute, 'cloudsigma/compute', 'Compute')
+    service(:compute, 'Compute')
   end
 end
diff --git a/lib/fog/cloudstack/core.rb b/lib/fog/cloudstack/core.rb
index 2763e0d9a..41ec52e41 100644
--- a/lib/fog/cloudstack/core.rb
+++ b/lib/fog/cloudstack/core.rb
@@ -6,7 +6,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'cloudstack/compute','Compute')
+    service(:compute, 'Compute')
 
     @@digest  = OpenSSL::Digest.new('sha1')
 
diff --git a/lib/fog/core/provider.rb b/lib/fog/core/provider.rb
index b345bbc48..f866f517f 100644
--- a/lib/fog/core/provider.rb
+++ b/lib/fog/core/provider.rb
@@ -19,12 +19,11 @@ module Fog
       eval(@services_registry[service_key]).new
     end
 
-    def service(new_service, path, constant_string)
+    def service(new_service, constant_string)
       Fog.services[new_service] ||= []
       Fog.services[new_service] |= [self.to_s.split('::').last.downcase.to_sym]
       @services_registry ||= {}
       @services_registry[new_service] = [self.to_s, constant_string].join('::')
-      require File.join('fog', path)
     end
 
     def services
diff --git a/lib/fog/digitalocean/core.rb b/lib/fog/digitalocean/core.rb
index 231b5c119..033c2c15a 100644
--- a/lib/fog/digitalocean/core.rb
+++ b/lib/fog/digitalocean/core.rb
@@ -3,7 +3,7 @@ require 'fog/core'
 module Fog
   module DigitalOcean
     extend Fog::Provider
-    service(:compute, 'digitalocean/compute', 'Compute')
+    service(:compute, 'Compute')
   end
 end
 
diff --git a/lib/fog/dnsimple/core.rb b/lib/fog/dnsimple/core.rb
index d7ad5453a..9e2ef3669 100644
--- a/lib/fog/dnsimple/core.rb
+++ b/lib/fog/dnsimple/core.rb
@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:dns, 'dnsimple/dns', 'DNS')
+    service(:dns, 'DNS')
 
   end
 end
diff --git a/lib/fog/dnsmadeeasy/core.rb b/lib/fog/dnsmadeeasy/core.rb
index efed5287d..a8454b95c 100644
--- a/lib/fog/dnsmadeeasy/core.rb
+++ b/lib/fog/dnsmadeeasy/core.rb
@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:dns, 'dnsmadeeasy/dns', 'DNS')
+    service(:dns, 'DNS')
 
   end
 end
diff --git a/lib/fog/dreamhost/core.rb b/lib/fog/dreamhost/core.rb
index 2d41be679..caf3288d3 100644
--- a/lib/fog/dreamhost/core.rb
+++ b/lib/fog/dreamhost/core.rb
@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:dns, 'dreamhost/dns', 'DNS')
+    service(:dns, 'DNS')
 
   end
 end
diff --git a/lib/fog/dynect/core.rb b/lib/fog/dynect/core.rb
index e9cb40856..ab4e126e7 100644
--- a/lib/fog/dynect/core.rb
+++ b/lib/fog/dynect/core.rb
@@ -7,7 +7,7 @@ module Fog
   module Dynect
     extend Fog::Provider
 
-    service(:dns, 'dynect/dns', 'DNS')
+    service(:dns, 'DNS')
 
     class Mock
       def self.job_id
diff --git a/lib/fog/ecloud/core.rb b/lib/fog/ecloud/core.rb
index 3d6884969..a1b5468d8 100644
--- a/lib/fog/ecloud/core.rb
+++ b/lib/fog/ecloud/core.rb
@@ -6,7 +6,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'ecloud/compute', 'Compute')
+    service(:compute, 'Compute')
 
     def self.keep(hash, *keys)
       {}.tap do |kept|
diff --git a/lib/fog/glesys/core.rb b/lib/fog/glesys/core.rb
index f7d3d32a4..28923f12c 100644
--- a/lib/fog/glesys/core.rb
+++ b/lib/fog/glesys/core.rb
@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'glesys/compute', 'Compute')
+    service(:compute, 'Compute')
 
   end
 end
diff --git a/lib/fog/go_grid/core.rb b/lib/fog/go_grid/core.rb
index fb7b077a8..f4a7abf68 100644
--- a/lib/fog/go_grid/core.rb
+++ b/lib/fog/go_grid/core.rb
@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'go_grid/compute', 'Compute')
+    service(:compute, 'Compute')
 
   end
 end
diff --git a/lib/fog/google/core.rb b/lib/fog/google/core.rb
index 301245e9e..a588f942e 100644
--- a/lib/fog/google/core.rb
+++ b/lib/fog/google/core.rb
@@ -5,8 +5,8 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'google/compute', 'Compute')
-    service(:storage, 'google/storage', 'Storage')
+    service(:compute, 'Compute')
+    service(:storage, 'Storage')
 
     class Mock
 
diff --git a/lib/fog/hp/core.rb b/lib/fog/hp/core.rb
index f21d9c88d..ed16fc8f1 100644
--- a/lib/fog/hp/core.rb
+++ b/lib/fog/hp/core.rb
@@ -56,14 +56,14 @@ module Fog
       end
     end
 
-    service(:block_storage, 'hp/block_storage', 'BlockStorage')
-    service(:block_storage_v2, 'hp/block_storage_v2', 'BlockStorageV2')
-    service(:cdn,     'hp/cdn',     'CDN')
-    service(:compute, 'hp/compute', 'Compute')
-    service(:dns,     'hp/dns',     'DNS')
-    service(:lb,      'hp/lb',      'LB')
-    service(:network, 'hp/network', 'Network')
-    service(:storage, 'hp/storage', 'Storage')
+    service(:block_storage, 'BlockStorage')
+    service(:block_storage_v2, 'BlockStorageV2')
+    service(:cdn,     'CDN')
+    service(:compute, 'Compute')
+    service(:dns,     'DNS')
+    service(:lb,      'LB')
+    service(:network, 'Network')
+    service(:storage, 'Storage')
 
     # legacy swauth 1.0/1.1 style authentication
     def self.authenticate_v1(options, connection_options = {})
diff --git a/lib/fog/ibm/core.rb b/lib/fog/ibm/core.rb
index 648bc27e3..ab365d819 100644
--- a/lib/fog/ibm/core.rb
+++ b/lib/fog/ibm/core.rb
@@ -5,8 +5,8 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'ibm/compute', 'Compute')
-    service(:storage, 'ibm/storage', 'Storage')
+    service(:compute, 'Compute')
+    service(:storage, 'Storage')
 
     # Provisioning is very slow. We'll pass this arg explicitly until there's a way
     # to set the default timeout on a per-provider basis.
diff --git a/lib/fog/internet_archive/core.rb b/lib/fog/internet_archive/core.rb
index 7a1fb94aa..d5de970d2 100644
--- a/lib/fog/internet_archive/core.rb
+++ b/lib/fog/internet_archive/core.rb
@@ -12,7 +12,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:storage, 'internet_archive/storage', 'Storage')
+    service(:storage, 'Storage')
 
     def self.indexed_param(key, values)
       params = {}
diff --git a/lib/fog/joyent/core.rb b/lib/fog/joyent/core.rb
index c9efb3715..6935cc5ce 100644
--- a/lib/fog/joyent/core.rb
+++ b/lib/fog/joyent/core.rb
@@ -4,7 +4,7 @@ module Fog
   module Joyent
     extend Fog::Provider
 
-    service(:compute, 'joyent/compute', 'Compute')
+    service(:compute, 'Compute')
 
   end
 end
diff --git a/lib/fog/libvirt/core.rb b/lib/fog/libvirt/core.rb
index 892a1defb..5b5029a32 100644
--- a/lib/fog/libvirt/core.rb
+++ b/lib/fog/libvirt/core.rb
@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'libvirt/compute', 'Compute')
+    service(:compute, 'Compute')
 
   end
 end
diff --git a/lib/fog/linode/core.rb b/lib/fog/linode/core.rb
index e04aacbfd..d3a13492b 100644
--- a/lib/fog/linode/core.rb
+++ b/lib/fog/linode/core.rb
@@ -3,8 +3,8 @@ require 'fog/core'
 module Fog
   module Linode
     extend Fog::Provider
-    service(:compute, 'linode/compute', 'Compute')
-    service(:dns,     'linode/dns',     'DNS')
+    service(:compute, 'Compute')
+    service(:dns,     'DNS')
   end
 end
 
diff --git a/lib/fog/local/core.rb b/lib/fog/local/core.rb
index 4a0617778..89567c18b 100644
--- a/lib/fog/local/core.rb
+++ b/lib/fog/local/core.rb
@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:storage, 'local/storage', 'Storage')
+    service(:storage, 'Storage')
 
   end
 end
diff --git a/lib/fog/ninefold/core.rb b/lib/fog/ninefold/core.rb
index b6db0e79b..4fef92cb5 100644
--- a/lib/fog/ninefold/core.rb
+++ b/lib/fog/ninefold/core.rb
@@ -5,8 +5,8 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'ninefold/compute', 'Compute')
-    service(:storage, 'ninefold/storage', 'Storage')
+    service(:compute, 'Compute')
+    service(:storage, 'Storage')
 
   end
 end
diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb
index 68197e2a5..87a3613b0 100644
--- a/lib/fog/openstack/core.rb
+++ b/lib/fog/openstack/core.rb
@@ -41,14 +41,14 @@ module Fog
       end
     end
 
-    service(:compute , 'openstack/compute' , 'Compute' )
-    service(:image, 'openstack/image', 'Image')
-    service(:identity, 'openstack/identity', 'Identity')
-    service(:network, 'openstack/network', 'Network')
-    service(:storage, 'openstack/storage', 'Storage')
-    service(:volume,  'openstack/volume',  'Volume')
-    service(:metering,  'openstack/metering',  'Metering')
-    service(:orchestration,  'openstack/orchestration',  'Orchestration')
+    service(:compute ,      'Compute')
+    service(:image,         'Image')
+    service(:identity,      'Identity')
+    service(:network,       'Network')
+    service(:storage,       'Storage')
+    service(:volume,        'Volume')
+    service(:metering,      'Metering')
+    service(:orchestration, 'Orchestration')
 
     def self.authenticate(options, connection_options = {})
       case options[:openstack_auth_uri].path
diff --git a/lib/fog/openvz/core.rb b/lib/fog/openvz/core.rb
index bd20c46ed..e199aff21 100644
--- a/lib/fog/openvz/core.rb
+++ b/lib/fog/openvz/core.rb
@@ -3,7 +3,7 @@ require 'fog/core'
 module Fog
   module Openvz
     extend Fog::Provider
-    service(:compute, 'openvz/compute', 'Compute')
+    service(:compute, 'Compute')
   end
 end
 
diff --git a/lib/fog/ovirt/core.rb b/lib/fog/ovirt/core.rb
index 268437db9..2c1dbe4ba 100644
--- a/lib/fog/ovirt/core.rb
+++ b/lib/fog/ovirt/core.rb
@@ -11,7 +11,7 @@ module Fog
       class NotFound < ServiceError; end
     end
 
-    service(:compute, 'ovirt/compute', 'Compute')
+    service(:compute, 'Compute')
 
   end
 end
diff --git a/lib/fog/rackspace/core.rb b/lib/fog/rackspace/core.rb
index 65d7ee472..93bb30a97 100644
--- a/lib/fog/rackspace/core.rb
+++ b/lib/fog/rackspace/core.rb
@@ -84,18 +84,18 @@ module Fog
       end
     end
 
-    service(:auto_scale,       'rackspace/auto_scale',        'AutoScale')
-    service(:block_storage,    'rackspace/block_storage',     'BlockStorage')
-    service(:cdn,              'rackspace/cdn',               'CDN')
-    service(:compute,          'rackspace/compute',           'Compute')
-    service(:compute_v2,       'rackspace/compute_v2',        'Compute v2')
-    service(:dns,              'rackspace/dns',               'DNS')
-    service(:storage,          'rackspace/storage',           'Storage')
-    service(:load_balancers,   'rackspace/load_balancers',    'LoadBalancers')
-    service(:identity,         'rackspace/identity',          'Identity')
-    service(:databases,        'rackspace/databases',         'Databases')
-    service(:monitoring,       'rackspace/monitoring',        'Monitoring')
-    service(:queues,           'rackspace/queues',            'Queues')
+    service(:auto_scale,       'AutoScale')
+    service(:block_storage,    'BlockStorage')
+    service(:cdn,              'CDN')
+    service(:compute,          'Compute')
+    service(:compute_v2,       'Compute v2')
+    service(:dns,              'DNS')
+    service(:storage,          'Storage')
+    service(:load_balancers,   'LoadBalancers')
+    service(:identity,         'Identity')
+    service(:databases,        'Databases')
+    service(:monitoring,       'Monitoring')
+    service(:queues,           'Queues')
 
     def self.authenticate(options, connection_options = {})
       rackspace_auth_url = options[:rackspace_auth_url]
diff --git a/lib/fog/riakcs/core.rb b/lib/fog/riakcs/core.rb
index 554284456..1061df7f8 100644
--- a/lib/fog/riakcs/core.rb
+++ b/lib/fog/riakcs/core.rb
@@ -115,8 +115,8 @@ module Fog
 
     extend Fog::Provider
 
-    service(:provisioning, 'riakcs/provisioning', 'Provisioning')
-    service(:usage,        'riakcs/usage',        'Usage')
+    service(:provisioning, 'Provisioning')
+    service(:usage,        'Usage')
 
   end
 end
diff --git a/lib/fog/serverlove/core.rb b/lib/fog/serverlove/core.rb
index f8435cf11..00caddcb0 100644
--- a/lib/fog/serverlove/core.rb
+++ b/lib/fog/serverlove/core.rb
@@ -4,7 +4,7 @@ module Fog
   module Serverlove
     extend Fog::Provider
 
-    service(:compute, 'serverlove/compute', 'Compute')
+    service(:compute, 'Compute')
 
   end
 end
diff --git a/lib/fog/storm_on_demand/core.rb b/lib/fog/storm_on_demand/core.rb
index 50a3191ad..10f55b676 100644
--- a/lib/fog/storm_on_demand/core.rb
+++ b/lib/fog/storm_on_demand/core.rb
@@ -5,15 +5,15 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'storm_on_demand/compute', 'Compute')
-    service(:network, 'storm_on_demand/network', 'Network')
-    service(:storage, 'storm_on_demand/storage', 'Storage')
-    service(:dns, 'storm_on_demand/dns', 'DNS')
-    service(:billing, 'storm_on_demand/billing', 'Billing')
-    service(:monitoring, 'storm_on_demand/monitoring', 'Monitoring')
-    service(:support, 'storm_on_demand/support', 'Support')
-    service(:account, 'storm_on_demand/account', 'Account')
-    service(:vpn, 'storm_on_demand/vpn', 'VPN')
+    service(:compute, 'Compute')
+    service(:network, 'Network')
+    service(:storage, 'Storage')
+    service(:dns, 'DNS')
+    service(:billing, 'Billing')
+    service(:monitoring, 'Monitoring')
+    service(:support, 'Support')
+    service(:account, 'Account')
+    service(:vpn, 'VPN')
     
   end
 end
diff --git a/lib/fog/vcloud/core.rb b/lib/fog/vcloud/core.rb
index ce8607188..35271568e 100644
--- a/lib/fog/vcloud/core.rb
+++ b/lib/fog/vcloud/core.rb
@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'vcloud/compute', 'Compute')
+    service(:compute, 'Compute')
 
   end
 end
diff --git a/lib/fog/vcloud_director/core.rb b/lib/fog/vcloud_director/core.rb
index c3b331f2a..f6187ba2d 100644
--- a/lib/fog/vcloud_director/core.rb
+++ b/lib/fog/vcloud_director/core.rb
@@ -62,6 +62,6 @@ module Fog
       class TaskError < ServiceError; end
     end
 
-    service(:compute, 'vcloud_director/compute', 'Compute')
+    service(:compute, 'Compute')
   end
 end
diff --git a/lib/fog/vmfusion/core.rb b/lib/fog/vmfusion/core.rb
index cda5cf00e..49778d7ed 100644
--- a/lib/fog/vmfusion/core.rb
+++ b/lib/fog/vmfusion/core.rb
@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'vmfusion/compute', 'Compute')
+    service(:compute, 'Compute')
 
   end
 end
diff --git a/lib/fog/voxel/core.rb b/lib/fog/voxel/core.rb
index 467bd313f..03b8c8f3b 100644
--- a/lib/fog/voxel/core.rb
+++ b/lib/fog/voxel/core.rb
@@ -6,7 +6,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'voxel/compute', 'Compute')
+    service(:compute, 'Compute')
 
     def self.create_signature(secret, options)
       to_sign = options.keys.map { |k| k.to_s }.sort.map { |k| "#{k}#{options[k.to_sym]}" }.join("")
diff --git a/lib/fog/vsphere/core.rb b/lib/fog/vsphere/core.rb
index 2d8fd32a0..6007cffea 100644
--- a/lib/fog/vsphere/core.rb
+++ b/lib/fog/vsphere/core.rb
@@ -11,7 +11,7 @@ module Fog
       class NotFound < ServiceError; end
     end
 
-    service(:compute, 'vsphere/compute', 'Compute')
+    service(:compute, 'Compute')
 
   end
 end
diff --git a/lib/fog/xenserver/core.rb b/lib/fog/xenserver/core.rb
index 3e0a5c194..eada4a04a 100644
--- a/lib/fog/xenserver/core.rb
+++ b/lib/fog/xenserver/core.rb
@@ -9,7 +9,7 @@ module Fog
 
     extend Fog::Provider
     
-    service(:compute, 'xenserver/compute', 'Compute')  
+    service(:compute, 'Compute')  
     
     class Connection
       require 'xmlrpc/client'
diff --git a/lib/fog/zerigo/core.rb b/lib/fog/zerigo/core.rb
index b0fc36127..2ab9be3ca 100644
--- a/lib/fog/zerigo/core.rb
+++ b/lib/fog/zerigo/core.rb
@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:dns, 'zerigo/dns', 'DNS')
+    service(:dns, 'DNS')
 
   end
 end