fix rename issues