This is much more useful to users and determining tag names this way is now obsolete so it needs to be changed regardless.