Updated Route entity with name addition and other files to match
Merge remote-tracking branch 'origin/master'