Upstream reword some link names