diff --git a/GUI/MainForm.cs b/GUI/MainForm.cs
index 63fe903..3a82f7e 100644
--- a/GUI/MainForm.cs
+++ b/GUI/MainForm.cs
@@ -44,7 +44,7 @@ using System.Windows.Forms;
 using Aga.Controls.Tree;
 using Aga.Controls.Tree.NodeControls;
 using OpenHardwareMonitor.Hardware;
-using OpenHardwareMonitor.Wmi;
+using OpenHardwareMonitor.WMI;
 
 namespace OpenHardwareMonitor.GUI {
   public partial class MainForm : Form {
diff --git a/Hardware/HDD/HDD.cs b/Hardware/HDD/HDD.cs
index 0d7e800..301b4f1 100644
--- a/Hardware/HDD/HDD.cs
+++ b/Hardware/HDD/HDD.cs
@@ -77,7 +77,8 @@ namespace OpenHardwareMonitor.Hardware.HDD {
       this.drive = drive;
       this.count = 0;
       this.lifeID = lifeID;
-      this.lifeSensor = new Sensor("HDD", 0, SensorType.Level, this, settings);
+      this.lifeSensor = new Sensor("Remaining life", 0, SensorType.Level,
+        this, settings);
 
       Update();
     }
@@ -136,7 +137,7 @@ namespace OpenHardwareMonitor.Hardware.HDD {
           attributes.Exists(attr => (int)attr.ID == (int)lifeID))
         {
           lifeSensor.Value = attributes
-            .Find(attr => (int)attr.ID == (int)temperatureID)
+            .Find(attr => (int)attr.ID == (int)lifeID)
             .AttrValue;
         }
       } else {
diff --git a/Wmi/Hardware.cs b/Wmi/Hardware.cs
index 4e10170..c2a8ddb 100644
--- a/Wmi/Hardware.cs
+++ b/Wmi/Hardware.cs
@@ -38,7 +38,7 @@
 using System.Management.Instrumentation;
 using OpenHardwareMonitor.Hardware;
 
-namespace OpenHardwareMonitor.Wmi {
+namespace OpenHardwareMonitor.WMI {
   [InstrumentationClass(InstrumentationType.Instance)]
   public class Hardware : IWmiObject {
     #region WMI Exposed
diff --git a/Wmi/IWmiObject.cs b/Wmi/IWmiObject.cs
index b5f5865..fe2636e 100644
--- a/Wmi/IWmiObject.cs
+++ b/Wmi/IWmiObject.cs
@@ -35,7 +35,7 @@
  
 */
 
-namespace OpenHardwareMonitor.Wmi {
+namespace OpenHardwareMonitor.WMI {
   interface IWmiObject {
     // Both of these get exposed to WMI
     string Name { get; }
diff --git a/Wmi/Sensor.cs b/Wmi/Sensor.cs
index 3640764..8684b67 100644
--- a/Wmi/Sensor.cs
+++ b/Wmi/Sensor.cs
@@ -37,9 +37,8 @@
 
 using System.Management.Instrumentation;
 using OpenHardwareMonitor.Hardware;
-using OpenHardwareMonitor.Wmi;
 
-namespace OpenHardwareMonitor.Wmi {
+namespace OpenHardwareMonitor.WMI {
   [InstrumentationClass(InstrumentationType.Instance)]
   public class Sensor : IWmiObject {
     private ISensor sensor;
diff --git a/Wmi/WmiProvider.cs b/Wmi/WmiProvider.cs
index e492a63..1080029 100644
--- a/Wmi/WmiProvider.cs
+++ b/Wmi/WmiProvider.cs
@@ -39,14 +39,13 @@ using System;
 using System.Collections.Generic;
 using System.Management.Instrumentation;
 using OpenHardwareMonitor.Hardware;
-using OpenHardwareMonitor.Wmi;
 
 [assembly: Instrumented("root/OpenHardwareMonitor")]
 
 [System.ComponentModel.RunInstaller(true)]
 public class InstanceInstaller : DefaultManagementProjectInstaller { }
 
-namespace OpenHardwareMonitor.Wmi {
+namespace OpenHardwareMonitor.WMI {
   /// <summary>
   /// The WMI Provider.
   /// This class is not exposed to WMI itself.