renamed GeneralVerifier -> GeneralCaveatVerifier