Changed class names to CamelCase.