Update modelValidator to check passed in modelName