Updating a few vals to be more intuitive and consistent.