Updated some class names (2)