Use boris and its minor mode
Make uniquify active

uniquify uses advice of two built-in functions to be enabled.  That
means you either need to require the package or restructure it to
functions that can be autoloaded and called from your init.