Correct variable names to underscore_format