Move tc_naming to generic place

No match.