Correct file name and message