Move tc_naming to generic place