use `macro` instead of `contentMacro`

`contentMacro` in Dialog config was deprecated as of AT 1.4.10.

The change in some of the places of this pull request is not necessary  (as they're just local names for data model entries etc.) but I wanted to keep consistency.