Fix rename issue again!