Update client return types.  Attempts to use action name if set.