Changed variable names for consistency.