Change variable names to bring into a consistent style.