rename our macros to uncommon names as well

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>