Fix more thread name bugs introduced in big 'orrid commit.