some fixes to how constants are named to be more consistent