Revise variable names