Rename some templates