Refactoring of controller and template names