Rename some vars more legibly