This year I've filed my tax return. It turn out that I've filed the wrong one. I have to file 1040NR-RZ instead of filing 1040EZ. I'm currently in F-1 (OPT).
I've already got the return amount .

So what do I need to do to correct my mistake?
I know that I have to file 1040NR-EZ and 1040X to amend the tax.

My current status is Single (no dependents) with F-1 (in OPT) Visa.
I did the same mistake for 2011 tax return too.

Besides, I forgot to file form 8843 for years. Do I need to file 8843 for all years I stayed in the U.S

Please leave me your suggestion.
I'm highly appreciated your help.
Thank you very much!

Amend the returns using Form 1040X, and attach properly-prepared Forms 1040NR-EZ and 8843 with the amendments.

Print the word "AMENDED" on the top of the Form 1040NR-EZ.

Thank you very much.
By the way, do I need 1040NR-EZ, 8843 and 1040X for the year of 2011 or just 8843 & 1040X.
Thank you.

For 2011, you need Forms 1040NR-EZ and 1040X plus Form 8843.