Fixed rename issue