(minor) change variable names to reduce ambiguity