Tidy up on tag symbol names