Fixe named route
Refactoring