Renamed all references to ostack_validator