Retirement tax questions

Hi, so I file 2021 non-deductive contribution on 2021 return, but file conversion on 2022 return, even though it is 2021 contribution's conversion, am I correct?