diff --git a/llex.c b/llex.c
index 4e4e7d37..59070437 100644
--- a/llex.c
+++ b/llex.c
@@ -1,5 +1,5 @@
 /*
-** $Id: llex.c,v 2.6 2004/12/01 15:46:18 roberto Exp roberto $
+** $Id: llex.c,v 2.7 2004/12/02 12:59:10 roberto Exp roberto $
 ** Lexical Analyzer
 ** See Copyright Notice in lua.h
 */
@@ -36,9 +36,9 @@ const char *const luaX_tokens [] = {
     "and", "break", "do", "else", "elseif",
     "end", "false", "for", "function", "if",
     "in", "local", "nil", "not", "or", "repeat",
-    "return", "then", "true", "until", "while", "*name",
+    "return", "then", "true", "until", "while", "<name>",
     "..", "...", "==", ">=", "<=", "~=",
-    "*number", "*string", "<eof>",
+    "<number>", "<string>", "<eof>",
     NULL
 };
 
diff --git a/lparser.c b/lparser.c
index e35091e9..17a89fd3 100644
--- a/lparser.c
+++ b/lparser.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lparser.c,v 2.7 2004/11/19 16:59:08 roberto Exp roberto $
+** $Id: lparser.c,v 2.8 2004/12/03 20:35:33 roberto Exp roberto $
 ** Lua Parser
 ** See Copyright Notice in lua.h
 */
@@ -133,7 +133,7 @@ static void check_match (LexState *ls, int what, int who, int where) {
 
 static TString *str_checkname (LexState *ls) {
   TString *ts;
-  check_condition(ls, (ls->t.token == TK_NAME), "<name> expected");
+  if (ls->t.token != TK_NAME) error_expected(ls, TK_NAME);
   ts = ls->t.seminfo.ts;
   next(ls);
   return ts;