H-1B amendment and form ds-160

[Gaurav Savadi]

Hello,

I am currently filling out form DS-160 for getting a visa stamp in Mumbai, India.
I had a question about the present and previous employment information section as it applies to me. Here is my situation:

I joined my company in August 2013 in role A. My original H-1B petition was approved for this role and I got the corresponding visa stamped in my passport.
I worked in this role till May 2015.
I then moved to a different department in the same company in role B. My original H-1B was amended to reflect this new role.

Now, in the form DS-160, there are the following sections:

Present Employer Name:
Start date:
Job duties:

Were you previously employed? Yes/No.

If yes,
Previous Employer Name:
Start date:
End date:
Job duties:

My question is:
1. Should I say Previously employed as yes and then fill out the details of my role within my company as role A?
2. If yes, then the start date of my present employer should be the start date for my current role as role B, is that correct?

Please let me know.

Thank you.