Renamed validation classes to validator to match