Cosmetics: more consistent tag names.