Company in India and USA going for re-stamping after Extension, question for Employment page in DS160

USA H1B Visa
1

I was working at offshore for one of Big Indian MNCs and then to US h1b onsite.
Now, I got my extension approval and to going to India and will get stamping.

So, my question is should I mention Company name and India office address in “Present Employer” question of DS160?
or
Should I put Company name and USA office address in “Present Employer” question and Company’s India address in “Previously Employed” question?

Please help.