Changed names of const fields to match convention.