I agree with the rename, good call... can we make the variable match too now?