After you file

Thanks. So, just to confirm that I will need to attach the revised Schedule B and 1040 with the 1040-X. Also, the revised 1040 will show $8,000 is applied to 2020 estimated tax (not the $10,000 in the original return). Is this ok?