link @ in @name

@KL-7 or @jugyo could you review? Whenever you have time.
INTL-5848