Adding proper handling of file names when title changes