Update for module renames.