#710: data_validator.py, adjust variable names