adjust router and template naming conventions