I remember when she announced that Book IV was to be called Harry Potter and the Doomspell Tournament. Then someone decided "Doomspell" was too scary (or something) and it was changed to the "Tri-Wizard Tournament," at which time the book's title became "Goblet of Fire."

My point: wait for the book. Until it comes out, anything can change.