For reporting Disaster distributions from 2020 in tax year 2021 filings and beyond, the IRS issued this draft as 8915-F as a "permanent" form.

"Reporting coronavirus-related and other distributions for qualified 2020 disasters made or received in 2020. This form replaces Form 8915-E for tax years beginning after 2020."

"Qualified 2019 and earlier disasters. Do not use Form 8915-F to do the following.
• Repay qualified 2017 disaster distributions. Use Form 8915-B for those repayments.
• Repay qualified 2018 disaster distributions. Use Form 8915-C for those repayments.
• Repay, and report income from, qualified 2019 disaster distributions. Use Form 8915-D for those repayments and income."