Rename threads - Fixes #17