Update ViMediaManager for new naming conventions
Merge pull request #1619 from Cottser/vimediamanager

Update ViMediaManager for new naming conventions