rename to match macro names