route's name harmonization
Merge branch 'master' of https://github.com/ExpoTeam/expo