Renamed class
Added util namespace for validator