Fix variable names to maintain consistency.