Improved names in view controller.