Change variables to be more consistent with descriptions.