diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 79f9930b7255..9f758042ea47 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -14,7 +14,7 @@
 #include "stv0297.h"
 #include "mt312.h"
 #include "lgdt330x.h"
-#include "fe_lgh06xf.h"
+#include "lg_h06xf.h"
 #include "dvb-pll.h"
 
 /* lnb control */
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/drivers/media/dvb/bt8xx/dvb-bt8xx.h
index 078f10350fd8..4745a9017a19 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.h
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.h
@@ -37,7 +37,7 @@
 #include "cx24110.h"
 #include "or51211.h"
 #include "lgdt330x.h"
-#include "fe_lgh06xf.h"
+#include "lg_h06xf.h"
 #include "zl10353.h"
 
 struct dvb_bt8xx_card {
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index a99fada4274e..2df6f6f8385b 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -27,7 +27,7 @@
 
 #include "cx22702.h"
 #include "lgdt330x.h"
-#include "fe_lgh06xf.h"
+#include "lg_h06xf.h"
 #include "mt352.h"
 #include "mt352_priv.h"
 
diff --git a/drivers/media/dvb/frontends/fe_lgh06xf.h b/drivers/media/dvb/frontends/lg_h06xf.h
similarity index 94%
rename from drivers/media/dvb/frontends/fe_lgh06xf.h
rename to drivers/media/dvb/frontends/lg_h06xf.h
index 7f29d335f556..97c77c9ab8be 100644
--- a/drivers/media/dvb/frontends/fe_lgh06xf.h
+++ b/drivers/media/dvb/frontends/lg_h06xf.h
@@ -1,5 +1,5 @@
 /*
- *  fe_lgh06xf.h - ATSC Tuner support for LG TDVS H06xF
+ *  lg_h06xf.h - ATSC Tuner support for LG TDVS-H06xF
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef FE_LGH06XF_H
-#define FE_LGH06XF_H
+#ifndef _LG_H06XF_H_
+#define _LG_H06XF_H_
 #include "dvb-pll.h"
 
 static int lg_h06xf_pll_set(struct dvb_frontend* fe, struct i2c_adapter* i2c_adap,
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 8b48c1f67a8b..ce225202f327 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -51,7 +51,7 @@
 #endif
 #ifdef HAVE_LGDT330X
 # include "lgdt330x.h"
-# include "fe_lgh06xf.h"
+# include "lg_h06xf.h"
 #endif
 #ifdef HAVE_NXT200X
 # include "nxt200x.h"