Refactor some variable names.