diff --git a/alliance/src/bvl/src/bvl_bcomp_l.l b/alliance/src/bvl/src/bvl_bcomp_l.l
index fb9292a3..09cf000b 100644
--- a/alliance/src/bvl/src/bvl_bcomp_l.l
+++ b/alliance/src/bvl/src/bvl_bcomp_l.l
@@ -127,7 +127,7 @@ char  *key;
     addhtitem (pt_hash, namealloc("after")        , AFTER        );
     addhtitem (pt_hash, namealloc("alias")        , ALIAS        );
     addhtitem (pt_hash, namealloc("all")          , ALL          );
-    addhtitem (pt_hash, namealloc("and")          , _AND         );
+    addhtitem (pt_hash, namealloc("and")          , tok_AND         );
     addhtitem (pt_hash, namealloc("architecture") , ARCHITECTURE );
     addhtitem (pt_hash, namealloc("array")        , ARRAY        );
     addhtitem (pt_hash, namealloc("assert")       , ASSERT       );
@@ -188,7 +188,7 @@ char  *key;
     addhtitem (pt_hash, namealloc("nor")          , _NOR         );
     addhtitem (pt_hash, namealloc("not")          , _NOT         );
     addhtitem (pt_hash, namealloc("ns")           , NS           );
-    addhtitem (pt_hash, namealloc("null")         , _NULL        );
+    addhtitem (pt_hash, namealloc("null")         , tok_NULL        );
 
     addhtitem (pt_hash, namealloc("of")           , OF           );
     addhtitem (pt_hash, namealloc("on")           , ON           );
diff --git a/alliance/src/bvl/src/bvl_bcomp_y.y b/alliance/src/bvl/src/bvl_bcomp_y.y
index 39af7d35..6e92ed9d 100644
--- a/alliance/src/bvl/src/bvl_bcomp_y.y
+++ b/alliance/src/bvl/src/bvl_bcomp_y.y
@@ -1358,7 +1358,7 @@ bvl_ablstr    pt_ablstr;	/* tested expression			*/
         struct g_type    dble;
 	};
 
-%token         _AND
+%token         tok_AND
 %token         _BEGIN
 %token         _END
 %token         _EQSym
@@ -1377,7 +1377,7 @@ bvl_ablstr    pt_ablstr;	/* tested expression			*/
 %token         _NEXT
 %token         _NOR
 %token         _NOT
-%token         _NULL
+%token         tok_NULL
 %token         _OR
 %token         _OUT
 %token         _XOR
@@ -1490,7 +1490,7 @@ bvl_ablstr    pt_ablstr;	/* tested expression			*/
 %token         WOR_BIT
 %token         WOR_VECTOR
 
-%left         _AND _OR _NAND _NOR _XOR
+%left         tok_AND _OR _NAND _NOR _XOR
 %left         _EQSym _NESym
 %left         _NOT
 
@@ -2954,11 +2954,11 @@ expression
 
 relation..AND__relation..
 	: relation
-	  _AND
+	  tok_AND
 	  relation
 		{ $$ = crtabl (AND , $1 , $3 , -1, -1); }
 	| relation..AND__relation..
-	  _AND
+	  tok_AND
 	  relation
 		{ $$ = crtabl (AND , $1 , $3 , -1, -1); }
 	;