ChoiceRouter fix, redundant Router/Route suffix deprecated