Fixing file name mismatch issue