I agree we need to revamp or rebuild a new one. Rebuiling a new one further away from city may be a better long term idea.
About naming it, I hope it doesn't become a issue. If they revamp it, they can keep the same name (i.e. Zia). IF they make a new one, a new name makes more sense from any past national heros (either political or non-political).