-#define safe_malloc(s) _safe_malloc(s,__LINE__,__FILE__)
-#define safe_calloc(s,c) _safe_calloc(s,c,__LINE__,__FILE__)
-#define safe_realloc(p,c) _safe_realloc(p,c,__LINE__,__FILE__)
-#define FREE(x) _safe_free(x)
+#define mem_malloc(s) _mem_malloc(s,__LINE__,__FILE__)
+#define mem_calloc(s,c) _mem_calloc(s,c,__LINE__,__FILE__)
+#define mem_realloc(p,c) _mem_realloc(p,c,__LINE__,__FILE__)
+#define mem_free(x) _mem_free(x)