update variable names for consistency