update more variable names