Fixed rename issue
Fixed rename issue