Modified projects to use proper macro names.