make macro conform to naming-conventions