I don't feel like sorting through each file to identify and rename each commit

You still haven't fixed this. Variable pollution is an absolute no-go.