Correct file/dir names