Correct file and class naming.