Renamed constants pt 2.