Refactored some class names

'Nuff said.