Actually, I believe that the word "Aryan" was used to refer to the peoples who settled the Northern India, Pakistan, Bangladesh and Afghanistan regions. They were most closely related to the Iranian peoples, if I'm not mistaken.
No, you're absolutely right. It just happens that that's the reason Persia was changed to Iran, which worked out anyway because they really are Aryans.