Clean up thread naming