badgify and fix rename