Changes to variable naming

Variables are named inconsistently in places where they can be named similarly.