Fixed file name references after renames