Rename variables.

Refs #5909
Fix host custom attribute 'address' as runtime macro.

Refs #5855