More variable name cleanup.