Renamed some templates to be clearer as to their purpose