Fix Link and Name