Fixing file name shenanigans