Changes the naming of some private variables to better describe their purpose.