Fix inconsistent variable names