Updated some class names.