Made class names CamelCase