1099-R Box 7 Code P vs 8 when amending prior year

Hi All, I am amending my 2021 return with a 1099-R I received in 2022 for an excess contribution.  The codes on the 2022 1099-R are P and J.  However, when I go into the 2021 amendment process - Code P is for a return of a contribution taxable in 2020.  DO I just change this to code 8  so it correctly references 2021 even though it will then be different from the 1099 I received.