Make names in hoare_lifting more consistent with those in lifting.

Still, there are some other inconsistencies between these two files
that may need fixing, like whether to take fork into account or not
and order of arguments.