diff --git a/alliance/src/mbkvhdl/src/mvl_scomp_l.l b/alliance/src/mbkvhdl/src/mvl_scomp_l.l
index 42016371..ee524166 100644
--- a/alliance/src/mbkvhdl/src/mvl_scomp_l.l
+++ b/alliance/src/mbkvhdl/src/mvl_scomp_l.l
@@ -43,7 +43,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       );
@@ -101,7 +101,7 @@ char  *key;
     addhtitem (pt_hash, namealloc("next")         , _NEXT        );
     addhtitem (pt_hash, namealloc("nor")          , _NOR         );
     addhtitem (pt_hash, namealloc("not")          , _NOT         );
-    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/mbkvhdl/src/mvl_scomp_y.y b/alliance/src/mbkvhdl/src/mvl_scomp_y.y
index fe5c8270..de187368 100644
--- a/alliance/src/mbkvhdl/src/mvl_scomp_y.y
+++ b/alliance/src/mbkvhdl/src/mvl_scomp_y.y
@@ -78,7 +78,7 @@ static struct lofig *MVL_CHDHED = NULL;	/* childs list                  */
 %token        AFTER
 %token        ALIAS
 %token        ALL
-%token        _AND
+%token        tok_AND
 %token        ARCHITECTURE
 %token        ARRAY
 %token        ASSERT
@@ -128,7 +128,7 @@ static struct lofig *MVL_CHDHED = NULL;	/* childs list                  */
 %token        _NEXT
 %token        _NOR
 %token        _NOT
-%token        _NULL
+%token        tok_NULL
 %token        OF
 %token        ON
 %token        OPEN