Fixing some old-named links and labels