Rename variables.

Refs #5909