I think the variable names should also be `*-buffer-name' instead of
`*-buffer' in order to better reflect what they are.  The following
patch does that, marking the old variables as obsolete and using the new
name in various places.  It's pretty straightforward and it should work
but I haven't tested so a double check would be appreciated.