Rename some variables - refs #6715