I would rename Geonosis Tatooine too, it would take a colour shift but it would make sense.
Actually a pretty interesting idea, or maybe rename it Jakku?
There’s too much dialogue in TFA that refers to the planet specifically as Jakku so I don’t know if it would be possible