Rename wherever possible. For URLs, we might need to update the websites first. But we can still start to work on this and update them later.