Fixed constant names to be more consistent.