diff --git a/src/modules/Parser/html.c b/src/modules/Parser/html.c
index 83c8475b8f0a0e1da91fffdc2e4ca513bcdc07da..91a3a1582c8dc17acd3eb1881ac5c324376dddfe 100644
--- a/src/modules/Parser/html.c
+++ b/src/modules/Parser/html.c
@@ -4988,31 +4988,31 @@ void init_parser_html(void)
 
    offset = ADD_STORAGE(struct parser_html_storage);
 
-   MAP_VARIABLE(" maptag", offset + OFFSETOF(parser_html_storage, maptag),
+   PIKE_MAP_VARIABLE(" maptag", offset + OFFSETOF(parser_html_storage, maptag),
 		tMap(tStr,tTodo(tTagargs)),
 		T_MAPPING, ID_STATIC|ID_PRIVATE);
-   MAP_VARIABLE(" mapcont", offset + OFFSETOF(parser_html_storage, mapcont),
+   PIKE_MAP_VARIABLE(" mapcont", offset + OFFSETOF(parser_html_storage, mapcont),
 		tMap(tStr,tTodo(tTagargs tStr)),
 		T_MAPPING, ID_STATIC|ID_PRIVATE);
-   MAP_VARIABLE(" mapentity", offset + OFFSETOF(parser_html_storage, mapentity),
+   PIKE_MAP_VARIABLE(" mapentity", offset + OFFSETOF(parser_html_storage, mapentity),
 		tMap(tStr,tTodo(tNone)),
 		T_MAPPING, ID_STATIC|ID_PRIVATE);
-   MAP_VARIABLE(" mapqtag", offset + OFFSETOF(parser_html_storage, mapqtag),
+   PIKE_MAP_VARIABLE(" mapqtag", offset + OFFSETOF(parser_html_storage, mapqtag),
 		tMap(tStr,tTodo(tStr)),
 		T_MAPPING, ID_STATIC|ID_PRIVATE);
-   MAP_VARIABLE(" callback__tag", offset + OFFSETOF(parser_html_storage, callback__tag),
+   PIKE_MAP_VARIABLE(" callback__tag", offset + OFFSETOF(parser_html_storage, callback__tag),
 		tFuncV(tObjImpl_PARSER_HTML tStr,tMix,tCbret),
 		T_MIXED, ID_STATIC|ID_PRIVATE);
-   MAP_VARIABLE(" callback__data", offset + OFFSETOF(parser_html_storage, callback__data),
+   PIKE_MAP_VARIABLE(" callback__data", offset + OFFSETOF(parser_html_storage, callback__data),
 		tFuncV(tObjImpl_PARSER_HTML tStr,tMix,tCbret),
 		T_MIXED, ID_STATIC|ID_PRIVATE);
-   MAP_VARIABLE(" callback__entity", offset + OFFSETOF(parser_html_storage, callback__entity),
+   PIKE_MAP_VARIABLE(" callback__entity", offset + OFFSETOF(parser_html_storage, callback__entity),
 		tFuncV(tObjImpl_PARSER_HTML tStr,tMix,tCbret),
 		T_MIXED, ID_STATIC|ID_PRIVATE);
-   MAP_VARIABLE(" splice_arg", offset + OFFSETOF(parser_html_storage, splice_arg),
+   PIKE_MAP_VARIABLE(" splice_arg", offset + OFFSETOF(parser_html_storage, splice_arg),
 		tString,
 		T_STRING, ID_STATIC|ID_PRIVATE);
-   MAP_VARIABLE(" extra_args", offset + OFFSETOF(parser_html_storage, extra_args),
+   PIKE_MAP_VARIABLE(" extra_args", offset + OFFSETOF(parser_html_storage, extra_args),
 		tArray,
 		T_ARRAY, ID_STATIC|ID_PRIVATE);
 
diff --git a/src/program.h b/src/program.h
index 5cf629492e7afec668e4830ee1ff07d5b551d805..8a275889a95abbf3cdf9a4c861bf9d723e83fee7 100644
--- a/src/program.h
+++ b/src/program.h
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: program.h,v 1.107 2000/08/28 21:47:57 grubba Exp $
+ * $Id: program.h,v 1.108 2000/08/29 00:09:47 hubbe Exp $
  */
 #ifndef PROGRAM_H
 #define PROGRAM_H
@@ -508,7 +508,7 @@ void *parent_storage(int depth);
 #define ADD_INT_CONSTANT(NAME,CONST,FLAGS) \
   quick_add_integer_constant(NAME,CONSTANT_STRLEN(NAME),CONST,FLAGS)
 
-#define MAP_VARIABLE(NAME,OFFSET,TYPE,RTTYPE,FLAGS) \
+#define PIKE_MAP_VARIABLE(NAME,OFFSET,TYPE,RTTYPE,FLAGS) \
   quick_map_variable(NAME,CONSTANT_STRLEN(NAME),OFFSET,TYPE,CONSTANT_STRLEN(TYPE),RTTYPE,FLAGS)
 
 #define ADD_FUNCTION_DTYPE(NAME,FUN,DTYPE,FLAGS) do {				\