Update variable names to be consistent