Change constants to match the class names