Update the two threads modules to conform to our recommendations (use