changed names of bunch of classes