Update YouView for new naming conventions
Merge pull request #1625 from Cottser/youview

Update YouView for new naming conventions