renamed some templates