template changes, controllers rename