Renamed variables, paths.
Renamed routes, adjusted showing names in template