No, it is the X. I logged in on a new page, went to my account then selected upgrade my phone. I selected Motorola. The X was listed first, the Droid was second, etc. I picked the X and went through the new plan options.
Now the site is getting all screwy with me. The hope page rotating ad thing is no longer working and when I go to view 3G Smartphones and select moto the whole list goes blank.