Changed names of constants to be more descriptive.