More changes to ViewData with argument name changes