Fixed links and names