more variable name fixes