Simplify and rename threading type