Fix '_' in variable names