diff --git a/lib/fog/bluebox.rb b/lib/fog/bluebox.rb
index a64a6d9fa..4cddb5040 100644
--- a/lib/fog/bluebox.rb
+++ b/lib/fog/bluebox.rb
@@ -4,14 +4,14 @@ module Fog
     extend Fog::Provider
 
     service_path 'fog/bluebox'
-    service :blocks
+    service :compute
 
     def self.new(attributes = {})
       location = caller.first
-      warning = "[yellow][WARN] Fog::Bluebox#new is deprecated, use Fog::Bluebox::Blocks#new instead[/]"
+      warning = "[yellow][WARN] Fog::Bluebox#new is deprecated, use Fog::Bluebox::Compute#new instead[/]"
       warning << " [light_black](" << location << ")[/] "
       Formatador.display_line(warning)
-      Fog::Bluebox::Blocks.new(attributes)
+      Fog::Bluebox::Compute.new(attributes)
     end
 
   end
diff --git a/lib/fog/bluebox/bin.rb b/lib/fog/bluebox/bin.rb
index 1696bede0..fec439fe1 100644
--- a/lib/fog/bluebox/bin.rb
+++ b/lib/fog/bluebox/bin.rb
@@ -10,21 +10,21 @@ module Bluebox
       def [](service)
         @@connections ||= Hash.new do |hash, key|
           hash[key] = case key
-          when :blocks
-            Fog::Bluebox::Blocks.new
+          when :compute
+            Fog::Bluebox::Compute.new
           end
         end
         @@connections[service]
       end
 
       def services
-        [:blocks]
+        [:compute]
       end
 
-      for collection in Fog::Bluebox::Blocks.collections
+      for collection in Fog::Bluebox::Compute.collections
         module_eval <<-EOS, __FILE__, __LINE__
           def #{collection}
-            self[:blocks].#{collection}
+            self[:compute].#{collection}
           end
         EOS
       end
diff --git a/lib/fog/bluebox/blocks.rb b/lib/fog/bluebox/compute.rb
similarity index 94%
rename from lib/fog/bluebox/blocks.rb
rename to lib/fog/bluebox/compute.rb
index 90515fe06..4953909a8 100644
--- a/lib/fog/bluebox/blocks.rb
+++ b/lib/fog/bluebox/compute.rb
@@ -1,10 +1,10 @@
 module Fog
   module Bluebox
-    class Blocks < Fog::Service
+    class Compute < Fog::Service
 
       requires :bluebox_api_key, :bluebox_customer_id
 
-      model_path 'fog/bluebox/models/blocks'
+      model_path 'fog/bluebox/models/compute'
       model       :flavor
       collection  :flavors
       model       :image
@@ -12,7 +12,7 @@ module Fog
       model       :server
       collection  :servers
 
-      request_path 'fog/bluebox/requests/blocks'
+      request_path 'fog/bluebox/requests/compute'
       request :create_block
       request :destroy_block
       request :get_block
diff --git a/lib/fog/bluebox/models/blocks/flavor.rb b/lib/fog/bluebox/models/compute/flavor.rb
similarity index 97%
rename from lib/fog/bluebox/models/blocks/flavor.rb
rename to lib/fog/bluebox/models/compute/flavor.rb
index 0871a3b02..f2467505e 100644
--- a/lib/fog/bluebox/models/blocks/flavor.rb
+++ b/lib/fog/bluebox/models/compute/flavor.rb
@@ -2,7 +2,7 @@ require 'fog/model'
 
 module Fog
   module Bluebox
-    class Blocks
+    class Compute
 
       class Flavor < Fog::Model
 
diff --git a/lib/fog/bluebox/models/blocks/flavors.rb b/lib/fog/bluebox/models/compute/flavors.rb
similarity index 96%
rename from lib/fog/bluebox/models/blocks/flavors.rb
rename to lib/fog/bluebox/models/compute/flavors.rb
index d0da4b713..6abae1205 100644
--- a/lib/fog/bluebox/models/blocks/flavors.rb
+++ b/lib/fog/bluebox/models/compute/flavors.rb
@@ -3,7 +3,7 @@ require 'fog/bluebox/models/flavor'
 
 module Fog
   module Bluebox
-    class Blocks
+    class Compute
 
       class Flavors < Fog::Collection
 
