Consistent variable names across files.