Rename taking in account the current proposal
More renaming and adding make_expected_from_call