reworking standard template names