Buncha beforan entity name changes.