Passport renewal name split

[ms09]

My name in passport is "Mohit Sharma" in Given name section and surname field is blank but i have corrected the name in India passport office and they put a observation on third page. Do I still need to fill affidavit for splitting my name in new passport or they will correct in new booklet?
Please advise as I am totally confused in this process.