diff --git a/alliance/src/fvh/src/Makefile.am b/alliance/src/fvh/src/Makefile.am
index c4c3dc47..65cb3c2b 100644
--- a/alliance/src/fvh/src/Makefile.am
+++ b/alliance/src/fvh/src/Makefile.am
@@ -6,9 +6,9 @@ fbh_env.c  fbh_uti.c	fbl_bspec.h  fbl_util.c   fvhdrive.h  fvhparse.c \
 fbh_fre.c  fbh_view.c	fbl_byacc.h  fbl_util.h   fvherror.c  fvhparse.h \
 fbh_rin.c  fbl_bedef.h	fbl_drive.c  fbl_utype.h  fvherror.h
 
-CLEANFILES          = fbl_bcompyac.c fbl_bcompyac.h fbl_bcomplex.c
+CLEANFILES          = fbl_bcomp_y.c fbl_bcomp_y.h fbl_bcomp_l.c
 
-fbl_bcompyac.c fbl_bcompyac.h : $(srcdir)/fbl_bcomp_y.y
-	$(YACC) -d $(YFLAGS) $(srcdir)/fbl_bcomp_y.y && sed -e "s/yy/fbl_y_/g" -e "s/YY/FBL_Y_/g" y.tab.c > fbl_bcompyac.c && sed -e "s/yy/fbl_y_/g" -e "s/YY/FBL_Y_/g" y.tab.h > fbl_bcompyac.h
-fbl_bcomplex.c : $(srcdir)/fbl_bcomp_l.l fbl_bcompyac.h
-	$(LEX) -t $(srcdir)/fbl_bcomp_l.l | sed -e "s/yy/fbl_y_/g" -e "s/YY/FBL_Y_/g" > fbl_bcomplex.c
+fbl_bcomp_y.c fbl_bcomp_y.h : $(srcdir)/fbl_bcomp_y.y
+	$(YACC) -d $(YFLAGS) $(srcdir)/fbl_bcomp_y.y && sed -e "s/yy/fbl_y_/g" -e "s/YY/FBL_Y_/g" y.tab.c > fbl_bcomp_y.c && sed -e "s/yy/fbl_y_/g" -e "s/YY/FBL_Y_/g" y.tab.h > fbl_bcomp_y.h
+fbl_bcomp_l.c : $(srcdir)/fbl_bcomp_l.l fbl_bcomp_y.h
+	$(LEX) -t $(srcdir)/fbl_bcomp_l.l | sed -e "s/yy/fbl_y_/g" -e "s/YY/FBL_Y_/g" > fbl_bcomp_l.c
diff --git a/alliance/src/fvh/src/fbl_bcomp_l.l b/alliance/src/fvh/src/fbl_bcomp_l.l
index 82805090..d676f857 100644
--- a/alliance/src/fvh/src/fbl_bcomp_l.l
+++ b/alliance/src/fvh/src/fbl_bcomp_l.l
@@ -60,7 +60,7 @@ struct g_type
 
 
 
-#include "fbl_y.tab.h"
+#include "fbl_bcomp_y.h"
 #include "fbl_bedef.h"
 #include "fbl_blex.h"
 
diff --git a/alliance/src/vbl/src/Makefile.am b/alliance/src/vbl/src/Makefile.am
index 29ffafe4..f1e06fb1 100644
--- a/alliance/src/vbl/src/Makefile.am
+++ b/alliance/src/vbl/src/Makefile.am
@@ -3,9 +3,9 @@ libVbl_a_SOURCES    = vbl_bcomp_y.y vbl_bcomp_l.l \
 vbl_bedef.h  vbl_bspec.c  vbl_byacc.h  vbl_util.c  vbl_utype.h \
 vbl.h	vbl_blex.h   vbl_bspec.h  vbl_parse.c  vbl_util.h
 
-CLEANFILES          = vbl_bcompyac.c vbl_bcompyac.h vbl_bcomplex.c
+CLEANFILES          = vbl_bcomp_y.c vbl_bcomp_y.h vbl_bcomp_l.c
 
-vbl_bcompyac.c vbl_bcompyac.h : $(srcdir)/vbl_bcomp_y.y
-	$(YACC) -d $(YFLAGS) $(srcdir)/vbl_bcomp_y.y && sed -e "s/yy/vbl_y_/g" -e "s/YY/VBL_Y_/g" y.tab.c > vbl_bcompyac.c && sed -e "s/yy/vbl_y_/g" -e "s/YY/VBL_Y_/g" y.tab.h > vbl_bcompyac.h
-vbl_bcomplex.c : $(srcdir)/vbl_bcomp_l.l vbl_bcompyac.h
-	$(LEX) -t $(srcdir)/vbl_bcomp_l.l | sed -e "s/yy/vbl_y_/g" -e "s/YY/VBL_Y_/g" > vbl_bcomplex.c
+vbl_bcomp_y.c vbl_bcomp_y.h : $(srcdir)/vbl_bcomp_y.y
+	$(YACC) -d $(YFLAGS) $(srcdir)/vbl_bcomp_y.y && sed -e "s/yy/vbl_y_/g" -e "s/YY/VBL_Y_/g" y.tab.c > vbl_bcomp_y.c && sed -e "s/yy/vbl_y_/g" -e "s/YY/VBL_Y_/g" y.tab.h > vbl_bcomp_y.h
+vbl_bcomp_l.c : $(srcdir)/vbl_bcomp_l.l vbl_bcomp_y.h
+	$(LEX) -t $(srcdir)/vbl_bcomp_l.l | sed -e "s/yy/vbl_y_/g" -e "s/YY/VBL_Y_/g" > vbl_bcomp_l.c
diff --git a/alliance/src/vbl/src/vbl_bcomp_l.l b/alliance/src/vbl/src/vbl_bcomp_l.l
index a523426f..bc962b4b 100644
--- a/alliance/src/vbl/src/vbl_bcomp_l.l
+++ b/alliance/src/vbl/src/vbl_bcomp_l.l
@@ -59,7 +59,7 @@ struct g_type
   char FLAG;
 };
 
-#include "vbl_bcompyac.h"
+#include "vbl_bcomp_y.h"
 #include "vbl_bedef.h"
 #include "vbl_blex.h"