diff --git a/lib/fog/bluebox/models/blocks/image.rb b/lib/fog/bluebox/models/compute/image.rb
similarity index 93%
rename from lib/fog/bluebox/models/blocks/image.rb
rename to lib/fog/bluebox/models/compute/image.rb
index 5cc1a02ec..47bbce145 100644
--- a/lib/fog/bluebox/models/blocks/image.rb
+++ b/lib/fog/bluebox/models/compute/image.rb
@@ -2,7 +2,7 @@ require 'fog/model'
 
 module Fog
   module Bluebox
-    class Blocks
+    class Compute
 
       class Image < Fog::Model
 
diff --git a/lib/fog/bluebox/models/blocks/images.rb b/lib/fog/bluebox/models/compute/images.rb
similarity index 96%
rename from lib/fog/bluebox/models/blocks/images.rb
rename to lib/fog/bluebox/models/compute/images.rb
index 6f1e235e6..fca385b08 100644
--- a/lib/fog/bluebox/models/blocks/images.rb
+++ b/lib/fog/bluebox/models/compute/images.rb
@@ -3,7 +3,7 @@ require 'fog/bluebox/models/image'
 
 module Fog
   module Bluebox
-    class Blocks
+    class Compute
 
       class Images < Fog::Collection
 
diff --git a/lib/fog/bluebox/models/blocks/server.rb b/lib/fog/bluebox/models/compute/server.rb
similarity index 98%
rename from lib/fog/bluebox/models/blocks/server.rb
rename to lib/fog/bluebox/models/compute/server.rb
index 179d56ab4..748610ca1 100644
--- a/lib/fog/bluebox/models/blocks/server.rb
+++ b/lib/fog/bluebox/models/compute/server.rb
@@ -2,7 +2,7 @@ require 'fog/model'
 
 module Fog
   module Bluebox
-    class Blocks
+    class Compute
 
       class BlockInstantiationError < StandardError; end
 
diff --git a/lib/fog/bluebox/models/blocks/servers.rb b/lib/fog/bluebox/models/compute/servers.rb
similarity index 96%
rename from lib/fog/bluebox/models/blocks/servers.rb
rename to lib/fog/bluebox/models/compute/servers.rb
index c6b2a937a..2858e04ab 100644
--- a/lib/fog/bluebox/models/blocks/servers.rb
+++ b/lib/fog/bluebox/models/compute/servers.rb
@@ -3,7 +3,7 @@ require 'fog/bluebox/models/server'
 
 module Fog
   module Bluebox
-    class Blocks
+    class Compute
 
       class Servers < Fog::Collection
 
diff --git a/lib/fog/bluebox/requests/blocks/create_block.rb b/lib/fog/bluebox/requests/compute/create_block.rb
similarity index 98%
rename from lib/fog/bluebox/requests/blocks/create_block.rb
rename to lib/fog/bluebox/requests/compute/create_block.rb
index 7b5498198..8a910fb55 100644
--- a/lib/fog/bluebox/requests/blocks/create_block.rb
+++ b/lib/fog/bluebox/requests/compute/create_block.rb
@@ -1,6 +1,6 @@
 module Fog
   module Bluebox
-    class Blocks
+    class Compute
       class Real
 
         # Create a new block
diff --git a/lib/fog/bluebox/requests/blocks/destroy_block.rb b/lib/fog/bluebox/requests/compute/destroy_block.rb
similarity index 97%
rename from lib/fog/bluebox/requests/blocks/destroy_block.rb
rename to lib/fog/bluebox/requests/compute/destroy_block.rb
index 1c99fd5c2..ba1d12f5a 100644
--- a/lib/fog/bluebox/requests/blocks/destroy_block.rb
+++ b/lib/fog/bluebox/requests/compute/destroy_block.rb
@@ -1,6 +1,6 @@
 module Fog
   module Bluebox
-    class Blocks
+    class Compute
       class Real
 
         # Destroy a block
diff --git a/lib/fog/bluebox/requests/blocks/get_block.rb b/lib/fog/bluebox/requests/compute/get_block.rb
similarity index 97%
rename from lib/fog/bluebox/requests/blocks/get_block.rb
rename to lib/fog/bluebox/requests/compute/get_block.rb
index 58e2a5a42..3fb5782d2 100644
--- a/lib/fog/bluebox/requests/blocks/get_block.rb
+++ b/lib/fog/bluebox/requests/compute/get_block.rb
@@ -1,6 +1,6 @@
 module Fog
   module Bluebox
