Renamed class files to match uppercase class names