Bug #3251: Better name selection