Well, I'd suggest that you should at least just change "A New Hope" into "Star Wars". It's a much more poetic title and it does fit the Battle of Yavin quite well. As for the others, I don't know. Of course, it's up to you to decide, but I really think the old titles are working fine.