[jaclaz]

I propose to change "yak shaving" into "birds renaming".

[mydriasis]

I think yak shaving implies that this would be a tedious step toward something greater, but there's nothing greater at the end of the task, here

[jaclaz]

You mean that reducing the risk of offending - maybe - a handful of oversensitive people[1] is not a great enough end? ;)

[1] none with any actual interest in ornitology, BTW.