Oops, forgot to update some names merged from p.a.contenttypes