More cleanups in RouteName strategy