Changed names in more places.