-    class Blocks
+    class Compute
       class Real
 
         # Get details of a block.
diff --git a/lib/fog/bluebox/requests/blocks/get_blocks.rb b/lib/fog/bluebox/requests/compute/get_blocks.rb
similarity index 97%
rename from lib/fog/bluebox/requests/blocks/get_blocks.rb
rename to lib/fog/bluebox/requests/compute/get_blocks.rb
index 8589b72c3..80fd0030d 100644
--- a/lib/fog/bluebox/requests/blocks/get_blocks.rb
+++ b/lib/fog/bluebox/requests/compute/get_blocks.rb
@@ -1,6 +1,6 @@
 module Fog
   module Bluebox
-    class Blocks
+    class Compute
       class Real
 
         # Get list of blocks
diff --git a/lib/fog/bluebox/requests/blocks/get_product.rb b/lib/fog/bluebox/requests/compute/get_product.rb
similarity index 97%
rename from lib/fog/bluebox/requests/blocks/get_product.rb
rename to lib/fog/bluebox/requests/compute/get_product.rb
index e5cc98d53..d3cb34aae 100644
--- a/lib/fog/bluebox/requests/blocks/get_product.rb
+++ b/lib/fog/bluebox/requests/compute/get_product.rb
@@ -1,6 +1,6 @@
 module Fog
   module Bluebox
-    class Blocks
+    class Compute
       class Real
 
         # Get details of a product
diff --git a/lib/fog/bluebox/requests/blocks/get_products.rb b/lib/fog/bluebox/requests/compute/get_products.rb
similarity index 97%
rename from lib/fog/bluebox/requests/blocks/get_products.rb
rename to lib/fog/bluebox/requests/compute/get_products.rb
index 9ec1d2e02..191ca36f4 100644
--- a/lib/fog/bluebox/requests/blocks/get_products.rb
+++ b/lib/fog/bluebox/requests/compute/get_products.rb
@@ -1,6 +1,6 @@
 module Fog
   module Bluebox
-    class Blocks
+    class Compute
       class Real
 
         # Get list of products
diff --git a/lib/fog/bluebox/requests/blocks/get_template.rb b/lib/fog/bluebox/requests/compute/get_template.rb
similarity index 97%
rename from lib/fog/bluebox/requests/blocks/get_template.rb
rename to lib/fog/bluebox/requests/compute/get_template.rb
index 6a1c32e88..024f65413 100644
--- a/lib/fog/bluebox/requests/blocks/get_template.rb
+++ b/lib/fog/bluebox/requests/compute/get_template.rb
@@ -1,6 +1,6 @@
 module Fog
   module Bluebox
-    class Blocks
+    class Compute
       class Real
 
         # Get details of a template
diff --git a/lib/fog/bluebox/requests/blocks/get_templates.rb b/lib/fog/bluebox/requests/compute/get_templates.rb
similarity index 97%
rename from lib/fog/bluebox/requests/blocks/get_templates.rb
rename to lib/fog/bluebox/requests/compute/get_templates.rb
index ceedbba07..88ecc3009 100644
--- a/lib/fog/bluebox/requests/blocks/get_templates.rb
+++ b/lib/fog/bluebox/requests/compute/get_templates.rb
@@ -1,6 +1,6 @@
 module Fog
   module Bluebox
-    class Blocks
+    class Compute
       class Real
 
         # Get list of OS templates
diff --git a/lib/fog/bluebox/requests/blocks/reboot_block.rb b/lib/fog/bluebox/requests/compute/reboot_block.rb
similarity index 97%
rename from lib/fog/bluebox/requests/blocks/reboot_block.rb
rename to lib/fog/bluebox/requests/compute/reboot_block.rb
index a86884cb3..e935d742a 100644
--- a/lib/fog/bluebox/requests/blocks/reboot_block.rb
+++ b/lib/fog/bluebox/requests/compute/reboot_block.rb
@@ -1,6 +1,6 @@
 module Fog
   module Bluebox
-    class Blocks
+    class Compute
       class Real
 
         # Reboot block