Describe tag names more consistently, fixes #2170