Updated some class names and imports