Rename some macros for bit get/setting