9 files changed, 27 insertions, 27 deletions
diff --git a/driver/charger/bq24192.h b/driver/charger/bq24192.h
index 4177dc5c2c..6cf5fdecdb 100644
--- a/driver/charger/bq24192.h
+++ b/driver/charger/bq24192.h
@@ -5,8 +5,8 @@
  * TI bq24192 battery charger driver.
  */
 
-#ifndef __CROS_EC_CHARGER_BQ24192_H
-#define __CROS_EC_CHARGER_BQ24192_H
+#ifndef __CROS_EC_BQ24192_H
+#define __CROS_EC_BQ24192_H
 
 #define BQ24192_ADDR 0xd6
 
@@ -25,4 +25,4 @@
 
 #define BQ24192_DEVICE_ID           0x2b
 
-#endif /* __CROS_EC_CHARGER_BQ24192_H */
+#endif /* __CROS_EC_BQ24192_H */
diff --git a/driver/charger/bq24707a.h b/driver/charger/bq24707a.h
index 744e991283..14e89ed136 100644
--- a/driver/charger/bq24707a.h
+++ b/driver/charger/bq24707a.h
@@ -5,8 +5,8 @@
  * TI bq24707A battery charger driver.
  */
 
-#ifndef __CROS_EC_CHARGER_BQ24707A_H
-#define __CROS_EC_CHARGER_BQ24707A_H
+#ifndef __CROS_EC_BQ24707A_H
+#define __CROS_EC_BQ24707A_H
 
 /* Chip specific commands */
 #define BQ24707_CHARGE_OPTION           0x12
@@ -40,5 +40,5 @@
 #define CHARGE_WATCHDOG_88SEC           (2 << 13)
 #define CHARGE_WATCHDOG_175SEC_DEFAULT  (3 << 13)
 
-#endif /* __CROS_EC_CHARGER_BQ24707A_H */
+#endif /* __CROS_EC_BQ24707A_H */
 
diff --git a/driver/charger/bq24715.h b/driver/charger/bq24715.h
index 470c454f4d..bb5deec902 100644
--- a/driver/charger/bq24715.h
+++ b/driver/charger/bq24715.h
@@ -5,8 +5,8 @@
  * TI bq24715 battery charger driver.
  */
 
-#ifndef __CROS_EC_CHARGER_BQ24715_H
-#define __CROS_EC_CHARGER_BQ24715_H
+#ifndef __CROS_EC_BQ24715_H
+#define __CROS_EC_BQ24715_H
 
 /* NOTES:
  * If battery is not present keep charge current register (0x14) at 0.
@@ -127,4 +127,4 @@
 #define INPUT_I_MAX                    (8064)
 #define INPUT_I_STEP                   (64)
 
-#endif /* __CROS_EC_CHARGER_BQ24715_H */
+#endif /* __CROS_EC_BQ24715_H */
diff --git a/driver/charger/bq24725.h b/driver/charger/bq24725.h
index 3deb41d125..b935501a20 100644
--- a/driver/charger/bq24725.h
+++ b/driver/charger/bq24725.h
@@ -5,8 +5,8 @@
  * TI bq24725 battery charger driver.
  */
 
-#ifndef __CROS_EC_CHARGER_BQ24725_H
-#define __CROS_EC_CHARGER_BQ24725_H
+#ifndef __CROS_EC_BQ24725_H
+#define __CROS_EC_BQ24725_H
 
 /* Chip specific commands */
 #define BQ24725_CHARGE_OPTION           0x12
@@ -46,5 +46,5 @@
 #define CHARGE_WATCHDOG_88SEC           (2 << 13)
 #define CHARGE_WATCHDOG_175SEC_DEFAULT  (3 << 13)
 
-#endif /* __CROS_EC_CHARGER_BQ24725_H */
+#endif /* __CROS_EC_BQ24725_H */
 
diff --git a/driver/charger/bq24735.h b/driver/charger/bq24735.h
index 914ff2b903..05336cb41c 100644
--- a/driver/charger/bq24735.h
+++ b/driver/charger/bq24735.h
@@ -5,8 +5,8 @@
  * TI bq24735 battery charger driver.
  */
 
