More fixes to links and names