tried unifying macro naming scheme (Pascal case)