fix rename return and path plus performance