Some renames in alloc.c