renamed constants w/ better names