Updated names of classes