Star Tours II
From Disney's Hollywood Studios Wiki
In 2005, George Lucas announced that his company is working on a new Star Tours ride, and Anthony Daniels, the actor who played and voiced C-3PO in all the Star Wars Movies and the Star Tours ride, has claimed that he has taped new material to be used on this update.
In 2009, at the D23 expo, Disney released this information http://www.studioscentral.com/star-tours-2, and http://www.starwars.com/fans/events/news20090912/index.html ealborates further.
It appears as though the intial Podrace inspired idea that has beeen going around since the release of Star Wars Episode I: The Phantom Menace are a major part of the ride, however the more recent information on having multiple endings and versions could also have an impact on the attraction.