view and template names refactoring