4 files changed, 6 insertions, 5 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 9278519dbcf3..7c5dc31c1d95 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -143,11 +143,12 @@ help:
 
 # ===========================================================================
 # object files used by all kconfig flavours
-common-objs     := confdata.o expr.o lexer.lex.o preprocess.o symbol.o zconf.tab.o
+common-objs     := confdata.o expr.o lexer.lex.o parser.tab.o preprocess.o \
+                   symbol.o
 
-$(obj)/lexer.lex.o: $(obj)/zconf.tab.h
+$(obj)/lexer.lex.o: $(obj)/parser.tab.h
 HOSTCFLAGS_lexer.lex.o  := -I$(src)
-HOSTCFLAGS_zconf.tab.o  := -I$(src)
+HOSTCFLAGS_parser.tab.o := -I$(src)
 
 # conf: Used for defconfig, oldconfig and related targets
 hostprogs-y     += conf
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 999edb60cd53..8dde65bc3165 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -172,7 +172,7 @@ struct symbol {
  *         int "BAZ Value"
  *         range 1..255
  *
- * Please, also check zconf.y:print_symbol() when modifying the
+ * Please, also check parser.y:print_symbol() when modifying the
  * list of property types!
  */
 enum prop_type {
diff --git a/scripts/kconfig/lexer.l b/scripts/kconfig/lexer.l
index b2d0a3b0bce9..c9df1c8b9824 100644
--- a/scripts/kconfig/lexer.l
+++ b/scripts/kconfig/lexer.l
@@ -15,7 +15,7 @@
 #include <unistd.h>
 
 #include "lkc.h"
-#include "zconf.tab.h"
+#include "parser.tab.h"
 
 #define YY_DECL         static int yylex1(void)
 
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/parser.y
index 60936c76865b..60936c76865b 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/parser.y