Recognize @name's and "@name" as @-names
Merge branch 'at-name-fix' into deployment