Changed some class names

Changed some class names to stick to the convention.