Refactored some class names - broken :S