Rename remaining clashing variables to appease CI somewhere
Rename remaining clashing variables to appease CI somewhere

NeoAdonis/osu,smoogipoo/osu,peppy/osu,ppy/osu,smoogipooo/osu,NeoAdonis/osu,smoogipoo/osu,peppy/osu,ppy/osu,ppy/osu,peppy/osu,NeoAdonis/osu,smoogipoo/osu