Rename router to non-munging name