fix rename r to router