Add missing thread names, improve existing thread names

This extends on the work of PR #2323.