Old variable naming cleanup.