Backport the new thread naming convention from 1.1.x