Updated names for constatns.