update route names
fixes
tweak templates