diff --git a/ldebug.c b/ldebug.c
index c392820c..ef934d86 100644
--- a/ldebug.c
+++ b/ldebug.c
@@ -1,5 +1,5 @@
 /*
-** $Id: ldebug.c,v 1.14 2000/03/29 20:19:20 roberto Exp roberto $
+** $Id: ldebug.c,v 1.15 2000/03/30 17:19:48 roberto Exp roberto $
 ** Debug Interface
 ** See Copyright Notice in lua.h
 */
@@ -25,7 +25,7 @@
 static const lua_Type normtype[] = {  /* ORDER LUA_T */
   TAG_USERDATA, TAG_NUMBER, TAG_STRING, TAG_TABLE,
   TAG_LCLOSURE, TAG_CCLOSURE, TAG_NIL,
-  TAG_LCLOSURE, TAG_CCLOSURE   /* TAG_LCLMARK, TAG_CCLMARK */
+  TAG_LCLOSURE, TAG_CCLOSURE   /* TAG_LMARK, TAG_CMARK */
 };
 
 
@@ -88,7 +88,7 @@ int lua_getstack (lua_State *L, int level, lua_Debug *ar) {
 static int lua_nups (StkId f) {
   switch (ttype(f)) {
     case TAG_LCLOSURE:  case TAG_CCLOSURE:
-    case TAG_LCLMARK:   case TAG_CCLMARK:
+    case TAG_LMARK:   case TAG_CMARK:
       return f->value.cl->nelems;
     default:
       return 0;
@@ -102,7 +102,7 @@ static int lua_currentline (lua_State *L, StkId f) {
 
 
 static Proto *getluaproto (StkId f) {
-  return (ttype(f) == TAG_LCLMARK) ?  clvalue(f)->f.l : NULL;
+  return (ttype(f) == TAG_LMARK) ?  clvalue(f)->f.l : NULL;
 }
 
 
@@ -135,12 +135,12 @@ int lua_setlocal (lua_State *L, const lua_Debug *ar, lua_Localvar *v) {
 static void lua_funcinfo (lua_Debug *ar) {
   StkId func = ar->_func;
   switch (ttype(func)) {
-    case TAG_LCLOSURE:  case TAG_LCLMARK:
+    case TAG_LCLOSURE:  case TAG_LMARK:
       ar->source = clvalue(func)->f.l->source->str;
       ar->linedefined = clvalue(func)->f.l->lineDefined;
       ar->what = "Lua";
       break;
-    case TAG_CCLOSURE:  case TAG_CCLMARK:
+    case TAG_CCLOSURE:  case TAG_CMARK:
       ar->source = "(C)";
       ar->linedefined = -1;
       ar->what = "C";
diff --git a/ldo.c b/ldo.c
index bd58c734..08245fba 100644
--- a/ldo.c
+++ b/ldo.c
@@ -1,5 +1,5 @@
 /*
-** $Id: ldo.c,v 1.70 2000/03/29 20:19:20 roberto Exp roberto $
+** $Id: ldo.c,v 1.71 2000/03/30 17:19:48 roberto Exp roberto $
 ** Stack and Call structure of Lua
 ** See Copyright Notice in lua.h
 */
@@ -183,14 +183,14 @@ void luaD_call (lua_State *L, StkId func, int nResults) {
   retry:  /* for `function' tag method */
   switch (ttype(func)) {
     case TAG_LCLOSURE: {
-      ttype(func) = TAG_LCLMARK;
+      ttype(func) = TAG_LMARK;
       if (callhook)
         luaD_callHook(L, func, callhook, "call");
       firstResult = luaV_execute(L, clvalue(func), func+1);
       break;
     }
     case TAG_CCLOSURE: {
-      ttype(func) = TAG_CCLMARK;
+      ttype(func) = TAG_CMARK;
       if (callhook)
         luaD_callHook(L, func, callhook, "call");
       firstResult = callCclosure(L, clvalue(func), func+1);
diff --git a/lgc.c b/lgc.c
index 9adbc385..e1885570 100644
--- a/lgc.c
+++ b/lgc.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lgc.c,v 1.44 2000/03/27 20:10:21 roberto Exp roberto $
+** $Id: lgc.c,v 1.45 2000/03/29 20:19:20 roberto Exp roberto $
 ** Garbage Collector
 ** See Copyright Notice in lua.h
 */
@@ -102,10 +102,10 @@ static int markobject (lua_State *L, TObject *o) {
     case TAG_TABLE:
       hashmark(L, avalue(o));
       break;
-    case TAG_LCLOSURE:  case TAG_LCLMARK:
+    case TAG_LCLOSURE:  case TAG_LMARK:
       protomark(L, clvalue(o)->f.l);
       /* go trhough */
-    case TAG_CCLOSURE:  case TAG_CCLMARK:
+    case TAG_CCLOSURE:  case TAG_CMARK:
       closuremark(L, clvalue(o));
       break;
     default: break;  /* numbers, etc */
diff --git a/lobject.h b/lobject.h
index 844111ff..d4912251 100644
--- a/lobject.h
+++ b/lobject.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lobject.h,v 1.56 2000/03/27 20:10:21 roberto Exp roberto $
+** $Id: lobject.h,v 1.57 2000/03/29 20:19:20 roberto Exp roberto $
 ** Type definitions for Lua objects
 ** See Copyright Notice in lua.h
 */
@@ -45,8 +45,8 @@ typedef enum {
   TAG_CCLOSURE,	/* fixed tag for C closures */
   TAG_NIL,	/* last "pre-defined" tag */
 
-  TAG_LCLMARK,	/* mark for Lua closures */
-  TAG_CCLMARK,	/* mark for C closures */
+  TAG_LMARK,	/* mark for Lua closures */
+  TAG_CMARK,	/* mark for C closures */
 
   TAG_LINE
 } lua_Type;
@@ -58,12 +58,12 @@ typedef enum {
 /*
 ** check whether `t' is a mark
 */
-#define is_T_MARK(t)	((t) == TAG_LCLMARK || (t) == TAG_CCLMARK)
+#define is_T_MARK(t)	((t) == TAG_LMARK || (t) == TAG_CMARK)
 
 
 typedef union {
   struct TString *ts;	/* TAG_STRING, TAG_USERDATA */
-  struct Closure *cl;	/* TAG_[CL]CLOSURE, TAG_[CL]CLMARK */
+  struct Closure *cl;	/* TAG_[CL]CLOSURE, TAG_[CL]MARK */
   struct Hash *a;	/* TAG_TABLE */
   Number n;		/* TAG_NUMBER */
   int i;		/* TAG_LINE */