Changed

some class names to something more relevant