Update a few more links to classes that have moved