Fix #463 fix rename behavior