Fixed issues created by renaming files