VP-297: Clean up naming in MediaSettings file