Now using `uniquify` to maintain unique buffer names