Remove _MASK from constant names