Every time patches are shuffled around or the commit messages are changes, filenames get changed. Name them individually instead.