Correct file and class names to fit conventions