changed names of badly named classes