Remove ambigious use of variable name that got ugly and confusing!