Index: /trunk/web/templates/info.tmpl
===================================================================
--- /trunk/web/templates/info.tmpl	(revision 210)
+++ /trunk/web/templates/info.tmpl	(revision 211)
@@ -76,7 +76,7 @@
     <tr><td>Machine Name:</td><td><input type="text" name="name" value="$defaults.name"/></td></tr>
 $errorRow('name', $err)
-    <tr><td>Ram:</td><td><input type="text" size=3 name="memory" value="$defaults.memory"/>MB (max $max_mem)</td></tr>
+    <tr><td>Ram:</td><td><input type="text" size=3 name="memory" value="$defaults.memory"/>MiB (max $max_mem)</td></tr>
 $errorRow('memory', $err)
-    <tr><td>Disk:</td><td><input type="text" size=3 name="disk" value="$defaults.disk"/>GB (max $max_disk)</td><td>WARNING: Modifying disk size may corrupt your data.</td></tr>
+    <tr><td>Disk:</td><td><input type="text" size=3 name="disk" value="$defaults.disk"/>GiB (max $max_disk)</td><td>WARNING: Modifying disk size may corrupt your data.</td></tr>
 $errorRow('disk', $err)
 #else
Index: /trunk/web/templates/main.py
===================================================================
--- /trunk/web/templates/main.py	(revision 210)
+++ /trunk/web/templates/main.py	(revision 211)
@@ -287,5 +287,5 @@
         disk_fields.extend([(x % name, y % name) for x, y in 
                             disk_fields_template])
-        data_dict['%s_size' % name] = "%0.1f GB" % (disk.size / 1024.)
+        data_dict['%s_size' % name] = "%0.1f GiB" % (disk.size / 1024.)
     return disk_fields
 
@@ -497,5 +497,5 @@
                       display_fields[disk_point+1:])
     
-    main_status['memory'] += ' MB'
+    main_status['memory'] += ' MiB'
     for field, disp in display_fields:
         if field in ('uptime', 'cputime') and locals()[field] is not None:
Index: /trunk/web/templates/validation.py
===================================================================
--- /trunk/web/templates/validation.py	(revision 210)
+++ /trunk/web/templates/validation.py	(revision 211)
@@ -110,8 +110,8 @@
     except ValueError:
         raise InvalidInput('memory', memory, 
-                           "Minimum %s MB" % MIN_MEMORY_SINGLE)
+                           "Minimum %s MiB" % MIN_MEMORY_SINGLE)
     if memory > maxMemory(user, machine, on):
         raise InvalidInput('memory', memory,
-                           'Maximum %s MB' % maxMemory(user, machine))
+                           'Maximum %s MiB' % maxMemory(user, machine))
     return memory
 
@@ -128,5 +128,5 @@
     except ValueError:
         raise InvalidInput('disk', disk,
-                           "Minimum %s GB" % MIN_DISK_SINGLE)
+                           "Minimum %s GiB" % MIN_DISK_SINGLE)
     return disk