Naming
Merge pull request #1533 from alphagov/naming

Variable, method and class naming