Make buffer names better