Some changes to constant names for consistency.