diff --git a/lib/acpi.c b/lib/acpi.c
index 9ea746c..a51220d 100644
--- a/lib/acpi.c
+++ b/lib/acpi.c
@@ -211,7 +211,7 @@ double get_battery_zone_value (char *zone)
     value = 0.0;
 
 #ifdef HAVE_SYSFS_ACPI
-    filename = g_strdup_printf ("/sys/class/power_supply/%s/energy_now", zone);
+    filename = g_strdup_printf ("/sys/class/power_supply/%s/charge_now", zone);
 #else
     filename = g_strdup_printf ("%s/%s/%s/%s", ACPI_PATH, ACPI_DIR_BATTERY,
                                 zone, ACPI_FILE_BATTERY_STATE);
@@ -312,7 +312,7 @@ int read_battery_zone (t_chip *chip)
                     fclose (file);
                 }
                 g_free (filename);
-                filename = g_strdup_printf ("/sys/class/power_supply/%s/energy_now", de->d_name);
+                filename = g_strdup_printf ("/sys/class/power_supply/%s/charge_now", de->d_name);
                 file = fopen (filename, "r");
                 if (file) {
 
@@ -398,7 +398,7 @@ get_battery_max_value (char *name, t_chipfeature *chipfeature)
     TRACE ("enters get_battery_max_value");
 
 #ifdef HAVE_SYSFS_ACPI
-    filename = g_strdup_printf ("/sys/class/power_supply/%s/energy_full", name);
+    filename = g_strdup_printf ("/sys/class/power_supply/%s/charge_full", name);
 #else
     filename = g_strdup_printf ("%s/%s/%s/%s", ACPI_PATH,
                                             ACPI_DIR_BATTERY, name,
@@ -577,7 +577,7 @@ refresh_acpi (gpointer chip_feature, gpointer data)
             cf->raw_value = get_battery_zone_value (cf->devicename); /* zone */
             /* g_free (zone); */
             /*  g_free (cf->formatted_value);
-            cf->formatted_value = g_strdup_printf (_("%.0f mWh"), cf->raw_value); */
+            cf->formatted_value = g_strdup_printf (_("%.0f mAh"), cf->raw_value); */
             break;
 
         case STATE:
diff --git a/lib/sensors-interface-common.c b/lib/sensors-interface-common.c
index b3e2234..73b65f8 100644
--- a/lib/sensors-interface-common.c
+++ b/lib/sensors-interface-common.c
@@ -150,7 +150,7 @@ format_sensor_value (t_tempscale scale, t_chipfeature *chipfeature,
                break;
 
         case ENERGY:
-               *help = g_strdup_printf(_("%.0f mWh"), sensorFeature);
+               *help = g_strdup_printf(_("%.0f mAh"), sensorFeature);
                break;
 
         case STATE: