Changed 2 val names to be less ambiguous