Couple of subtle improvements for names.