Resolve misnamed classes missed from last MR, and added code to run validations and throw an Exception on failure. #3488182
Closes #3488182