Improve hash data variable names.