More variable name changes.