more variable name changes