Changed names of calsses