fix rename issue of NPE fix merge