More constants, rename package