Updated some class names that were wrong