Variable name cleanup.