Rename variables & parameters in matchers to use `actual`& `expected`

[floehopper]

Whenever I look at the parameter matcher code I get very confused - I think using actual & expected would make things much less confusing.