Refactor variable names.