Improve consistency on naming conventions
Merge branch 'master' of github.com:dvla/vehicles-online