Last of 'nice names' for taxonomies. Fixes #334.