debug macro/function renaming