Fix classes to match up with recent file renames