almost done with rename issue

almost done with rename issue