diff --git a/arch/arm/configs/espresso_defconfig b/arch/arm/configs/espresso_defconfig
index ab176019539f..5213cc6078aa 100644
--- a/arch/arm/configs/espresso_defconfig
+++ b/arch/arm/configs/espresso_defconfig
@@ -1467,7 +1467,7 @@ CONFIG_PDA_POWER=y
 # CONFIG_BATTERY_BQ20Z75 is not set
 # CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_MAX17040 is not set
-CONFIG_BATTERY_MAX17042=y
+CONFIG_BATTERY_MAX17042_MANAGER=y
 # CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_TWL4030 is not set
diff --git a/arch/arm/mach-omap2/board-espresso-power.c b/arch/arm/mach-omap2/board-espresso-power.c
index 1f1c1d74e0d9..c7de5a05b1fe 100644
--- a/arch/arm/mach-omap2/board-espresso-power.c
+++ b/arch/arm/mach-omap2/board-espresso-power.c
@@ -26,7 +26,7 @@
 #include <linux/i2c-gpio.h>
 #include <linux/i2c/twl.h>
 #include <linux/power/smb_charger.h>
-#include <linux/power/max17042_battery.h>
+#include <linux/power/max17042_battery_manager.h>
 #include <linux/bat_manager.h>
 #include <linux/battery.h>
 #include <linux/irq.h>
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 7dda20988a69..75ebb4706ec4 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -179,15 +179,14 @@ config BATTERY_MAX17040
 	  in handheld and portable equipment. The MAX17040 is configured
 	  to operate with a single lithium cell
 
-config BATTERY_MAX17042
-	tristate "Maxim MAX17042/8997/8966 Fuel Gauge"
+config BATTERY_MAX17042_MANAGER
+	tristate "Maxim MAX17042 Fuel Gauge"
 	depends on I2C
+	depends on BATTERY_MANAGER
 	help
 	  MAX17042 is fuel-gauge systems for lithium-ion (Li+) batteries
 	  in handheld and portable equipment. The MAX17042 is configured
-	  to operate with a single lithium cell. MAX8997 and MAX8966 are
-	  multi-function devices that include fuel gauages that are compatible
-	  with MAX17042.
+	  to operate with a single lithium cell.
 
 config BATTERY_Z2
 	tristate "Z2 battery driver"
@@ -278,9 +277,9 @@ config CHARGER_SMB347
 config BATTERY_MANAGER
 	tristate "Battery Manager"
 	help
-	  Say Y to enable supprot SEC Battery manager.
+	  Say Y to enable support SEC Battery manager.
 	  This driver include battery concept.
-	  Charging(Discharging) by temperature, limit timer
+	  Charging (Discharging) by temperature, limit timer
 	  and fully charged.
 
 endif # POWER_SUPPLY
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 2c7f5e73ac9b..b645f9cfc5f4 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -26,7 +26,7 @@ obj-$(CONFIG_BATTERY_BQ20Z75)	+= bq20z75.o
 obj-$(CONFIG_BATTERY_BQ27x00)	+= bq27x00_battery.o
 obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o
 obj-$(CONFIG_BATTERY_MAX17040)	+= max17040_battery.o
-obj-$(CONFIG_BATTERY_MAX17042)	+= max17042_battery.o
+obj-$(CONFIG_BATTERY_MAX17042_MANAGER)	+= max17042_battery_manager.o
 obj-$(CONFIG_BATTERY_Z2)	+= z2_battery.o
 obj-$(CONFIG_BATTERY_S3C_ADC)	+= s3c_adc_battery.o
 obj-$(CONFIG_CHARGER_PCF50633)	+= pcf50633-charger.o
diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery_manager.c
similarity index 99%
rename from drivers/power/max17042_battery.c
rename to drivers/power/max17042_battery_manager.c
index eddbb06f3e20..8879582cd631 100644
--- a/drivers/power/max17042_battery.c
+++ b/drivers/power/max17042_battery_manager.c
@@ -27,7 +27,7 @@
 #include <linux/i2c.h>
 #include <linux/mod_devicetable.h>
 #include <linux/battery.h>
-#include <linux/power/max17042_battery.h>
+#include <linux/power/max17042_battery_manager.h>
 #include <linux/rtc.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
diff --git a/include/linux/power/max17042_battery.h b/include/linux/power/max17042_battery_manager.h
similarity index 97%
rename from include/linux/power/max17042_battery.h
rename to include/linux/power/max17042_battery_manager.h
index 78d1394d7c58..b63c2f3bc374 100644
--- a/include/linux/power/max17042_battery.h
+++ b/include/linux/power/max17042_battery_manager.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __MAX17042_BATTERY_H_
-#define __MAX17042_BATTERY_H_
+#ifndef __MAX17042_BATTERY_MANAGER_H_
+#define __MAX17042_BATTERY_MANAGER_H_
 
 #include <linux/battery.h>