[new] Add suffixes to names of models and routes.
Merge remote-tracking branch 'origin/master'