Changed names of consts