Fix inconsistent naming scheme for threads