Checked and mine as Shimano left and right, fixed reservoir, so can't be swapped.
Spent some time yesterday cleaning and fitting an xt wheelset with panaracer tyres, then I run out of daylight.
Got to address the brake swap another day.
It's incredible how much time it takes to clean everything...