Uniquify will be enabled by default in Emacs 24.4! Great news -- it's a brilliant Emacs feature that not enough people know about.