Changed names of classes