Consistently use fv instead of fn and variable instead of name,
following Phil in Propositions as sessions.