Rename "short_name", "host" and "sevice" attributes.

Fixes #5857
Fix macros.

Refs #5855