Updated class names

And some spelling fixes