Update variable names to be more clear.