-#ifndef __CROS_EC_CHARGER_BQ24735_H
-#define __CROS_EC_CHARGER_BQ24735_H
+#ifndef __CROS_EC_BQ24735_H
+#define __CROS_EC_BQ24735_H
 
 /* Chip specific commands */
 #define BQ24735_CHARGE_OPTION           0x12
@@ -54,4 +54,4 @@
 #define ACPRES_DEGLITCH_150MS           (0 << 15)
 #define ACPRES_DEGLITCH_1300MS_DEFAULT  (1 << 15)
 
-#endif /* __CROS_EC_CHARGER_BQ24735_H */
+#endif /* __CROS_EC_BQ24735_H */
diff --git a/driver/charger/bq24738.h b/driver/charger/bq24738.h
index bb07f90480..a40a9e193f 100644
--- a/driver/charger/bq24738.h
+++ b/driver/charger/bq24738.h
@@ -5,8 +5,8 @@
  * TI bq24738 battery charger driver.
  */
 
-#ifndef __CROS_EC_CHARGER_BQ24738_H
-#define __CROS_EC_CHARGER_BQ24738_H
+#ifndef __CROS_EC_BQ24738_H
+#define __CROS_EC_BQ24738_H
 
 /* Chip specific commands */
 #define BQ24738_CHARGE_OPTION           0x12
@@ -54,4 +54,4 @@
 #define ACPRES_DEGLITCH_150MS           (0 << 15)
 #define ACPRES_DEGLITCH_1300MS_DEFAULT  (1 << 15)
 
-#endif /* __CROS_EC_CHARGER_BQ24738_H */
+#endif /* __CROS_EC_BQ24738_H */
diff --git a/driver/charger/bq24773.h b/driver/charger/bq24773.h
index 944ac2a814..50723d145f 100644
--- a/driver/charger/bq24773.h
+++ b/driver/charger/bq24773.h
@@ -5,8 +5,8 @@
  * TI bq24773 battery charger driver.
  */
 
-#ifndef __CROS_EC_CHARGER_BQ24773_H
-#define __CROS_EC_CHARGER_BQ24773_H
+#ifndef __CROS_EC_BQ24773_H
+#define __CROS_EC_BQ24773_H
 
 /* for i2c_read and i2c_write functions. */
 #include "i2c.h"
@@ -119,4 +119,4 @@ static inline int raw_write16(int offset, int value)
 	return i2c_write16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER, offset, value);
 }
 
-#endif /* __CROS_EC_CHARGER_BQ24773_H */
+#endif /* __CROS_EC_BQ24773_H */
diff --git a/driver/charger/bq2589x.h b/driver/charger/bq2589x.h
index b7959238e0..fd5119536c 100644
--- a/driver/charger/bq2589x.h
+++ b/driver/charger/bq2589x.h
@@ -5,8 +5,8 @@
  * TI bq25890/bq25892/bq25895 battery charger driver.
  */
 
-#ifndef __CROS_EC_CHARGER_BQ2589X_H
-#define __CROS_EC_CHARGER_BQ2589X_H
+#ifndef __CROS_EC_BQ2589X_H
+#define __CROS_EC_BQ2589X_H
 
 /* Registers */
 #define BQ2589X_REG_INPUT_CURR      0x00
@@ -77,4 +77,4 @@
 #error BQ2589X unknown variant
 #endif
 
-#endif /* __CROS_EC_CHARGER_BQ2589X_H */
+#endif /* __CROS_EC_BQ2589X_H */
diff --git a/driver/charger/isl9237.h b/driver/charger/isl9237.h
index 30e5ed970d..f0b352e4b0 100644
--- a/driver/charger/isl9237.h
+++ b/driver/charger/isl9237.h
@@ -5,8 +5,8 @@
  * Intersil ISL-9237 battery charger driver.
  */
 
-#ifndef __CROS_EC_CHARGER_ISL9237_H
-#define __CROS_EC_CHARGER_ISL9237_H
+#ifndef __CROS_EC_ISL9237_H
+#define __CROS_EC_ISL9237_H
 
 #define ISL9237_ADDR 0x12 /* 7bit address 0001001 */
 
@@ -247,4 +247,4 @@ enum isl9237_fsm_state {
 #define INPUT_I_STEP  4
 
 #define I2C_ADDR_CHARGER ISL9237_ADDR
-#endif /* __CROS_EC_CHARGER_ISL9237_H */
+#endif /* __CROS_EC_ISL9237_H */