Prevent naming overrides conflicts in setup_terms for legacy code