-#define INIT_VARIANT() (INIT_STACK(varcs, struct variant))
-#define CURRENT_VARIANT() (CURRENT_DATP(varcs, struct variant))
-#define VARIANT_FULL() (DATA_FULL(varcs, struct variant))
-#define VARIANT_ALLOC() (ALLOC_DAT(varcs, struct variant))
-#define VARCS_FULL() (CHUNKS_FULL(varcs))
+#define INIT_MAP() (INIT_STACK(mcs, struct map))
+#define CURRENT_MAP() (CURRENT_DATP(mcs, struct map))
+#define MAP_FULL() (DATA_FULL(mcs, struct map))
+#define MAP_ALLOC() (ALLOC_DAT(mcs, struct map))
+#define MCS_FULL() (CHUNKS_FULL(mcs))