This has me confused as to which form we will be using.  I was doing some digging myself and found the following in the draft instructions for 8915-F,

On your 2020 Form 8915-E, you reported a coronavirus-related distribution of $9,000 made to you from your traditional IRA on April 14, 2020. You spread the income over 3 years ($3,000 in each of
2020, 2021, and 2022). You made no repayments of the distribution in 2020. In 2021, you made a repayment of $4,500. You will report $3,000 of the repayment on your 2021 Form 8915-F (2020 disasters). The excess repayment of $1,500 can be carried forward to 2022 and reported on your 2022
Form 8915-F (2020 disasters) or carried back to 2020 and reported on your 2020 Form 8915-E.