Merge pull request #4 from chenliu0831/master

Prevent naming overrides conflicts in setup_terms for legacy code