各位老师,请教两个PP填表的问题

各位老师,请教两个PP填表的问题
1.
Part 1.
Company Contact Information:
Name of Company Contact Title/Position

should I put my name and my job title because it is employment based? or should I put N/A since its asking about company? Mine is EB1A case.

2.
part2.
'Petitioner/Applicant in the relating case' should be myself even it was my lawyer who filed my case before, right? Beneficiary should be me, right?

Thanks a lot