Changed some class names.