Retirement tax questions

That's why I am a bit confused, I am the trustee of the solo401k plan, and it was created years ago by rolling over from my original IRA account to a solo401k plan held in a trust account with me as the trustee, for the purpose of using the funds for passive real estate investment.  Now that I am done with it, I closed the trust account and rolled the funds back to the original IRA account.

So I guess I am issuing the 1099-R to myself, and in the 1099-R form I put "G" in box 7, but I am not sure what goes into PAYER name, PAYER TIN, RECIPIENT name and TIN.  I think the recipient name is my personal name and SSN.  The payer name and TIN will be the trust's name and EIN or still my personal name/SSN?