Bug 854758 - Follow-up to make variable name usage consistant. r=bustage