diff --git a/lib/fog/terremark.rb b/lib/fog/terremark.rb
index c7d550496..35228d2fd 100644
--- a/lib/fog/terremark.rb
+++ b/lib/fog/terremark.rb
@@ -81,8 +81,16 @@ module Fog
       def initialize(options={})
         @terremark_password = options[:terremark_password]
         @terremark_username = options[:terremark_username]
-        @host   = options[:host]   || "services.vcloudexpress.terremark.com"
-        @path   = options[:path]   || "/api/v0.8"
+        case options[:terremark_service]
+        when :ecloud
+          @host   = options[:host]   || "services.enterprisecloud.terremark.com"
+          @path   = options[:path]   || "/api/v0.8a-ext2.0"
+        when :vcloud
+          @host   = options[:host]   || "services.vcloudexpress.terremark.com"
+          @path   = options[:path]   || "/api/v0.8"
+        else
+          raise "Unsupported Terremark Service"
+        end
         @port   = options[:port]   || 443
         @scheme = options[:scheme] || 'https'
         @cookie = get_organizations.headers['Set-Cookie']
diff --git a/lib/fog/terremark/bin.rb b/lib/fog/terremark/bin.rb
index 28eedd8fc..8e3a7580d 100644
--- a/lib/fog/terremark/bin.rb
+++ b/lib/fog/terremark/bin.rb
@@ -11,10 +11,7 @@ module Terremark
           credentials = Fog.credentials.reject do |k,v|
             ![:terremark_username, :terremark_password].include?(k)
           end
-          hash[key] = case key
-          when :vcloud
-            Fog::Terremark.new(credentials)
-          end
+          hash[key] = Fog::Terremark.new(credentials.merge(:terremark_service => key))
         end
         @@connections[service]
       end
diff --git a/lib/fog/terremark/parsers/get_vdc.rb b/lib/fog/terremark/parsers/get_vdc.rb
index eb887e236..7dd6b2573 100644
--- a/lib/fog/terremark/parsers/get_vdc.rb
+++ b/lib/fog/terremark/parsers/get_vdc.rb
@@ -74,13 +74,13 @@ module Fog
           case name
           when 'Allocated', 'Limit', 'Units', 'Used'
             if @in_cpu
-              @response['Compute Capacity']['Cpu'][name] = @value
+              @response['ComputeCapacity']['Cpu'][name] = @value
             elsif @in_deployed_vms_quota
-              @response['Compute Capacity']['DeployedVmsQuota'][name] = @value
+              @response['ComputeCapacity']['DeployedVmsQuota'][name] = @value
             elsif @in_instantiated_vms_quota
-              @response['Compute Capacity']['InstantiatedVmsQuota'][name] = @value
+              @response['ComputeCapacity']['InstantiatedVmsQuota'][name] = @value
             elsif @in_memory
-              @response['Compute Capacity']['Memory'][name] = @value
+              @response['ComputeCapacity']['Memory'][name] = @value
             elsif @in_storage_capacity
               @response['StorageCapacity'][name] = @value
             end