Trim name after removing excess cruft.
Merge pull request #244 from Bombe/fix-thread-names

Trim name after removing excess cruft.