Changed some class names