Apollo 3003: refactoring on method names
Merge branch 'APOLLO-3003' of https://github.com/ministryofjustice/opg-core-public-domain-model.git into APOLLO-3003