feature/rename_internal_types
main
Rename internal types in the validation to be more consistent with other projects