Changed the #ifdef/#define identifiers to prevent overlap with identifiers of the same name