change valid/operator variable name, add define