Implemented consistent naming scheme for build system component macros