Replaced bad placeholder tokens with correct syntax
Merge branch 'hotfix/4093-generic-name-tokens'