Resolve name conflicts
Merge pull request #140 from ministryofjustice/feature/eat-import

Resolve name conflicts