Fixing inconsistent variable names