diff --git a/src/errors.h b/src/errors.h
index cedd94208954b1f6119c396909fcde667bdf3e44..b6449129012261f5e390372784c75109344e8f7b 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: errors.h,v 1.30 2004/12/30 13:25:44 grubba Exp $
+|| $Id: errors.h,v 1.31 2005/01/20 14:29:51 nilsson Exp $
 */
 
 #ifdef ERR_DECLARE
@@ -44,7 +44,7 @@ struct PIKE_CONCAT(NAME,_error_struct) { \
 }while(0);
 
 #define ERR_VAR(TYPE,CTYPE,RUNTYPE,NAME2) \
-  map_variable(#NAME2, #CTYPE, 0, \
+  MAP_VARIABLE(#NAME2, CTYPE, 0, \
 	       current_offset + (((char *)&(foo.NAME2))-((char *)&foo)), RUNTYPE);
 
 #define EMPTY
@@ -79,8 +79,8 @@ struct PIKE_CONCAT(NAME,_error_struct) { \
 #endif
 
 DECLARE_ERROR(generic, Generic, EMPTY ,
-  ERR_VAR(struct pike_string *,string,PIKE_T_STRING,error_message)
-  ERR_VAR(struct array *,array,PIKE_T_ARRAY,error_backtrace)
+  ERR_VAR(struct pike_string *,tStr,PIKE_T_STRING,error_message)
+  ERR_VAR(struct array *,tArray,PIKE_T_ARRAY,error_backtrace)
   ERR_FUNC("cast",f_error_cast,tFunc(tString,tMixed),ID_STATIC)
   ERR_FUNC("`[]",f_error_index,tFunc(tString,tMixed),ID_STATIC)
   ERR_FUNC("describe",f_error_describe,tFunc(tVoid,tString),0)
@@ -94,31 +94,31 @@ DECLARE_ERROR(generic, Generic, EMPTY ,
 
 DECLARE_ERROR(index, Index,
 	      ERR_INHERIT(generic),
-  ERR_VAR(struct svalue, mixed, PIKE_T_MIXED, value)
-  ERR_VAR(struct svalue, mixed, PIKE_T_MIXED, index)
+  ERR_VAR(struct svalue, tMix, PIKE_T_MIXED, value)
+  ERR_VAR(struct svalue, tMix, PIKE_T_MIXED, index)
 )
 
 DECLARE_ERROR(bad_argument, BadArgument,
 	      ERR_INHERIT(generic),
-  ERR_VAR(INT_TYPE, int, PIKE_T_INT, which_argument)
-  ERR_VAR(struct pike_string *,string,PIKE_T_STRING,expected_type)
-  ERR_VAR(struct svalue, mixed, PIKE_T_MIXED, got_value)
+  ERR_VAR(INT_TYPE, tInt, PIKE_T_INT, which_argument)
+  ERR_VAR(struct pike_string *, tStr,PIKE_T_STRING,expected_type)
+  ERR_VAR(struct svalue, tMix, PIKE_T_MIXED, got_value)
 )
 
 DECLARE_ERROR(math, Math,
 	      ERR_INHERIT(generic),
-  ERR_VAR(struct svalue, mixed, PIKE_T_MIXED, number)
+  ERR_VAR(struct svalue, tMix, PIKE_T_MIXED, number)
 )
 
 DECLARE_ERROR(resource, Resource,
 	      ERR_INHERIT(generic),
-  ERR_VAR(struct pike_string *,string,PIKE_T_STRING,resource_type)
-  ERR_VAR(INT_TYPE, int, PIKE_T_INT, howmuch)
+  ERR_VAR(struct pike_string *, tStr, PIKE_T_STRING,resource_type)
+  ERR_VAR(INT_TYPE, tInt, PIKE_T_INT, howmuch)
 )
 
 DECLARE_ERROR(permission, Permission,
 	      ERR_INHERIT(generic),
-  ERR_VAR(struct pike_string *,string,PIKE_T_STRING,permission_type)
+  ERR_VAR(struct pike_string *, tStr, PIKE_T_STRING,permission_type)
 )
 
 DECLARE_ERROR(cpp, Cpp, ERR_INHERIT(generic), EMPTY)
@@ -129,8 +129,8 @@ DECLARE_ERROR(master_load, MasterLoad, ERR_INHERIT (generic), EMPTY)
 
 DECLARE_ERROR (module_load, ModuleLoad,
 	       ERR_INHERIT (generic),
-  ERR_VAR (struct pike_string *, string, PIKE_T_STRING, path)
-  ERR_VAR (struct pike_string *, string, PIKE_T_STRING, reason)
+  ERR_VAR (struct pike_string *, tStr, PIKE_T_STRING, path)
+  ERR_VAR (struct pike_string *, tStr, PIKE_T_STRING, reason)
 )
 
 #undef DECLARE_ERROR
diff --git a/src/object.c b/src/object.c
index 78381bd1751f6892a25abdd1487aa9e223f9e7b9..9e37da28734b3d187424084a5a7aaea891aa8e0c 100644
--- a/src/object.c
+++ b/src/object.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: object.c,v 1.263 2005/01/20 00:27:38 nilsson Exp $
+|| $Id: object.c,v 1.264 2005/01/20 14:29:25 nilsson Exp $
 */
 
 #include "global.h"
@@ -2380,30 +2380,30 @@ void init_object(void)
   init_destroy_called_mark_hash();
   start_new_program();
   offset=ADD_STORAGE(struct magic_index_struct);
-  map_variable("__obj","object",ID_STATIC,
-	       offset  + OFFSETOF(magic_index_struct, o), T_OBJECT);
+  MAP_VARIABLE("__obj", tObj, ID_STATIC,
+	       offset + OFFSETOF(magic_index_struct, o), T_OBJECT);
   ADD_FUNCTION("`()",f_magic_index,tFunc(tStr tOr(tVoid,tInt),tMix),0);
   magic_index_program=end_program();
 
   start_new_program();
   offset=ADD_STORAGE(struct magic_index_struct);
-  map_variable("__obj","object",ID_STATIC,
-	       offset  + OFFSETOF(magic_index_struct, o), T_OBJECT);
+  MAP_VARIABLE("__obj", tObj, ID_STATIC,
+	       offset + OFFSETOF(magic_index_struct, o), T_OBJECT);
   ADD_FUNCTION("`()",f_magic_set_index,
 	       tFunc(tStr tMix tOr(tVoid,tInt),tVoid),0);
   magic_set_index_program=end_program();
 
   start_new_program();
   offset=ADD_STORAGE(struct magic_index_struct);
-  map_variable("__obj","object",ID_STATIC,
-	       offset  + OFFSETOF(magic_index_struct, o), T_OBJECT);
+  MAP_VARIABLE("__obj", tObj, ID_STATIC,
+	       offset + OFFSETOF(magic_index_struct, o), T_OBJECT);
   ADD_FUNCTION("`()",f_magic_indices,tFunc(tOr(tVoid,tInt),tArr(tStr)),0);
   magic_indices_program=end_program();
 
   start_new_program();
   offset=ADD_STORAGE(struct magic_index_struct);
-  map_variable("__obj","object",ID_STATIC,
-	       offset  + OFFSETOF(magic_index_struct, o), T_OBJECT);
+  MAP_VARIABLE("__obj", tObj, ID_STATIC,
+	       offset + OFFSETOF(magic_index_struct, o), T_OBJECT);
   ADD_FUNCTION("`()",f_magic_values,tFunc(tOr(tVoid,tInt),tArray),0);
   magic_values_program=end_program();
 }
diff --git a/src/pike_search.c b/src/pike_search.c
index 6986af35dc005c4c2b34106461e0212cb310ce0a..b306ef2c7242ef8b1fe598fe18c4eb34289ed0c6 100644
--- a/src/pike_search.c
+++ b/src/pike_search.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: pike_search.c,v 1.25 2004/10/17 13:58:47 grubba Exp $
+|| $Id: pike_search.c,v 1.26 2005/01/20 14:29:05 nilsson Exp $
 */
 
 /* New memory searcher functions */
@@ -207,7 +207,7 @@ void init_pike_searching(void)
 {
   start_new_program();
   pike_search_struct_offset=ADD_STORAGE(struct pike_mem_searcher);
-  map_variable("__s","string",0,
+  MAP_VARIABLE("__s", tStr, 0,
 	       pike_search_struct_offset + OFFSETOF(pike_mem_searcher,s),
 	       PIKE_T_STRING);
   pike_search_program=end_program();