Change to ProblemFiles and SolutionFiles