Changed variable names to be more consistent.