diff --git a/lib/fog/compute/requests/voxel/voxcloud_create.rb b/lib/fog/compute/requests/voxel/voxcloud_create.rb
index 01b239ed0..827ff030d 100644
--- a/lib/fog/compute/requests/voxel/voxcloud_create.rb
+++ b/lib/fog/compute/requests/voxel/voxcloud_create.rb
@@ -3,6 +3,14 @@ module Fog
     class Compute
       class Real
         def voxcloud_create( options )
+          options[:hostname] = options[:name]
+          options.delete(:name)
+
+          if options.has_key?(:password)
+            options[:admin_password] = options[:password]
+            options.delete(:password)
+          end
+
           data = request("voxel.voxcloud.create", options)
 
           unless data['stat'] == 'ok'
diff --git a/lib/fog/compute/requests/voxel/voxcloud_delete.rb b/lib/fog/compute/requests/voxel/voxcloud_delete.rb
index 286af45f1..e8d057dbd 100644
--- a/lib/fog/compute/requests/voxel/voxcloud_delete.rb
+++ b/lib/fog/compute/requests/voxel/voxcloud_delete.rb
@@ -16,12 +16,12 @@ module Fog
 
       class Mock
         def voxcloud_delete( device_id )
-					device = @data[:devices].select { |d| d[:id] == device_id }
+					device = @data[:servers].select { |d| d[:id] == device_id }
 
           if device.empty?
             raise Fog::Voxel::Compute::NotFound
           else
-            @data[:devices] = @data[:devices].select { |d| d[:id] != device_id }
+            @data[:servers] = @data[:servers].select { |d| d[:id] != device_id }
             @data[:statuses].delete(device_id)
             true
           end