Given how CPP works, the prev. commit does not cut the mustard. Reduce the risk of name clashes by giving the #defines some more obscure names instead.