added smart saving for buddy name.

NOTE: NONE of these pushes has been tested in SMP