diff -r 65a1ae21325d -r 7fe8c37b1b84 Hardware/Mainboard/SuperIOHardware.cs
--- a/Hardware/Mainboard/SuperIOHardware.cs	Thu Jul 07 21:53:09 2011 +0000
+++ b/Hardware/Mainboard/SuperIOHardware.cs	Mon Jul 18 19:55:43 2011 +0000
@@ -822,28 +822,25 @@
               switch (model) {
                 case Model.P8P67_PRO: // NCT6776F
                   v.Add(new Voltage("CPU VCore", 0));
-                  v.Add(new Voltage("Voltage #2", 1, true));
-                  v.Add(new Voltage("AVCC", 2, 34, 34));
-                  v.Add(new Voltage("3VCC", 3, 34, 34));
-                  v.Add(new Voltage("Voltage #5", 4, true));
-                  v.Add(new Voltage("Voltage #6", 5, true));
-                  v.Add(new Voltage("Voltage #7", 6, true));
-                  v.Add(new Voltage("3VSB", 7, 34, 34));
+                  v.Add(new Voltage("+12V", 1, 11, 1));
+                  v.Add(new Voltage("Analog +3.3V", 2, 34, 34));
+                  v.Add(new Voltage("+3.3V", 3, 34, 34));
+                  v.Add(new Voltage("+5V", 4, 12, 3));
+                  v.Add(new Voltage("Standby +3.3V", 7, 34, 34));
                   v.Add(new Voltage("VBAT", 8, 34, 34));
-                  t.Add(new Temperature("CPU", 1));
+                  t.Add(new Temperature("CPU", 0));
                   t.Add(new Temperature("Auxiliary", 2));
-                  t.Add(new Temperature("System", 3));
-                  f.Add(new Fan("System Fan", 0));
+                  t.Add(new Temperature("Motherboard", 3));
+                  f.Add(new Fan("Chassis Fan #1", 0));
                   f.Add(new Fan("CPU Fan", 1));
-                  f.Add(new Fan("Auxiliary Fan", 2));
-                  f.Add(new Fan("Auxiliary Fan #2", 3));
-                  f.Add(new Fan("Auxiliary Fan #3", 4));
+                  f.Add(new Fan("Power Fan", 2));
+                  f.Add(new Fan("Chassis Fan #2", 3));
                   break;
                 case Model.P8P67_M_PRO: // NCT6776F
                   v.Add(new Voltage("CPU VCore", 0));
                   v.Add(new Voltage("+12V", 1, 11, 1));
                   v.Add(new Voltage("Analog +3.3V", 2, 34, 34));
-                  v.Add(new Voltage("+3V", 3, 34, 34));
+                  v.Add(new Voltage("+3.3V", 3, 34, 34));
                   v.Add(new Voltage("+5V", 4, 12, 3));
                   v.Add(new Voltage("Voltage #6", 5, true));
                   v.Add(new Voltage("Voltage #7", 6, true));