Index: trunk/web/controls.py
===================================================================
--- trunk/web/controls.py	(revision 237)
+++ trunk/web/controls.py	(revision 243)
@@ -88,5 +88,5 @@
     remctl('web', 'unregister', machine.name)
 
-def createVm(owner, contact, name, memory, disk, is_hvm, cdrom):
+def createVm(owner, contact, name, memory, disk_size, is_hvm, cdrom):
     """Create a VM and put it in the database"""
     # put stuff in the table
@@ -94,5 +94,5 @@
     try:
         validation.validMemory(owner, memory)
-        validation.validDisk(owner, disk  * 1. / 1024)
+        validation.validDisk(owner, disk_size  * 1. / 1024)
         validation.validAddVm(owner)
         res = meta.engine.execute('select nextval('
@@ -111,6 +111,6 @@
         machine.type_id = machine_type.type_id
         ctx.current.save(machine)
-        disk = Disk(machine.machine_id, 
-                    'hda', disk)
+        disk = Disk(machine_id=machine.machine_id, 
+                    guest_device_name='hda', size=disk_size)
         open_nics = NIC.select_by(machine_id=None)
         if not open_nics: #No IPs left!
Index: trunk/web/main.py
===================================================================
--- trunk/web/main.py	(revision 237)
+++ trunk/web/main.py	(revision 243)
@@ -150,6 +150,6 @@
     memory = validation.validMemory(user, memory, on=True)
     
-    disk = fields.getfirst('disk')
-    disk = validation.validDisk(user, disk)
+    disk_size = fields.getfirst('disk')
+    disk_size = validation.validDisk(user, disk_size)
 
     vm_type = fields.getfirst('vmtype')
@@ -161,5 +161,5 @@
     if cdrom is not None and not CDROM.get(cdrom):
         raise CodeError("Invalid cdrom type '%s'" % cdrom)
-    return dict(contact=user, name=name, memory=memory, disk=disk,
+    return dict(contact=user, name=name, memory=memory, disk_size=disk_size,
                 owner=owner, is_hvm=is_hvm, cdrom=cdrom)
 
Index: trunk/web/xen-ips
===================================================================
--- trunk/web/xen-ips	(revision 237)
+++ trunk/web/xen-ips	(revision 243)
@@ -38,5 +38,5 @@
 
 def addip(ip):
-    n = NIC(None, randomMAC(), ip, None)
+    n = NIC(machine_id=None, mac_addr=randomMAC(), ip=ip, hostname=None)
     ctx.current.save(n)
     ctx.current.flush()