macro naming cleanup