Change the package thread to task, and do some renaming stuff.