renaming controllers for consistancy
Merge branch 'thumbnails-reorg-2' into VID-1156
- updating assets