Handle renaming of "thread" to "_thread".