Improove link names