changed names of classes