Some constants have been renamed