Unify link resolution for short and full forms, remove ContentNameLink.