updated naming convention and template-home, view-home