rename templates to be more unified