Remove ControllerDescriptor and fix ControllerActionDescriptor to pick the right type for the display name.