H1 and NIW 请教各位大侠

I am now doing Postdoc at a university. Now on OPT valid until Sepetember.

I would like to change my postdoc supervisor (group) within the same department at this university.

My questionis: if I apply H1b and NIW at this time, but change the advisor before they are approved, will I have to re-apply both? That is, are H1b and/or NIW dependent upon the supervisor?

After writing the posts here, I have a vague idea that NIW may not be affected, but H1b will, however. Am I right?

Thanks a lot. Happy Monkey Year.