Rename variables and parameters
Rename variables and parameters

This makes tests easier to understand.
Happy to remove this commit if this is valid only for myself.

alphagov/panopticon,alphagov/panopticon,alphagov/panopticon,alphagov/panopticon