Rename r to route