Changed names of some things