Changing inconsistent variable names