Tidy up on tag symbol names
Merge pull request #161 from lyncodev/symbol_name_tidy_up

Tidy up on tag symbol names