diff --git a/lib/fog/rackspace/requests/compute_v2/delete_metadata_item.rb b/lib/fog/rackspace/requests/compute_v2/delete_metadata_item.rb
index 6d8d41776..6ae393ccb 100644
--- a/lib/fog/rackspace/requests/compute_v2/delete_metadata_item.rb
+++ b/lib/fog/rackspace/requests/compute_v2/delete_metadata_item.rb
@@ -2,18 +2,18 @@ module Fog
   module Compute
     class RackspaceV2
       class Real
-        def delete_metadata_item(collection, server_id, key)
+        def delete_metadata_item(collection, obj_id, key)
           request(
             :expects => 204,
             :method => 'DELETE',
-            :path => "/#{collection}/#{server_id}/metadata/#{key}"
+            :path => "/#{collection}/#{obj_id}/metadata/#{key}"
           )
         end
       end
       
       class Mock
-        def delete_metadata_item(collection, server_id, key)
-          raise Fog::Compute::RackspaceV2::NotFound if server_id == 0
+        def delete_metadata_item(collection, obj_id, key)
+          raise Fog::Compute::RackspaceV2::NotFound if obj_id == 0
           
           response = Excon::Response.new
           response.body = ""                      
diff --git a/lib/fog/rackspace/requests/compute_v2/get_metadata_item.rb b/lib/fog/rackspace/requests/compute_v2/get_metadata_item.rb
index cef3f0242..ef60369d6 100644
--- a/lib/fog/rackspace/requests/compute_v2/get_metadata_item.rb
+++ b/lib/fog/rackspace/requests/compute_v2/get_metadata_item.rb
@@ -2,18 +2,18 @@ module Fog
   module Compute
     class RackspaceV2
       class Real
-        def get_metadata_item(collection, server_id, key)
+        def get_metadata_item(collection, obj_id, key)
           request(
             :expects => 200,
             :method => 'GET',
-            :path => "/#{collection}/#{server_id}/metadata/#{key}"
+            :path => "/#{collection}/#{obj_id}/metadata/#{key}"
           )
         end
       end
       
       class Mock
-        def get_metadata_item(collection, server_id, key)
-          raise Fog::Compute::RackspaceV2::NotFound if server_id == 0
+        def get_metadata_item(collection, obj_id, key)
+          raise Fog::Compute::RackspaceV2::NotFound if obj_id == 0
           
           response = Excon::Response.new
           response.status = 202
diff --git a/lib/fog/rackspace/requests/compute_v2/list_metadata.rb b/lib/fog/rackspace/requests/compute_v2/list_metadata.rb
index 7623f1f95..4a1629157 100644
--- a/lib/fog/rackspace/requests/compute_v2/list_metadata.rb
+++ b/lib/fog/rackspace/requests/compute_v2/list_metadata.rb
@@ -2,18 +2,18 @@ module Fog
   module Compute
     class RackspaceV2
       class Real
-        def list_metadata(collection, server_id)
+        def list_metadata(collection, obj_id)
           request(
             :expects => [200, 203],
             :method => 'GET',
-            :path => "/#{collection}/#{server_id}/metadata"
+            :path => "/#{collection}/#{obj_id}/metadata"
           )
         end
       end
       
       class Mock
-        def list_metadata(collection, server_id)
-          raise Fog::Compute::RackspaceV2::NotFound if server_id == 0
+        def list_metadata(collection, obj_id)
+          raise Fog::Compute::RackspaceV2::NotFound if obj_id == 0
 
           response = Excon::Response.new
           response.status = 202
diff --git a/lib/fog/rackspace/requests/compute_v2/set_metadata.rb b/lib/fog/rackspace/requests/compute_v2/set_metadata.rb
index fa2eddfe2..3c94d3f60 100644
--- a/lib/fog/rackspace/requests/compute_v2/set_metadata.rb
+++ b/lib/fog/rackspace/requests/compute_v2/set_metadata.rb
@@ -2,11 +2,11 @@ module Fog
   module Compute
     class RackspaceV2
       class Real
-        def set_metadata(collection, server_id, metadata = {})
+        def set_metadata(collection, obj_id, metadata = {})
           request(
             :expects => [200, 203],
             :method => 'PUT',
-            :path => "/#{collection}/#{server_id}/metadata",
+            :path => "/#{collection}/#{obj_id}/metadata",
             :body => Fog::JSON.encode('metadata' => metadata)            
           )
         end
@@ -14,8 +14,8 @@ module Fog
       
       
       class Mock
-        def set_metadata(collection, server_id, metadata = {})
-          raise Fog::Compute::RackspaceV2::NotFound if server_id == 0
+        def set_metadata(collection, obj_id, metadata = {})
+          raise Fog::Compute::RackspaceV2::NotFound if obj_id == 0
                   
           response = Excon::Response.new
           response.status = 202
diff --git a/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb b/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb
index 2c2d47d4f..2b3af5dd1 100644
--- a/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb
+++ b/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb
@@ -2,19 +2,19 @@ module Fog
   module Compute
     class RackspaceV2
       class Real
-        def set_metadata_item(collection, server_id, key, value)
+        def set_metadata_item(collection, obj_id, key, value)
           request(
             :expects => 200,
             :method => 'PUT',
-            :path => "/#{collection}/#{server_id}/metadata/#{key}",
+            :path => "/#{collection}/#{obj_id}/metadata/#{key}",
             :body => Fog::JSON.encode('meta' => { key => value })        
           )
         end
       end
       
       class Mock
-        def set_metadata_item(collection, server_id, key, value)
-          raise Fog::Compute::RackspaceV2::NotFound if server_id == 0
+        def set_metadata_item(collection, obj_id, key, value)
+          raise Fog::Compute::RackspaceV2::NotFound if obj_id == 0
           
           response = Excon::Response.new
           response.status = 202
diff --git a/lib/fog/rackspace/requests/compute_v2/update_metadata.rb b/lib/fog/rackspace/requests/compute_v2/update_metadata.rb
index 6ee360b08..c4d5a8d2d 100644
--- a/lib/fog/rackspace/requests/compute_v2/update_metadata.rb
+++ b/lib/fog/rackspace/requests/compute_v2/update_metadata.rb
@@ -2,19 +2,19 @@ module Fog
   module Compute
     class RackspaceV2
       class Real
-        def update_metadata(collection, server_id, metadata = {})
+        def update_metadata(collection, obj_id, metadata = {})
           request(
             :expects => [200, 203],
             :method => 'POST',
-            :path => "/#{collection}/#{server_id}/metadata",
+            :path => "/#{collection}/#{obj_id}/metadata",
             :body => Fog::JSON.encode('metadata' => metadata)            
           )
         end
       end
       
       class Mock
-        def update_metadata(collection, server_id, metadata = {})
-          raise Fog::Compute::RackspaceV2::NotFound if server_id == 0
+        def update_metadata(collection, obj_id, metadata = {})
+          raise Fog::Compute::RackspaceV2::NotFound if obj_id == 0
           
           response = Excon::Response.new
           response.status = 202