Provide 1.x fallback using GetName() for address macros.

Refs #5855
Fix typo.

Refs #5855