1099-R question for a Rollover of a Solo 401k to Traditional IRA

I am filling out a 1099-R for a solo 401k that I own myself for a business that I am closing. I ran a S corp and have a balance of $25000 in my Solo 401k. I had both with vanguard and just performed a rollover from a Solo 401k to a Tradtional IRA. Vanguard told me since I self manage the solo 401k since I was plan administrator I need to do my own 1099-R. I was wondering for the 1099-R for the Payer's Name is that my company name and address and the recipient name is my name? And for the gross distribution I put $25000 and for 2b I put taxable amount not determined and finally for field 7 for distribution code I put G? Is that all I need to submit to IRA? I never did anything with the solo 401k besides leaving it dormant thanks for your help