Merge "name our threads for ease of debugging"