Renaming a buffer now works.  We lose history, but this took 3 hours