Big renaming in thread stuff