Validation cleanup

mainly just renaming an internal function that's not used anywhere else