Issue #1981368 follow-up by tim.plunkett: Convert more routes to new naming convention.