Rename some views as containers