More renames of thrd to thread, including renaming one of the test cases.