Use proper cases in class names