changed name of validation method and first pass before refactoring

https://osraav.atlassian.net/browse/OSRA-116